diff options
| author | Raimo Niskanen <[email protected]> | 2012-03-22 17:46:17 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-03-22 17:46:17 +0100 |
| commit | ef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca (patch) | |
| tree | fe06272538dbbb1e802e0d70671c7ce80f370e0c | |
| parent | f67487b67bfb9ab04b01ef87bbfc39a24f604f11 (diff) | |
| download | otp-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.xml | 2 |
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, |