aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-11-01 09:52:35 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-11-01 09:52:35 +0100
commit9cdfe11ad09a8c161a01cfdaa81407d725ddc1dc (patch)
tree0f185346919328a5ff12dabd1d980ab593c1c134 /erts
parentf4e8d3f79a344336f62b818c22c9655d1dba092b (diff)
parent18dad110a0e9220cf1a18ff1cd78d66d6ce203b5 (diff)
downloadotp-9cdfe11ad09a8c161a01cfdaa81407d725ddc1dc.tar.gz
otp-9cdfe11ad09a8c161a01cfdaa81407d725ddc1dc.tar.bz2
otp-9cdfe11ad09a8c161a01cfdaa81407d725ddc1dc.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/erl.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index eb1d24cf12..f39b640c7e 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -250,6 +250,11 @@
environment variable <c><![CDATA[DISPLAY]]></c> set to
<c><![CDATA[gin:0]]></c>.</p>
</item>
+ <tag><c><![CDATA[-epmd_module Module]]></c> (init flag)</tag>
+ <item>
+ <p>Configures the module responsible to communicate to
+ <seealso marker="epmd">epmd</seealso>. Defaults to <c>erl_epmd</c>.</p>
+ </item>
<tag><c><![CDATA[-eval Expr]]></c> (init flag)</tag>
<item>
<p>Makes <c><![CDATA[init]]></c> evaluate the expression