Merge branch 'dev' of super:otp into dev

* 'dev' of super:otp: (166 commits)
  Corrected documentation error and added examples to Users Guide
  In TLS 1.1, failure to properly close a connection no longer requires that a session not be resumed.  This is a change from TLS 1.0 to conform with widespread implementation practice.  Erlang ssl will now in TLS 1.0 conform to the widespread implementation practice instead of the specification to avoid performance issues.
  Add escript to bootstrap/bin
  Remove unused variable warning in inet_res
  Remove unused variable in epmd_port
  Remove compiler warnings in inet_drv
  Add SASL test suite
  Allow same module name in multiple applications if explicitely excluded
  Fix bugs concerning the option report_missing_types
  Fix default encoding in SAX parser.
  re: remove gratuitous "it " in manpage
  Spelling in (backward *compatibility*) comment.
  Improve erl_docgen's support for Dialyzer specs and types
  dialyzer warning on mnesia_tm
  Add documentation text about majority checking
  add mnesia_majority_test suite
  where_to_wlock optimization + change_table_majority/2
  bug in mnesia_tm:needs_majority/2
  optimize sticky_lock maj. check
  check majority for sticky locks
  ...

1 files changed, 20 insertions, 24 deletions

diff --git a/lib/kernel/doc/src/error_handler.xml b/lib/kernel/doc/src/error_handler.xml
index 7f78322472..acbf9a2c6e 100644
--- a/lib/kernel/doc/src/error_handler.xml
+++ b/lib/kernel/doc/src/error_handler.xml
@@ -37,48 +37,44 @@
   </description>
   <funcs>
     <func>
-      <name>undefined_function(Module, Function, Args) -> term()</name>
+      <name name="undefined_function" arity="3"/>
       <fsummary>Called when an undefined function is encountered</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <d>A (possibly empty) list of arguments <c>Arg1,..,ArgN</c></d>
-      </type>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
       <desc>
         <p>This function is evaluated if a call is made to
-          <c>Module:Function(Arg1,.., ArgN)</c> and
-          <c>Module:Function/N</c> is undefined. Note that
+          <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> and
+          <c><anno>Module</anno>:<anno>Function</anno>/N</c> is undefined. Note that
           <c>undefined_function/3</c> is evaluated inside the process
           making the original call.</p>
-        <p>If <c>Module</c> is interpreted, the interpreter is invoked
+        <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
           and the return value of the interpreted
-          <c>Function(Arg1,.., ArgN)</c> call is returned.</p>
+          <c><anno>Function</anno>(Arg1,.., ArgN)</c> call is returned.</p>
         <p>Otherwise, it returns, if possible, the value of
-          <c>apply(Module, Function, Args)</c> after an attempt has been
-          made to autoload <c>Module</c>. If this is not possible, the
-          call to <c>Module:Function(Arg1,.., ArgN)</c> fails with
+          <c>apply(<anno>Module</anno>, <anno>Function</anno>, <anno>Args</anno>)</c> after an attempt has been
+          made to autoload <c><anno>Module</anno></c>. If this is not possible, the
+          call to <c><anno>Module</anno>:<anno>Function</anno>(Arg1,.., ArgN)</c> fails with
           exit reason <c>undef</c>.</p>
       </desc>
     </func>
     <func>
-      <name>undefined_lambda(Module, Fun, Args) -> term()</name>
+      <name name="undefined_lambda" arity="3"/>
       <fsummary>Called when an undefined lambda (fun) is encountered</fsummary>
-      <type>
-        <v>Module = Function = atom()</v>
-        <v>Args = [term()]</v>
-        <d>A (possibly empty) list of arguments <c>Arg1,..,ArgN</c></d>
-      </type>
+      <type_desc variable="Args">
+        A (possibly empty) list of arguments <c>Arg1,..,ArgN</c>
+      </type_desc>
       <desc>
         <p>This function is evaluated if a call is made to
-          <c>Fun(Arg1,.., ArgN)</c> when the module defining the fun is
+          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> when the module defining the fun is
           not loaded. The function is evaluated inside the process
           making the original call.</p>
-        <p>If <c>Module</c> is interpreted, the interpreter is invoked
+        <p>If <c><anno>Module</anno></c> is interpreted, the interpreter is invoked
           and the return value of the interpreted
-          <c>Fun(Arg1,.., ArgN)</c> call is returned.</p>
+          <c><anno>Fun</anno>(Arg1,.., ArgN)</c> call is returned.</p>
         <p>Otherwise, it returns, if possible, the value of
-          <c>apply(Fun, Args)</c> after an attempt has been made to
-          autoload <c>Module</c>. If this is not possible, the call
+          <c>apply(<anno>Fun</anno>, <anno>Args</anno>)</c> after an attempt has been made to
+          autoload <c><anno>Module</anno></c>. If this is not possible, the call
           fails with exit reason <c>undef</c>.</p>
       </desc>
     </func>