aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src/init.xml
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-05-27 08:53:33 +0200
committerLukas Larsson <[email protected]>2016-05-27 08:53:33 +0200
commitea8064b1bbda0ef59420ec8a805f3ee52630d704 (patch)
treefd8351867db2f6038002d13970ff385838e1bf73 /erts/doc/src/init.xml
parente5f436615f0649a4d19b03762c016e91e0dce0eb (diff)
parent8ff06daa90c7c3c599c9e8cbc93fe98c2ed5ebfa (diff)
downloadotp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.gz
otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.tar.bz2
otp-ea8064b1bbda0ef59420ec8a805f3ee52630d704.zip
Merge branch 'legoscia/erts/epmd-module-option/OTP-13627'
* legoscia/erts/epmd-module-option/OTP-13627: Add tests for -start_epmd and -epmd_module options Use the -epmd_module flag consistently Add -start_epmd command line option
Diffstat (limited to 'erts/doc/src/init.xml')
-rw-r--r--erts/doc/src/init.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/doc/src/init.xml b/erts/doc/src/init.xml
index 84a5aea335..878a33c9ca 100644
--- a/erts/doc/src/init.xml
+++ b/erts/doc/src/init.xml
@@ -241,6 +241,11 @@
marker="kernel:code">code(3)</seealso>.</p>
</item>
+ <tag><c>-epmd_module Module</c></tag>
+ <item>
+ <p>Specifies the module to use for registration and lookup of
+ node names. Defaults to <c>erl_epmd</c>.</p>
+ </item>
<tag><c>-eval Expr</c></tag>
<item>
<p>Scans, parses and evaluates an arbitrary expression