aboutsummaryrefslogtreecommitdiffstats
path: root/system/doc
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2015-11-11 15:56:37 +0100
committerHenrik Nord <[email protected]>2015-11-11 15:56:37 +0100
commit4b6e653e7628c04a6616075c0c5396cbf12952c1 (patch)
tree6c6eba16e47b834a26c194ed444e904532fe37a7 /system/doc
parent80ff5d403591119f6374e150757ec2b68960b2d1 (diff)
parent7fe11aa8aded3612f1b6ba13a11b0cb80bf57bea (diff)
downloadotp-4b6e653e7628c04a6616075c0c5396cbf12952c1.tar.gz
otp-4b6e653e7628c04a6616075c0c5396cbf12952c1.tar.bz2
otp-4b6e653e7628c04a6616075c0c5396cbf12952c1.zip
Merge branch 'legoscia/patch-2' into maint
* legoscia/patch-2: Remove mention of erlang:fault
Diffstat (limited to 'system/doc')
-rw-r--r--system/doc/reference_manual/processes.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/system/doc/reference_manual/processes.xml b/system/doc/reference_manual/processes.xml
index 6755bd8be6..f656d0318e 100644
--- a/system/doc/reference_manual/processes.xml
+++ b/system/doc/reference_manual/processes.xml
@@ -100,11 +100,9 @@ spawn(Module, Name, Args) -> pid()
<item><c>exit(Reason)</c></item>
<item><c>erlang:error(Reason)</c></item>
<item><c>erlang:error(Reason, Args)</c></item>
- <item><c>erlang:fault(Reason)</c></item>
- <item><c>erlang:fault(Reason, Args)</c></item>
</list>
<p>The process then terminates with reason <c>Reason</c> for
- <c>exit/1</c> or <c>{Reason,Stack} for the others</c>.</p>
+ <c>exit/1</c> or <c>{Reason,Stack}</c> for the others.</p>
<p>A process can also be terminated if it receives an exit signal
with another exit reason than <c>normal</c>, see
<seealso marker="#errors">Error Handling</seealso>.</p>