Merge branch 'hb/doc_corrections/OTP-9550' into dev

* hb/doc_corrections/OTP-9550:
  Correct XML files

11 files changed, 54 insertions, 69 deletions

diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml
index 013e94c393..db65eb3848 100644
--- a/lib/stdlib/doc/src/beam_lib.xml
+++ b/lib/stdlib/doc/src/beam_lib.xml
@@ -88,7 +88,6 @@
         it is recommended that it contains at least 32 characters and
         that both upper and lower case letters as well as digits and
         special characters are used.</p>
-      <p></p>
       <p>The default type -- and currently the only type -- of crypto
         algorithm is <c>des3_cbc</c>, three rounds of DES. The key string
         will be scrambled using <c>erlang:md5/1</c> to generate
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 54fefbe2b8..215ec154ed 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -1006,8 +1006,7 @@ ok
       <name name="table" arity="2"/>
       <fsummary>Return a QLC query handle.</fsummary>
       <desc>
-        <p><marker id="qlc_table"></marker>
-          Returns a QLC (Query List
+        <p><marker id="qlc_table"></marker>Returns a QLC (Query List
           Comprehension) query handle. The module <c>qlc</c>
           implements a query language aimed mainly at Mnesia but Ets
           tables, Dets tables, and lists are also recognized by <c>qlc</c>
diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 929620bb88..fe166dbd01 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2003</year><year>2009</year>
+      <year>2003</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -89,9 +89,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="add"></marker>
-<c>add/3</c> function adds a file to a tar file
-          that has been opened for writing by
+        <p>The <marker id="add"></marker><c>add/3</c> function adds
+           a file to a tar file that has been opened for writing by
           <seealso marker="#open">open/1</seealso>.</p>
         <taglist>
           <tag><c>dereference</c></tag>
@@ -138,8 +137,8 @@
         <v>TarDescriptor = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="close"></marker>
-<c>close/1</c> function closes a tar file
+        <p>The <marker id="close"></marker><c>close/1</c> function
+          closes a tar file
           opened by <seealso marker="#open">open/1</seealso>.</p>
       </desc>
     </func>
@@ -151,11 +150,12 @@
         <v>FileList = [Filename|{NameInArchive, binary()},{NameInArchive, Filename}]</v>
         <v>Filename = filename()</v>
         <v>NameInArchive = filename()</v>
-        <v>RetValue = ok|{error,{Name,Reason}} &lt;V>Reason = term()</v>
+        <v>RetValue = ok|{error,{Name,Reason}}</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="create_2"></marker>
-<c>create/2</c> function creates a tar file and
+        <p>The <marker id="create_2"></marker><c>create/2</c> function
+          creates a tar file and
           archives the files whose names are given in <c>FileList</c> into it.
           The files may either be read from disk or given as
           binaries.</p>
@@ -171,11 +171,11 @@
         <v>NameInArchive = filename()</v>
         <v>OptionList = [Option]</v>
         <v>Option = compressed|cooked|dereference|verbose</v>
-        <v>RetValue = ok|{error,{Name,Reason}} &lt;V>Reason = term()</v>
+        <v>RetValue = ok|{error,{Name,Reason}}</v>
+        <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="create_3"></marker>
-<c>create/3</c> function 
+        <p>The <marker id="create_3"></marker><c>create/3</c> function
           creates a tar file and archives the files whose names are given
           in <c>FileList</c> into it. The files may either be read from
           disk or given as binaries.</p>
@@ -220,9 +220,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="extract_1"></marker>
-<c>extract/1</c> function extracts
-          all files from a tar archive.</p>
+        <p>The <marker id="extract_1"></marker><c>extract/1</c> function
+          extracts all files from a tar archive.</p>
         <p>If the <c>Name</c> argument is given as "<c>{binary,Binary}</c>",
           the contents of the binary is assumed to be a tar archive.
           </p>
@@ -250,9 +249,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="extract_2"></marker>
-<c>extract/2</c> function extracts
-          files from a tar archive.</p>
+        <p>The <marker id="extract_2"></marker><c>extract/2</c> function
+          extracts files from a tar archive.</p>
         <p>If the <c>Name</c> argument is given as "<c>{binary,Binary}</c>",
           the contents of the binary is assumed to be a tar archive.
           </p>
@@ -322,8 +320,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="format_error_1"></marker>
-<c>format_error/1</c> converts
+        <p>The <marker id="format_error_1"></marker><c>format_error/1</c>
+          function converts
           an error reason term to a human-readable error message string.</p>
       </desc>
     </func>
@@ -339,8 +337,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="open"></marker>
-<c>open/2</c> function creates a tar file for writing.
+        <p>The <marker id="open"></marker><c>open/2</c> function creates
+         a tar file for writing.
         (Any existing file with the same name will be truncated.)</p>
         <p>By convention, the name of a tar file should end in "<c>.tar</c>".
           To abide to the convention, you'll need to add "<c>.tar</c>" yourself
@@ -373,7 +371,6 @@
             You should not rely on the specific contents of the <c>TarDescriptor</c>
             term, as it may change in future versions as more features are added
             to the <c>erl_tar</c> module.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
@@ -386,9 +383,8 @@
         <v>Reason = term()</v>
       </type>
       <desc>
-        <p>The           <marker id="table_1"></marker>
-<c>table/1</c> function retrieves
-          the names of all files in the tar file <c>Name</c>.</p>
+        <p>The <marker id="table_1"></marker><c>table/1</c> function
+          retrieves the names of all files in the tar file <c>Name</c>.</p>
       </desc>
     </func>
     <func>
@@ -398,9 +394,8 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="table_2"></marker>
-<c>table/2</c> function retrieves
-          the names of all files in the tar file <c>Name</c>.</p>
+        <p>The <marker id="table_2"></marker><c>table/2</c> function
+          retrieves the names of all files in the tar file <c>Name</c>.</p>
       </desc>
     </func>
     <func>
@@ -410,8 +405,7 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="t_1"></marker>
-<c>t/1</c> function prints the names
+        <p>The <marker id="t_1"></marker><c>t/1</c> function prints the names
           of all files in the tar file <c>Name</c> to the Erlang shell.
           (Similar to "<c>tar&nbsp;t</c>".)</p>
       </desc>
@@ -423,8 +417,8 @@
         <v>Name = filename()</v>
       </type>
       <desc>
-        <p>The           <marker id="tt_1"></marker>
-<c>tt/1</c> function prints names and
+        <p>The <marker id="tt_1"></marker><c>tt/1</c> function prints
+          names and
           information about all files in the tar file <c>Name</c> to
           the Erlang shell. (Similar to "<c>tar&nbsp;tv</c>".)</p>
       </desc>
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index f19f92be6f..efd9514db6 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -512,11 +512,10 @@ Error: fun containing local Erlang function calls
               of the reference counter, keeping track of how many times
               the table has been fixed by the process.</p>
             <p>If the table never has been fixed, the call returns
-              <c>false</c>.</p>
-          <item><c>Item=stats, Value=tuple()</c>          <br></br>
+              <c>false</c>.</p></item>
+          <item><p><c>Item=stats, Value=tuple()</c>          <br></br>
 	  Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites.
-	  Not for production use.</item>
-          </item>
+	  Not for production use.</p></item>
         </list>
       </desc>
     </func>
@@ -661,9 +660,9 @@ ets:is_compiled_ms(Broken).</code>
           table. The difference being the same as between <c>=:=</c>
           and <c>==</c>. As an example, one might insert an object
           with the
-          <c>integer()</c><c>1</c> as a key in an <c>ordered_set</c>
+          <c>integer()</c> <c>1</c> as a key in an <c>ordered_set</c>
           and get the object returned as a result of doing a
-          <c>lookup/2</c> with the <c>float()</c><c>1.0</c> as the
+          <c>lookup/2</c> with the <c>float()</c> <c>1.0</c> as the
           key to search for.</p>
         <p>If the table is of type <c>set</c> or <c>ordered_set</c>,
           the function returns either the empty list or a list with one
@@ -946,7 +945,7 @@ ets:select(Table,MatchSpec),</code>
           table is named or not. If one or more options are left out,
           the default values are used. This means that not specifying
           any options (<c>[]</c>) is the same as specifying
-          <c>[set,protected,{keypos,1},{heir,none},{write_concurrency,false},{read_concurrency,false}]</c>.</p>
+          <c>[set, protected, {keypos,1}, {heir,none}, {write_concurrency,false}, {read_concurrency,false}]</c>.</p>
         <list type="bulleted">
           <item>
             <p><c>set</c>
@@ -963,7 +962,7 @@ ets:select(Table,MatchSpec),</code>
               <c>ordered_set</c> tables regard keys as equal when they
               <em>compare equal</em>, not only when they match. This
               means that to an <c>ordered_set</c>, the
-              <c>integer()</c><c>1</c> and the <c>float()</c><c>1.0</c> are regarded as equal. This also means that the
+              <c>integer()</c> <c>1</c> and the <c>float()</c> <c>1.0</c> are regarded as equal. This also means that the
               key used to lookup an element not necessarily
               <em>matches</em> the key in the elements returned, if
               <c>float()</c>'s and <c>integer()</c>'s are mixed in
diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml
index 38de51322f..f91fac9c82 100644
--- a/lib/stdlib/doc/src/gb_sets.xml
+++ b/lib/stdlib/doc/src/gb_sets.xml
@@ -61,7 +61,6 @@
       and do the same thing in the <c>sets</c> and <c>ordsets</c>
       modules. That is, by only changing the module name for each call,
       you can try out different set representations.</p>
-    <p></p>
     <list type="bulleted">
       <item>
         <p><c>add_element/2</c></p>
diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index e35b5adace..421eeb4fd3 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2010</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -430,7 +430,6 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
       denote a state of the state machine. <em>state data</em> is used
       to denote the internal state of the Erlang process which
       implements the state machine.</p>
-    <p></p>
   </section>
   <funcs>
     <func>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 60c0b91212..36089f2603 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -2632,7 +2632,7 @@
             that is, also when starting a gen_server, gen_fsm etc. </p>
           <p>This limitation has now been properly documented and the
             behavior of the <c>gen_fsm</c>, <c>gen_server</c>, and
-            <c>proc_lib</c><c>start</c> and <c>start_link</c>
+            <c>proc_lib</c> <c>start</c> and <c>start_link</c>
             functions when providing this option has been changed
             from hanging indefinitely to failing with reason
             <c>badarg</c>.</p>
@@ -2749,7 +2749,6 @@
             <c>join</c> option that can be used to force QLC to use a
             particular kind of join in some QLC expression.</p>
           <p>Several other changes have also been included:</p>
-          <p></p>
           <list type="bulleted">
             <item>
               <p>The new <c>tmpdir</c> option of <c>cursor/2</c>,
diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml
index 6a45ade447..ce50631ca9 100644
--- a/lib/stdlib/doc/src/qlc.xml
+++ b/lib/stdlib/doc/src/qlc.xml
@@ -688,7 +688,6 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),
     </datatype>
     <datatype>
       <name name="tmp_file_usage"></name>
