diff options
| author | Hans Bolinder <[email protected]> | 2016-09-01 08:25:44 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2016-09-01 08:25:44 +0200 |
| commit | 27cd15570cc45388cae5ec710f663e571c920c0c (patch) | |
| tree | 4eb1aa288b729d909df52e44cb7855e92efa9078 /lib/kernel | |
| parent | 92e4f66d21f8521927f2bbccf2ac33e75b7ca55f (diff) | |
| parent | 155932b26c4b65412a4ef3a28922f0e8d276b919 (diff) | |
| download | otp-27cd15570cc45388cae5ec710f663e571c920c0c.tar.gz otp-27cd15570cc45388cae5ec710f663e571c920c0c.tar.bz2 otp-27cd15570cc45388cae5ec710f663e571c920c0c.zip | |
Merge branch 'maint'
* maint:
Fix xmllint-warnings
Diffstat (limited to 'lib/kernel')
| -rw-r--r-- | lib/kernel/doc/src/heart.xml | 2 | ||||
| -rw-r--r-- | lib/kernel/doc/src/kernel_app.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/kernel/doc/src/heart.xml b/lib/kernel/doc/src/heart.xml index 864f8facac..59a046bf4d 100644 --- a/lib/kernel/doc/src/heart.xml +++ b/lib/kernel/doc/src/heart.xml @@ -83,7 +83,7 @@ <c><![CDATA[SIGKILL]]></c>:</p> <pre> % <input>erl -heart -env HEART_KILL_SIGNAL SIGABRT ...</input></pre> - <p> If heart should <b>not</b> kill the Erlang runtime system, this can be indicated + <p> If heart should <em>not</em> kill the Erlang runtime system, this can be indicated using the environment variable <c><![CDATA[HEART_NO_KILL=TRUE]]></c>. This can be useful if the command executed by heart takes care of this, for example as part of a specific cleanup sequence. diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml index dc0291babe..fb6421e1c5 100644 --- a/lib/kernel/doc/src/kernel_app.xml +++ b/lib/kernel/doc/src/kernel_app.xml @@ -215,16 +215,16 @@ <p>Defines the <c>First..Last</c> port range for the listener socket of a distributed Erlang node.</p> </item> - <marker id="inet_dist_listen_options"></marker> <tag><c>{inet_dist_listen_options, Opts}</c></tag> <item> + <marker id="inet_dist_listen_options"></marker> <p>Defines a list of extra socket options to be used when opening the listening socket for a distributed Erlang node. See <seealso marker="gen_tcp#listen/2"><c>gen_tcp:listen/2</c></seealso>.</p> </item> - <marker id="inet_dist_connect_options"></marker> <tag><c>{inet_dist_connect_options, Opts}</c></tag> <item> + <marker id="inet_dist_connect_options"></marker> <p>Defines a list of extra socket options to be used when connecting to other distributed Erlang nodes. See <seealso marker="gen_tcp#connect/4"><c>gen_tcp:connect/4</c></seealso>.</p> |