aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-04-18 11:56:19 +0200
committerPatrik Nyblom <[email protected]>2012-04-18 11:56:19 +0200
commitcff02d4925bfd6ed88d9d7b897f4b4416e4643ce (patch)
treeedb748eddafa80d084cf5ef271d68b042d8f0a80 /erts/doc/src
parent00668f8cbae565d482e9ad72a63f846cef8e8071 (diff)
parenta76628f8f0de895e318c11585a53983e476d692c (diff)
downloadotp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.gz
otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.tar.bz2
otp-cff02d4925bfd6ed88d9d7b897f4b4416e4643ce.zip
Merge branch 'maint'
Conflicts: lib/hipe/cerl/erl_bif_types.erl
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/erlang.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 63e2e63b0b..e50dbe17f5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3119,6 +3119,10 @@ os_prompt% </pre>
<p><c><anno>Bytes</anno></c> is the total number of bytes written to
the port.</p>
</item>
+ <tag><c>{os_pid, <anno>OsPid</anno> | undefined}</c></tag>
+ <item>
+ <p><c> <anno>OsPid</anno></c> is the process identifier (or equivalent) of an OS process created with <c>open_port({spawn | spawn_executable, Command}, Options)</c>. If the port is not the result of spawning an OS process, the value is <c>undefined</c>.</p>
+ </item>
</taglist>
<p>Failure: <c>badarg</c> if <c><anno>Port</anno></c> is not a local port.</p>
</desc>