From d329846816192743a9d8dc877390955f93e01dd2 Mon Sep 17 00:00:00 2001
From: Patrik Nyblom <pan@erlang.org>
Date: Thu, 22 Nov 2012 17:04:39 +0100
Subject: Correct doc re process_info(Pid,links)

---
 erts/doc/src/erlang.xml       | 7 ++++---
 erts/preloaded/src/erlang.erl | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 2faa46d760..1d67be2e52 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3706,10 +3706,11 @@ os_prompt% </pre>
               the initial function call with which the process was
               spawned.</p>
           </item>
-          <tag><c>{links, <anno>Pids</anno>}</c></tag>
+          <tag><c>{links, <anno>PidsAndPorts</anno>}</c></tag>
           <item>
-            <p><c><anno>Pids</anno></c> is a list of pids, with processes to
-              which the process has a link.</p>
+            <p><c><anno>PidsAndPorts</anno></c> is a list of pids and 
+	    port identifiers, with processes or ports to which the process 
+	    has a link.</p>
           </item>
           <tag><c>{last_calls, false|Calls}</c></tag>
           <item>
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 739fdde10a..061db72dd8 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -1756,7 +1756,7 @@ process_flag(_Flag, _Value) ->
       {group_leader, GroupLeader :: pid()} |
       {heap_size, Size :: non_neg_integer()} |
       {initial_call, mfa()} |
-      {links, Pids :: [pid() | port()]} |
+      {links, PidsAndPorts :: [pid() | port()]} |
       {last_calls, false | (Calls :: [mfa()])} |
       {memory, Size :: non_neg_integer()} |
       {message_que_len, MessageQueueLen :: non_neg_integer()} |
-- 
cgit v1.2.3