aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-11-23 16:20:14 +0100
committerPatrik Nyblom <[email protected]>2012-11-23 16:20:14 +0100
commit35c32355088eb86c3a118dc14dbc9bf5a6f2913b (patch)
tree7162dc83ce67fd09640160a3f42481548ca176aa /erts/doc
parenta22418d1e18deb952bb065e52fda1f25309314a9 (diff)
parent9966b521944520d388eeb36eea70fb60aeb692ab (diff)
downloadotp-35c32355088eb86c3a118dc14dbc9bf5a6f2913b.tar.gz
otp-35c32355088eb86c3a118dc14dbc9bf5a6f2913b.tar.bz2
otp-35c32355088eb86c3a118dc14dbc9bf5a6f2913b.zip
Merge branch 'pan/process_info_spec_doc/r15/OTP-10584' into maint
* pan/process_info_spec_doc/r15/OTP-10584: Correct doc of process_info(Pid,links) OTP-10584
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 248b755969..d85dff2c0c 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3998,10 +3998,10 @@ os_prompt% </pre>
the initial function call with which the process was
spawned.</p>
</item>
- <tag><c>{links, Pids}</c></tag>
+ <tag><c>{links, PidsAndPorts}</c></tag>
<item>
- <p><c>Pids</c> is a list of pids, with processes to
- which the process has a link.</p>
+ <p><c>PidsAndPorts</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>