aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/communication.xml2
-rw-r--r--erts/doc/src/erl.xml2
-rw-r--r--erts/doc/src/erl_dist_protocol.xml13
-rw-r--r--erts/doc/src/erl_driver.xml2
-rw-r--r--erts/doc/src/erl_nif.xml2
5 files changed, 12 insertions, 9 deletions
diff --git a/erts/doc/src/communication.xml b/erts/doc/src/communication.xml
index 4025e41ef3..61a9b0e716 100644
--- a/erts/doc/src/communication.xml
+++ b/erts/doc/src/communication.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2012</year><year>2012</year>
+ <year>2012</year><year>2013</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index bd03fb4970..bb81330fec 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -665,6 +665,8 @@
than <c>65536</c>, the chosen value will increased to a value
larger or equal to the maximum amount of file descriptors that
can be opened.</p>
+ <p>On Windows the default value is set to <c>8196</c> because the
+ normal OS limitations are set higher than most machines can handle.</p>
<p>Previously the environment variable <c>ERL_MAX_PORTS</c> was used
for setting the maximum number of simultaneously existing ports. This
environment variable is deprecated, and scheduled for removal in
diff --git a/erts/doc/src/erl_dist_protocol.xml b/erts/doc/src/erl_dist_protocol.xml
index 4cff4956a2..84f4be208d 100644
--- a/erts/doc/src/erl_dist_protocol.xml
+++ b/erts/doc/src/erl_dist_protocol.xml
@@ -162,11 +162,12 @@ By default EPMD listens on port 4369.
</item>
<tag><c>Nlen</c></tag>
<item>
- The length of the <c>NodeName</c>.
+ The length (in bytes) of the <c>NodeName</c> field.
</item>
<tag><c>NodeName</c></tag>
<item>
- The NodeName as a string of length <c>Nlen</c>.
+ The NodeName as an UTF-8 encoded string of
+ <c>Nlen</c> bytes.
</item>
<tag><c>Elen</c></tag>
<item>
@@ -322,7 +323,7 @@ If Result > 0, the packet only consists of [119, Result].
NodeInfo is, as expressed in Erlang:
</p>
<code>
- io:format("name ~s at port ~p~n", [NodeName, Port]).
+ io:format("name ~ts at port ~p~n", [NodeName, Port]).
</code>
</section>
@@ -362,14 +363,14 @@ If Result > 0, the packet only consists of [119, Result].
NodeInfo is, as expressed in Erlang:
</p>
<code>
- io:format("active name ~s at port ~p, fd = ~p ~n",
+ io:format("active name ~ts at port ~p, fd = ~p ~n",
[NodeName, Port, Fd]).
</code>
<p>
or
</p>
<code>
- io:format("old/unused name ~s at port ~p, fd = ~p~n",
+ io:format("old/unused name ~ts at port ~p, fd = ~p~n",
[NodeName, Port, Fd]).
</code>
@@ -640,7 +641,7 @@ If Result > 0, the packet only consists of [119, Result].
<c>$ERL_TOP/lib/kernel/include/dist.hrl</c>.
(32 bit big endian)
Name0 ... NameN is the full nodename of A, as a string of bytes (the
- packet length denotes how long it is).
+ packet length denotes how long it is).
</p></item>
<tag>3) recv_status/send_status</tag>
<item><p>B sends a status message to A, which indicates
diff --git a/erts/doc/src/erl_driver.xml b/erts/doc/src/erl_driver.xml
index 636326e4e1..efe0483b31 100644
--- a/erts/doc/src/erl_driver.xml
+++ b/erts/doc/src/erl_driver.xml
@@ -4,7 +4,7 @@
<cref>
<header>
<copyright>
- <year>2001</year><year>2012</year>
+ <year>2001</year><year>2013</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/erts/doc/src/erl_nif.xml b/erts/doc/src/erl_nif.xml
index 18193d1150..864b91946a 100644
--- a/erts/doc/src/erl_nif.xml
+++ b/erts/doc/src/erl_nif.xml
@@ -4,7 +4,7 @@
<cref>
<header>
<copyright>
- <year>2001</year><year>2012</year>
+ <year>2001</year><year>2013</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>