-      <desc><p></p></desc>
     </datatype>
   </datatypes>
 
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index edd119d37a..ec607d6e4c 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -59,7 +59,6 @@
       processes are started in order from left to right according to
       this list. When the supervisor terminates, it first terminates
       its child processes in reversed start order, from right to left.</p>
-    <p></p>
     <p>A supervisor can have one of the following <em>restart strategies</em>:</p>
     <list type="bulleted">
       <item>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index b741ab7db1..0c1e398dc4 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -84,7 +84,7 @@
       <name name="send_after" arity="3"/>
       <fsummary>Send <c>Message</c>to <c>Pid</c>after a specified <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>send_after/3</c></tag>
           <item>
@@ -98,6 +98,7 @@
             <p>Same as <c>send_after(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -107,7 +108,7 @@
       <name name="exit_after" arity="3"/>
       <fsummary>Send an exit signal with <c>Reason</c>after a specified <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>exit_after/3</c></tag>
           <item>
@@ -128,6 +129,7 @@
             <p>Same as <c>exit_after(<anno>Time</anno>, self(), kill)</c>.     </p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -144,7 +146,7 @@
       <name name="send_interval" arity="3"/>
       <fsummary>Send <c>Message</c>repeatedly at intervals of <c>Time</c>.</fsummary>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>send_interval/3</c></tag>
           <item>
@@ -158,6 +160,7 @@
             <p>Same as <c>send_interval(<anno>Time</anno>, self(), <anno>Message</anno>)</c>.</p>
           </item>
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -188,7 +191,7 @@
       Function, Arguments)</c> or <c>apply(Fun, Arguments)</c></fsummary>
       <type_desc variable="Time">In microseconds</type_desc>
       <desc>
