diff options
author | Lukas Larsson <[email protected]> | 2016-09-05 17:26:52 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2016-09-05 17:26:52 +0200 |
commit | 170507f2feeb0aa74cdca417edf221e9b2684504 (patch) | |
tree | c7afbad74b8fc4c7f03161ce52952563a0375561 | |
parent | 017725fc8a7d1d45eb1c9579b5cd0996d46c11a2 (diff) | |
parent | 8860c7822f8196ee7fe6e2100e9f9929b67eabe5 (diff) | |
download | otp-170507f2feeb0aa74cdca417edf221e9b2684504.tar.gz otp-170507f2feeb0aa74cdca417edf221e9b2684504.tar.bz2 otp-170507f2feeb0aa74cdca417edf221e9b2684504.zip |
Merge branch 'maint'
-rw-r--r-- | erts/doc/src/epmd.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml index 120ffb6860..311483022d 100644 --- a/erts/doc/src/epmd.xml +++ b/erts/doc/src/epmd.xml @@ -34,24 +34,23 @@ </header> <com>epmd</com> - <comsummary> - <p>Erlang Port Mapper Daemon</p> + <comsummary>Erlang Port Mapper Daemon</comsummary> + + <description> <taglist> <tag><c><![CDATA[epmd [-d|-debug] [DbgExtra...] [-address Addresses] - [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> + [-port No] [-daemon] [-relaxed_command_check]]]></c></tag> <item> <p>Starts the port mapper daemon.</p> </item> <tag><c><![CDATA[epmd [-d|-debug] [-port No] - [-names|-kill|-stop Name]]]></c></tag> + [-names|-kill|-stop Name]]]></c></tag> <item> <p>Communicates with a running port mapper daemon.</p> </item> </taglist> - </comsummary> - <description> <p>This daemon acts as a name server on all hosts involved in distributed Erlang computations. When an Erlang node starts, the node has a name and it obtains an address from the host |