diff options
| author | Henrik Nord <[email protected]> | 2011-06-22 16:24:32 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-06-22 16:24:32 +0200 |
| commit | 12ecb8c36fd00fff873f3bcaf8ffd53d5f2fb31f (patch) | |
| tree | d2d340ffd7bc004ecdd61500832f6c7bda6225ab /erts | |
| parent | b3a26388d988f6721d1fa73fe9ae73458f83704e (diff) | |
| parent | 1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff) | |
| download | otp-12ecb8c36fd00fff873f3bcaf8ffd53d5f2fb31f.tar.gz otp-12ecb8c36fd00fff873f3bcaf8ffd53d5f2fb31f.tar.bz2 otp-12ecb8c36fd00fff873f3bcaf8ffd53d5f2fb31f.zip | |
Merge branch 'dev' into major
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/epmd.xml | 4 | ||||
| -rw-r--r-- | erts/doc/src/erl.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/epmd.xml b/erts/doc/src/epmd.xml index 411e627c85..3e7005410f 100644 --- a/erts/doc/src/epmd.xml +++ b/erts/doc/src/epmd.xml @@ -120,7 +120,7 @@ <item> <p>Let this instance of <c>epmd</c> listen only on the comma-separated list of IP addresses and on the loopback address - (which is implicitely added to the list if it has not been + (which is implicitly added to the list if it has not been specified). This can also be set using the <c><![CDATA[ERL_EPMD_ADDRESS]]></c> environment variable, see the section <seealso marker="#environment_variables">Environment @@ -243,7 +243,7 @@ <p>This environment variable may be set to a comma-separated list of IP addresses, in which case the <c>epmd</c> daemon will listen only on the specified address(es) and on the - loopback address (which is implicitely added to the list if it + loopback address (which is implicitly added to the list if it has not been specified). The default behaviour is to listen on all available IP addresses.</p> </item> diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 514ee5ffaf..02082e57c6 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -1010,7 +1010,7 @@ list of IP addresses, in which case the <seealso marker="epmd">epmd</seealso> daemon will listen only on the specified address(es) and on the - loopback address (which is implicitely added to the list if it + loopback address (which is implicitly added to the list if it has not been specified).</p> </item> <tag><c><![CDATA[ERL_EPMD_PORT]]></c></tag> |