aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2012-03-22 17:46:17 +0100
committerRaimo Niskanen <[email protected]>2012-03-22 17:46:17 +0100
commitef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca (patch)
treefe06272538dbbb1e802e0d70671c7ce80f370e0c
parentf67487b67bfb9ab04b01ef87bbfc39a24f604f11 (diff)
downloadotp-ef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca.tar.gz
otp-ef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca.tar.bz2
otp-ef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca.zip
erts: Correct merge bug in 'erlang' doc src
-rw-r--r--erts/doc/src/erlang.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 2ead6f511a..da0ef8fbe2 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1257,7 +1257,7 @@ os_prompt% </pre>
</desc>
</func>
<func>
- <name>halt(Status, Options)</name>
+ <name name="halt" arity="2"/>
<fsummary>Halt the Erlang runtime system</fsummary>
<desc>
<p><c><anno>Status</anno></c> must be a non-negative integer, a string,