aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-11-01 09:52:06 +0100
committerBjörn-Egil Dahlberg <[email protected]>2016-11-01 09:52:06 +0100
commit18dad110a0e9220cf1a18ff1cd78d66d6ce203b5 (patch)
treee69e82aa9c2b111e91b0dd9f80ac5e41b551202c
parent33a676a965688710c312577171bae7b742703b13 (diff)
parent1f997eba43ed79c3fe2055446c791c1e6314adf7 (diff)
downloadotp-18dad110a0e9220cf1a18ff1cd78d66d6ce203b5.tar.gz
otp-18dad110a0e9220cf1a18ff1cd78d66d6ce203b5.tar.bz2
otp-18dad110a0e9220cf1a18ff1cd78d66d6ce203b5.zip
Merge branch 'josevalim/erts/document-epmd-switches/PR-1217/OTP-13994' into maint
* josevalim/erts/document-epmd-switches/PR-1217/OTP-13994: Document the -epmd_module switch in erl
-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