-        <p></p>
+        <p>
         <taglist>
           <tag><c>tc/3</c></tag>
           <item>
@@ -209,6 +212,7 @@
           </item>
 
         </taglist>
+        </p>
       </desc>
     </func>
     <func>
@@ -254,7 +258,6 @@
   <section>
     <title>Examples</title>
     <p>This example illustrates  how to print out "Hello World!" in 5 seconds:</p>
-    <p></p>
     <pre>
       1> <input>timer:apply_after(5000, io, format, ["~nHello World!~n", []]).</input>
       {ok,TRef}
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index b03fc7f4e2..cf0d581352 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -243,12 +243,10 @@
       <name name="extract" arity="2"/>
       <fsummary>Extract files from a zip archive</fsummary>
       <desc>
-        <p>The           <marker id="unzip_1"></marker>
-<c>unzip/1</c> function extracts
-          all files from a zip archive. The
-                    <marker id="unzip_2"></marker>
-<c>unzip/2</c> function provides options
-          to extract some files, and more.</p>
+        <p>The <marker id="unzip_1"></marker><c>unzip/1</c> function extracts
+          all files from a zip archive.
+          The <marker id="unzip_2"></marker><c>unzip/2</c> function provides
+           options to extract some files, and more.</p>
         <p>If the <c><anno>Archive</anno></c> argument is given as a binary,
           the contents of the binary is assumed to be a zip archive,
           otherwise it should be a filename.</p>
