From ef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca Mon Sep 17 00:00:00 2001
From: Raimo Niskanen <raimo@erlang.org>
Date: Thu, 22 Mar 2012 17:46:17 +0100
Subject: erts: Correct merge bug in 'erlang' doc src

---
 erts/doc/src/erlang.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts/doc/src/erlang.xml')

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,
-- 
cgit v1.2.3