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, 7 insertions, 18 deletions

diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml
index ba9f89685b..f81f8bda96 100644
--- a/lib/stdlib/doc/src/ms_transform.xml
+++ b/lib/stdlib/doc/src/ms_transform.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -599,12 +599,9 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
   </description>
   <funcs>
     <func>
-      <name>parse_transform(Forms,_Options) -> Forms</name>
+      <name name="parse_transform" arity="2"/>
       <fsummary>Transforms Erlang abstract format containing calls to ets/dbg:fun2ms into literal match specifications.</fsummary>
-      <type>
-        <v>Forms = Erlang abstract code format, see the erl_parse module description </v>
-        <v>_Options = Option list, required but not used</v>
-      </type>
+      <type_desc variable="Options">Option list, required but not used.</type_desc>
       <desc>
         <p>Implements the actual transformation at compile time. This
           function is called by the compiler to do the source code
@@ -617,29 +614,21 @@ ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]).</code>
       </desc>
     </func>
     <func>
-      <name>transform_from_shell(Dialect,Clauses,BoundEnvironment) -> term()</name>
+      <name name="transform_from_shell" arity="3"/>
       <fsummary>Used when transforming fun's created in the shell into match_specifications.</fsummary>
-      <type>
-        <v>Dialect = ets | dbg</v>
-        <v>Clauses = Erlang abstract form for a single fun</v>
-        <v>BoundEnvironment = [{atom(), term()}, ...], list of variable bindings in the shell environment</v>
-      </type>
+      <type_desc variable="BoundEnvironment">List of variable bindings in the shell environment.</type_desc>
       <desc>
         <p>Implements the actual transformation when the <c>fun2ms</c>
           functions are called from the shell. In this case the abstract
           form is for one single fun (parsed by the Erlang shell), and
           all imported variables should be in the key-value list passed
-          as <c>BoundEnvironment</c>. The result is a term, normalized,
+          as <c><anno>BoundEnvironment</anno></c>. The result is a term, normalized,
           i.e. not in abstract format.</p>
       </desc>
     </func>
     <func>
-      <name>format_error(Errcode) -> ErrMessage</name>
+      <name name="format_error" arity="1"/>
       <fsummary>Error formatting function as required by the parse_transform interface.</fsummary>
-      <type>
-        <v>Errcode = term()</v>
-        <v>ErrMessage = string()</v>
-      </type>
       <desc>
         <p>Takes an error code returned by one of the other functions
           in the module and creates a textual description of the