@@ -413,8 +411,8 @@
       <name name="zip_open" arity="2"/>
       <fsummary>Open an archive and return a handle to it</fsummary>
       <desc>
-        <p>The           <marker id="zip_open"></marker>
-<c>zip_open</c> function opens a
+        <p>The <marker id="zip_open"></marker><c>zip_open</c> function
+          opens a
           zip archive, and reads and saves its directory. This
           means that subsequently reading files from the archive will be
           faster than unzipping files one at a time with <c>unzip</c>.</p>
@@ -436,8 +434,7 @@
       <name name="zip_get" arity="2"/>
       <fsummary>Extract files from an open archive</fsummary>
       <desc>
-        <p>The           <marker id="zip_get"></marker>
-<c>zip_get</c> function extracts
+        <p>The <marker id="zip_get"></marker><c>zip_get</c> function extracts
           one or all files from an open archive.</p>
         <p>The files will be unzipped to memory or to file, depending on
           the options given to the <c>zip_open</c> function when the
@@ -448,9 +445,8 @@
       <name name="zip_close" arity="1"/>
       <fsummary>Close an open archive</fsummary>
       <desc>
-        <p>The           <marker id="zip_close"></marker>
-<c>zip_close/1</c> function closes
-          a zip archive, previously opened with <c>zip_open</c>. All
+        <p>The <marker id="zip_close"></marker><c>zip_close/1</c> function
+          closes a zip archive, previously opened with <c>zip_open</c>. All
           resources are closed, and the handle should not be used after
           closing.</p>
       </desc>