diff options
| author | Lukas Larsson <[email protected]> | 2016-09-05 17:26:44 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-09-05 17:26:44 +0200 |
| commit | 8860c7822f8196ee7fe6e2100e9f9929b67eabe5 (patch) | |
| tree | 796f5ee237d56375680f3ea672ada19e1b161592 /erts | |
| parent | 2c9f81b8b030062fb7cbfc4250b2069f73e57cc8 (diff) | |
| parent | 8f576e2d1ab537b39c4137e052e8ef7f6a4077ab (diff) | |
| download | otp-8860c7822f8196ee7fe6e2100e9f9929b67eabe5.tar.gz otp-8860c7822f8196ee7fe6e2100e9f9929b67eabe5.tar.bz2 otp-8860c7822f8196ee7fe6e2100e9f9929b67eabe5.zip | |
Merge branch 'lukas/erts/epmd_xmllint_fix' into maint
* lukas/erts/epmd_xmllint_fix:
epmd: Fix xmllint error in comsummary
Diffstat (limited to 'erts')
| -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 |