aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc
diff options
context:
space:
mode:
authorNiclas Axelsson <burbas@erlang.org>2011-03-04 17:01:27 +0100
committerNiclas Axelsson <burbas@erlang.org>2011-03-04 17:01:31 +0100
commitac73b2c8efa68f0237febd1fb0cde5e5ee59215e (patch)
tree156cebbd22918b4bc09296038d187a1ca312d131 /erts/doc
parente454e0f3d45c30fcb24f6e06a9e1f7408a8db5d7 (diff)
parent804bb7f78fcf94609f31a9d429b82c37d1f1173b (diff)
downloadotp-ac73b2c8efa68f0237febd1fb0cde5e5ee59215e.tar.gz
otp-ac73b2c8efa68f0237febd1fb0cde5e5ee59215e.tar.bz2
otp-ac73b2c8efa68f0237febd1fb0cde5e5ee59215e.zip
Merge branch 'ks/process_status' into dev
* ks/process_status: Document exiting and garbage_collecting process statuses OTP-9102
Diffstat (limited to 'erts/doc')
-rw-r--r--erts/doc/src/erlang.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 78d58a1e56..c3f06982f5 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -3980,7 +3980,8 @@ os_prompt%</pre>
<tag><c>{status, Status}</c></tag>
<item>
<p><c>Status</c> is the status of the process. <c>Status</c>
- is <c>waiting</c> (waiting for a message), <c>running</c>,
+ is <c>exiting</c>, <c>garbage_collecting</c>,
+ <c>waiting</c> (for a message), <c>running</c>,
<c>runnable</c> (ready to run, but another process is
running), or <c>suspended</c> (suspended on a "busy" port
or by the <c>erlang:suspend_process/[1,2]</c> BIF).</p>