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

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

32 files changed, 136 insertions, 193 deletions

diff --git a/erts/doc/src/erl_prim_loader.xml b/erts/doc/src/erl_prim_loader.xml
index fa3daaeecc..9f5b3f385b 100644
--- a/erts/doc/src/erl_prim_loader.xml
+++ b/erts/doc/src/erl_prim_loader.xml
@@ -101,7 +101,7 @@
           <c><anno>Bin</anno></c> is the contents of the file as a binary.</p>
 
 	  <p>The <c><anno>Filename</anno></c> can also be a file in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>.
+          <c>$OTPROOT/lib/</c><c>mnesia-4.4.7.ez/mnesia-4.4.7/ebin/</c><c>mnesia.beam</c>.
           See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
@@ -124,7 +124,7 @@
           the names of all the files in the directory. The names are
           not sorted.</p>
 	  <p>The <c><anno>Dir</anno></c> can also be a directory in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.
+          <c>$OTPROOT/lib/</c><c>mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.
            See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
@@ -143,7 +143,7 @@
         <p>See <seealso marker="kernel:file">file(3)</seealso> for more info about
           the record <c>file_info</c>.</p>
 	<p>The <c><anno>Filename</anno></c> can also be a file in an archive. For example
-          <c>/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin/mnesia_backup.beam</c>.
+          <c>$OTPROOT/lib/</c><c>mnesia-4.4.7.ez/mnesia-4.4.7/ebin/</c><c>mnesia</c>.
           See <seealso marker="kernel:code">code(3)</seealso> about archive files.</p>
       </desc>
     </func>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 2fabc6d62d..aef31f5b98 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -2898,11 +2898,11 @@ os_prompt%</pre>
 	      <seealso marker="stdlib:unicode_usage">stdlib users guide
 	      </seealso> for details.</p>
 
-	      <note>The characters in the name (if given as a list)
+	      <note><p>The characters in the name (if given as a list)
 	      can only be &gt; 255 if the Erlang VM is started in
 	      Unicode file name translation mode, otherwise the name
 	      of the executable is limited to the ISO-latin-1
-	      character set.</note>
+	      character set.</p></note>
   
 	      <p>If the <c>Command</c> cannot be run, an error
 	      exception, with the posix error code as the reason, is
@@ -3015,11 +3015,11 @@ os_prompt%</pre>
 	    Unicode translation of arguments, they can be supplied as
 	    binaries in whatever encoding is deemed appropriate.</p>
 
-	      <note>The characters in the arguments (if given as a
+	      <note><p>The characters in the arguments (if given as a
 	      list of characters) can only be &gt; 255 if the Erlang
 	      VM is started in Unicode file name mode,
 	      otherwise the arguments are limited to the
-	      ISO-latin-1 character set.</note>
+	      ISO-latin-1 character set.</p></note>
 
 	    <p>If one, for any reason, wants to explicitly set the
 	    program name in the argument vector, the <c>arg0</c>
diff --git a/erts/doc/src/erts_alloc.xml b/erts/doc/src/erts_alloc.xml
index 90347824d5..86e1e5168a 100644
--- a/erts/doc/src/erts_alloc.xml
+++ b/erts/doc/src/erts_alloc.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>2002</year><year>2010</year>
+      <year>2002</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -126,9 +126,8 @@
       carrier". Main multiblock carriers are never deallocated. The
       size of the main multiblock carrier is determined by the value
       of the <seealso marker="#M_mmbcs">mmbcs</seealso> parameter.</p>
-    <p>      <marker id="mseg_mbc_sizes"></marker>
-
-      Sizes of multiblock carriers allocated via <c>mseg_alloc</c> are
+    <p><marker id="mseg_mbc_sizes"></marker>Sizes of multiblock carriers
+      allocated via <c>mseg_alloc</c> are
       decided based on the values of the largest multiblock carrier
       size (<seealso marker="#M_lmbcs">lmbcs</seealso>), the smallest
       multiblock carrier size (<seealso marker="#M_smbcs">smbcs</seealso>),
@@ -157,9 +156,8 @@
     <p>Coalescing of free blocks are always performed immediately.
       Boundary tags (headers and footers) in free blocks are used
       which makes the time complexity for coalescing constant.</p>
-    <p>      <marker id="strategy"></marker>
-
-      The memory allocation strategy used for multiblock carriers by an
+    <p><marker id="strategy"></marker>The memory allocation strategy
+      used for multiblock carriers by an
       allocator is configurable via the <seealso marker="#M_as">as</seealso>
       parameter. Currently the following strategies are available:</p>
     <taglist>
@@ -445,10 +443,10 @@
        in "the <c>alloc_util</c> framework" section.</item>
       <tag><marker id="M_t"><c><![CDATA[+M<S>t true|false|<amount>]]></c></marker></tag>
       <item>
-       Multiple, thread specific instances of the allocator.
-       This option will only have any effect on the runtime system
-       with SMP support. Default behaviour on the runtime system with
-       SMP support (<c>N</c> equals the number of scheduler threads):
+        <p>Multiple, thread specific instances of the allocator.
+           This option will only have any effect on the runtime system
+           with SMP support. Default behaviour on the runtime system with
+           SMP support (<c>N</c> equals the number of scheduler threads):</p>
        <taglist>
          <tag><c>temp_alloc</c></tag>
 	 <item><c>N + 1</c> instances.</item>
@@ -459,10 +457,10 @@
 	 <c>16</c>. <c>16</c> instances when <c>N</c> is greater than
 	 <c>16</c>.</item>
        </taglist>
-       <c>temp_alloc</c> will always use <c>N + 1</c> instances when
-       this option has been enabled regardless of the amount passed.
-       Other allocators will use the same amount of instances as the
-       amount passed as long as it isn't greater than <c>N</c>.       
+       <p><c>temp_alloc</c> will always use <c>N + 1</c> instances when
+          this option has been enabled regardless of the amount passed.
+          Other allocators will use the same amount of instances as the
+          amount passed as long as it isn't greater than <c>N</c>.</p>
       </item>
     </taglist>
     <p>Currently the following flags are available for configuration of
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
index 5ac2c61c92..918f0bf9f7 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_FileTransferSession.xml
@@ -159,7 +159,7 @@
     </func>
     <func>
       <name>insert(FTS, SourceFile, DestinationFile, Offset) -> Return</name>
-      <fsummary>Insert the <c>SourceFile</c>into the <c>DestinationFile</c><c>Offset</c>bytes from the start of the file</fsummary>
+      <fsummary>Insert the <c>SourceFile</c>into the <c>DestinationFile</c> <c>Offset</c>bytes from the start of the file</fsummary>
       <type>
         <v>FTS = SourceFile = DestinationFile = #objref</v>
         <v>Offset = long()</v>
@@ -168,7 +168,7 @@
       <desc>
         <p>This operation behaves almost like the <c>append/3</c> operation. The 
           difference is that the <c>SourceFile</c> will be inserted into the
-          <c>DestinationFile</c><c>Offset</c> bytes from the start of the file.</p>
+          <c>DestinationFile</c> <c>Offset</c> bytes from the start of the file.</p>
         <p>Currently, it is not possible to use this operation when the target 
           object represents FTP.</p>
       </desc>
diff --git a/lib/erl_interface/doc/src/erl_format.xml b/lib/erl_interface/doc/src/erl_format.xml
index 5699485845..f036b12879 100644
--- a/lib/erl_interface/doc/src/erl_format.xml
+++ b/lib/erl_interface/doc/src/erl_format.xml
@@ -4,7 +4,7 @@
 <cref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -105,7 +105,7 @@ erl_format("[{name,~a},{age,~i},{data,~w}]",
           values in <c><![CDATA[Term]]></c>. </p>
         <p>If <c><![CDATA[Term]]></c> and <c><![CDATA[Pattern]]></c> can be matched, the
           function returns a non-zero value and binds any unbound
-          variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c><c><![CDATA[Pattern]]></c> do
+          variables in <c><![CDATA[Pattern]]></c>. If <c><![CDATA[Term]]></c> <c><![CDATA[Pattern]]></c> do
           not match, the function returns 0. For example:</p>
         <code type="none"><![CDATA[
 ETERM *term, *pattern, *pattern2;
diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index ef1f5985f4..ff8a12fe97 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -4,7 +4,7 @@
 <fileref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -170,7 +170,6 @@ Phases       [{Phase,PhaseArgs}]  undefined
           start phase defined by the <c>start_phases</c> key, and only
           after this extended start procedure will
           <c>application:start(Application)</c> return.</p>
-        <p></p>
         <p>Start phases may be used to synchronize startup of an
           application and its included applications. In this case,
           the <c>mod</c> key must be specified as:</p>
@@ -182,7 +181,6 @@ Phases       [{Phase,PhaseArgs}]  undefined
           for the primary application) both for the primary application
           and for each of its included application, for which the start
           phase is defined.</p>
-        <p></p>
         <p>This implies that for an included application, the set of
           start phases must be a subset of the set of phases defined
           for the primary application. Refer to <em>OTP Design Principles</em> for more information.</p>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 98cdd416b0..6b89711924 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -177,9 +177,9 @@
      archives. But the functions in <c>erl_prim_loader</c> may also be
      used by other applications to read files from archives. For
      example, the call
-     <c>erl_prim_loader:list_dir("/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"</c>
+     <c>erl_prim_loader:list_dir( "/otp/root/lib/mnesia-4.4.7.ez/mnesia-4.4.7/examples/bench)"</c>
      would list the contents of a directory inside an archive.
-     See <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso></p>
+     See <seealso marker="erts:erl_prim_loader">erl_prim_loader(3)</seealso></p>.
 
     <p>An application archive file and a regular application directory
      may coexist. This may be useful when there is a need of having
diff --git a/lib/kernel/doc/src/disk_log.xml b/lib/kernel/doc/src/disk_log.xml
index 9721907162..d278d54d93 100644
--- a/lib/kernel/doc/src/disk_log.xml
+++ b/lib/kernel/doc/src/disk_log.xml
@@ -475,8 +475,7 @@
       <fsummary>Close a disk log.</fsummary>
       <type name="close_error_rsn"/>
       <desc>
-        <p>          <marker id="close_1"></marker>
-The function <c>close/1</c> closes a
+        <p><marker id="close_1"></marker>The function <c>close/1</c> closes a
           local or distributed disk log properly. An internally
           formatted log must be closed before the Erlang system is
           stopped, otherwise the log is regarded as unclosed and the
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index f9514dda2f..1911fb628e 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -989,7 +989,7 @@
                       <c>{ok, pending_driver}</c> or <c>{ok, pending_process}</c>.</p>
                   </item>
                 </taglist>
-                <p>The <c>pending_driver</c><c>MonitorOption</c> is by far
+                <p>The <c>pending_driver</c> <c>MonitorOption</c> is by far
                   the most useful and it has to be used to ensure that the
                   driver has really been unloaded and the ports closed
                   whenever the <c>kill_ports</c> option is used or the
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 861c582211..7db20e6343 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -60,11 +60,13 @@
     converted, why the Unicode mode for file names is not default on
     systems having completely transparent file naming.</p>
 
-    <note>As of R14B01, the most basic file handling modules
-    (<c>file</c>, <c>prim_file</c>, <c>filelib</c> and
-    <c>filename</c>) accept raw file names, but the rest of OTP is not
-    guaranteed to handle them, why Unicode file naming on systems
-    where it is not default is still considered experimental.</note>
+    <note>
+      <p>As of R14B01, the most basic file handling modules
+      (<c>file</c>, <c>prim_file</c>, <c>filelib</c> and
+      <c>filename</c>) accept raw file names, but the rest of OTP is not
+      guaranteed to handle them, why Unicode file naming on systems
+      where it is not default is still considered experimental.</p>
+    </note>
 
     <p>Raw file names is a new feature in OTP R14B01, which allows the
     user to supply completely uninterpreted file names to the
@@ -249,11 +251,9 @@
           </item>
         </taglist>
         <p>Example:</p>
-        <code type="none">
-f.txt:  {person, "kalle", 25}.
+<code type="none">f.txt:  {person, "kalle", 25}.
         {person, "pelle", 30}.</code>
-        <pre>
-1> <input>file:consult("f.txt").</input>
+<pre>1> <input>file:consult("f.txt").</input>
 {ok,[{person,"kalle",25},{person,"pelle",30}]}</pre>
       </desc>
     </func>
@@ -362,7 +362,6 @@ f.txt:  {person, "kalle", 25}.
           <p>In a future release, a bad type for the
             <c><anno>Filename</anno></c> argument will probably generate
             an exception.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
@@ -1523,7 +1522,6 @@ f.txt:  {person, "kalle", 25}.
           <p>In a future release, a bad type for the
             <c><anno>Dir</anno></c>
             argument will probably generate an exception.</p>
-          <p></p>
         </warning>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/gen_sctp.xml b/lib/kernel/doc/src/gen_sctp.xml
index cc49090386..688cd0f78f 100644
--- a/lib/kernel/doc/src/gen_sctp.xml
+++ b/lib/kernel/doc/src/gen_sctp.xml
@@ -47,8 +47,7 @@
       SUSE Linux Enterprise Server 10 Service Pack 1 (x86_64)
       kernel 2.6.16.54-0.2.3-smp with lksctp-tools-1.0.7.</p>
     <p>Record definitions for the <c>gen_sctp</c> module can be found using:</p>
-    <pre>
-  -include_lib("kernel/include/inet_sctp.hrl").    </pre>
+<pre>  -include_lib("kernel/include/inet_sctp.hrl").    </pre>
     <p>These record definitions use the "new" spelling 'adaptation',
       not the deprecated 'adaption', regardless of which
       spelling the underlying C API uses.</p>
@@ -152,8 +151,7 @@
           The result of <c>connect/*</c> is an <c>#sctp_assoc_change{}</c>
           event which contains, in particular, the new 
           <seealso marker="#type-assoc_id">Association ID</seealso>.</p>
-        <pre>
-  #sctp_assoc_change{
+<pre>   #sctp_assoc_change{
         state             = atom(),
         error             = atom(),
         outbound_streams  = integer(),
@@ -163,8 +161,7 @@
         <p>The number of outbound and inbound streams can be set by
           giving an <c>sctp_initmsg</c> option to <c>connect</c>
           as in:</p>
-        <pre>
-  connect(<anno>Socket</anno>, Ip, <anno>Port</anno>,
+<pre>  connect(<anno>Socket</anno>, Ip, <anno>Port</anno>,
         [{sctp_initmsg,#sctp_initmsg{num_ostreams=OutStreams,
                                      max_instreams=MaxInStreams}}])        </pre>
         <p>All options <c><anno>Opt</anno></c> are set on the socket before the
@@ -340,8 +337,7 @@
             <p><seealso marker="#record-sctp_assoc_change">#sctp_assoc_change{}</seealso>;</p>
           </item>
           <item>
-            <pre>
-  #sctp_paddr_change{
+<pre>  #sctp_paddr_change{
         addr      = {ip_address(),port()},
         state     = atom(),
         error     = integer(),
@@ -378,8 +374,7 @@
               converted into a string using <c>error_string/1</c>.</p>
           </item>
           <item>
-            <pre>
-  #sctp_send_failed{
+<pre>  #sctp_send_failed{
         flags     = true | false,
         error     = integer(),
         info      = #sctp_sndrcvinfo{},
@@ -399,8 +394,7 @@
               returned by <c>recv/*</c>.</p>
           </item>
           <item>
-            <pre>
-  #sctp_adaptation_event{
+<pre>  #sctp_adaptation_event{
         adaptation_ind = integer(),
         assoc_id       = assoc_id()
   }            </pre>
@@ -411,8 +405,7 @@
               the Erlang/SCTP binding, this event is disabled by default.</p>
           </item>
           <item>
-            <pre>
-  #sctp_pdapi_event{
+<pre>  #sctp_pdapi_event{
         indication = sctp_partial_delivery_aborted,
         assoc_id   = assoc_id()
   }            </pre>
@@ -469,7 +462,7 @@
     <marker id="option-binary"></marker>
     <marker id="option-list"></marker>
     <taglist>
-      <tag><c>{mode, list|binary}</c>or just <c>list</c> or <c>binary</c>.</tag>
+      <tag><c>{mode, list|binary}</c> or just <c>list</c> or <c>binary</c></tag>
       <item>
         <p>Determines the type of data returned from <c>gen_sctp:recv/1,2</c>.</p>
         <marker id="option-active"></marker>
@@ -562,8 +555,7 @@
       </item>
       <tag><c>{sctp_rtoinfo, #sctp_rtoinfo{}}</c></tag>
       <item>
-        <pre>
-  #sctp_rtoinfo{
+<pre>  #sctp_rtoinfo{
         assoc_id = assoc_id(),
         initial  = integer(),
         max      = integer(),
@@ -577,8 +569,7 @@
       </item>
       <tag><c>{sctp_associnfo, #sctp_assocparams{}}</c></tag>
       <item>
-        <pre>
-  #sctp_assocparams{
+<pre>  #sctp_assocparams{
         assoc_id                 = assoc_id(),
         asocmaxrxt               = integer(),
         number_peer_destinations = integer(),
@@ -593,8 +584,7 @@
       </item>
       <tag><c>{sctp_initmsg, #sctp_initmsg{}}</c></tag>
       <item>
-        <pre>
-  #sctp_initmsg{
+<pre>  #sctp_initmsg{
        num_ostreams   = integer(),
        max_instreams  = integer(),
        max_attempts   = integer(),
@@ -622,7 +612,6 @@
               for establishing an association.</p>
           </item>
         </list>
-        <p></p>
       </item>
       <tag><c>{sctp_autoclose, integer() >= 0}</c></tag>
       <item>
@@ -657,8 +646,7 @@
       </item>
       <tag><c>{sctp_primary_addr, #sctp_prim{}}</c></tag>
       <item>
-        <pre>
-  #sctp_prim{
+<pre>  #sctp_prim{
         assoc_id = assoc_id(),
         addr     = {IP, Port}
   }
@@ -671,8 +659,7 @@
       </item>
       <tag><c>{sctp_set_peer_primary_addr, #sctp_setpeerprim{}}</c></tag>
       <item>
-        <pre>
-  #sctp_setpeerprim{
+<pre>  #sctp_setpeerprim{
         assoc_id = assoc_id(),
         addr     = {IP, Port}
   }
@@ -686,8 +673,7 @@
       <tag><c>{sctp_adaptation_layer, #sctp_setadaptation{}}</c></tag>
       <item>
         <marker id="record-sctp_setadaptation"></marker>
-        <pre>
-  #sctp_setadaptation{
+<pre>  #sctp_setadaptation{
         adaptation_ind = integer()
   }        </pre>
         <p>When set, requests that the local endpoint uses the value given by
@@ -698,8 +684,7 @@
       </item>
       <tag><c>{sctp_peer_addr_params, #sctp_paddrparams{}}</c></tag>
       <item>
-        <pre>
-  #sctp_paddrparams{
+<pre>  #sctp_paddrparams{
         assoc_id   = assoc_id(),
         address    = {IP, Port},
         hbinterval = integer(),
@@ -756,16 +741,13 @@
                 <p><c>sackdelay_disable</c>: disable SAC delay.</p>
               </item>
             </list>
-            <p></p>
           </item>
         </list>
-        <p></p>
       </item>
       <tag><c>{sctp_default_send_param, #sctp_sndrcvinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_sndrcvinfo"></marker>
-        <pre>
-  #sctp_sndrcvinfo{
+<pre>  #sctp_sndrcvinfo{
         stream     = integer(),
         ssn        = integer(),
         flags      = list(),
@@ -807,20 +789,17 @@
                   association, with flushing of unsent data.</p>
               </item>
             </list>
-            <p></p>
             <p>Other fields are rarely used. See 
               <url href="http://www.rfc-archive.org/getrfc.php?rfc=2960">RFC2960</url> and 
               <url href="http://tools.ietf.org/html/draft-ietf-tsvwg-sctpsocket-13">Sockets API Extensions for SCTP</url> for full information.</p>
           </item>
         </list>
-        <p></p>
         <marker id="option-sctp_events"></marker>
       </item>
       <tag><c>{sctp_events, #sctp_event_subscribe{}}</c></tag>
       <item>
         <marker id="record-sctp_event_subscribe"></marker>
-        <pre>
-  #sctp_event_subscribe{
+<pre>  #sctp_event_subscribe{
           data_io_event          = true | false,
           association_event      = true | false,
           address_event          = true | false,
@@ -845,8 +824,7 @@
       </item>
       <tag><c>{sctp_delayed_ack_time, #sctp_assoc_value{}}</c></tag>
       <item>
-        <pre>
-  #sctp_assoc_value{
+<pre>  #sctp_assoc_value{
         assoc_id    = assoc_id(),
         assoc_value = integer()
   }        </pre>
@@ -857,8 +835,7 @@
       </item>
       <tag><c>{sctp_status, #sctp_status{}}</c></tag>
       <item>
-        <pre>
-  #sctp_status{
+<pre>  #sctp_status{
         assoc_id            = assoc_id(),
         state               = atom(),
         rwnd                = integer(),
@@ -930,14 +907,12 @@
               address (see below for the format of <c>#sctp_paddrinfo{}</c>).</p>
           </item>
         </list>
-        <p></p>
         <marker id="option-sctp_get_peer_addr_info"></marker>
       </item>
       <tag><c>{sctp_get_peer_addr_info, #sctp_paddrinfo{}}</c></tag>
       <item>
         <marker id="record-sctp_paddrinfo"></marker>
-        <pre>
-  #sctp_paddrinfo{
+<pre>  #sctp_paddrinfo{
         assoc_id  = assoc_id(),
         address   = {IP, Port},
         state     = inactive | active,
@@ -968,8 +943,7 @@
       <item>
         <p>Example of an Erlang SCTP Server which receives SCTP messages and
           prints them on the standard output:</p>
-        <pre>
-  -module(sctp_server).
+<pre>  -module(sctp_server).
   
   -export([server/0,server/1,server/2]).
   -include_lib("kernel/include/inet.hrl").
@@ -998,7 +972,6 @@
           io:format("Received: ~p~n", [Data])
       end,
       server_loop(S).        </pre>
-        <p></p>
       </item>
       <item>
         <p>Example of an Erlang SCTP Client which interacts with the above Server.
@@ -1008,8 +981,7 @@
           over Stream 5 fails. The client then <c>abort</c>s the association,
           which results in the corresponding Event being received on
           the Server side.</p>
-        <pre>
-  -module(sctp_client).
+<pre>  -module(sctp_client).
   
   -export([client/0, client/1, client/2]).
   -include_lib("kernel/include/inet.hrl").
@@ -1042,13 +1014,11 @@
       
       timer:sleep(1000),
       gen_sctp:close(S).        </pre>
-        <p></p>
       </item>
       <item>
         <p>A very simple Erlang SCTP Client which uses the
           connect_init API.</p>
-        <pre>
--module(ex3).
+<pre>-module(ex3).
 
 -export([client/4]).
 -include_lib("kernel/include/inet.hrl").
@@ -1101,7 +1071,6 @@ client_loop(S, Peer1, Port1, AssocId1, Peer2, Port2, AssocId2) -&gt;
             ok
     end.
 </pre>
-        <p></p>
       </item>
     </list>
   </section>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 96e2aa665d..3b7a710664 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -37,13 +37,10 @@
       monitoring of the network.</p>
     <p>An Erlang node is started using the command line flag
       <c>-name</c> or <c>-sname</c>:</p>
-    <pre>
-$ <input>erl -sname foobar</input></pre>
+<pre>$ <input>erl -sname foobar</input></pre>
     <p>It is also possible to call <c>net_kernel:start([foobar])</c>
       directly from the normal Erlang shell prompt:</p>
-    <p></p>
-    <pre>
-1> <input>net_kernel:start([foobar, shortnames]).</input>
+<pre>1> <input>net_kernel:start([foobar, shortnames]).</input>
 {ok,&lt;0.64.0>}
 (foobar@gringotts)2></pre>
     <p>If the node is started with the command line flag <c>-sname</c>,
@@ -226,7 +223,6 @@ $ <input>erl -sname foobar</input></pre>
           <c><anno>NetTicktime</anno></c> seconds. <c><anno>TransitionPeriod</anno></c> defaults
           to 60.</p>
         <p>Some definitions:</p>
-        <p></p>
         <taglist>
           <tag>The minimum transition traffic interval (<c>MTTI</c>)</tag>
           <item>
diff --git a/lib/megaco/doc/src/megaco.xml b/lib/megaco/doc/src/megaco.xml
index b9bf414299..5dd622368c 100644
--- a/lib/megaco/doc/src/megaco.xml
+++ b/lib/megaco/doc/src/megaco.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2000</year><year>2010</year>
+      <year>2000</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -646,7 +646,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
               segments has not yet been received.</p>
             <p>When the timer finally expires, a "megaco segments not
               received" (459) error message is sent to the other side
-              and the user is notified with a <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the 
+              and the user is notified with a <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the
               <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> callback function or 
               the return value of the 
               <seealso marker="megaco#call">call</seealso> function. </p>
@@ -1165,7 +1165,7 @@ megaco_incr_timer() = #megaco_incr_timer{}
             <p>When the timer finally expires, a "megaco segments not
               received" (459) error message is sent to the other side
               and the user is notified with a 
-              <c><![CDATA[segment timeout]]></c><c><![CDATA[UserReply]]></c> in either the 
+              <c><![CDATA[segment timeout]]></c> <c><![CDATA[UserReply]]></c> in either the
               <seealso marker="megaco_user#trans_reply">handle_trans_reply</seealso> 
               callback function or 
               the return value of the 
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index 7a8f796cee..19ec70118f 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -246,7 +246,7 @@ If a new item is inserted with the same key as
               </p>
           </item>
           <item>
-            <p><c>{max,MaxTabs}</c><c>MaxTabs</c> is a list of
+            <p><c>{max,MaxTabs}</c>. <c>MaxTabs</c> is a list of
               tables that should be included in the checkpoint. The
               default is []. For these tables, the redundancy will be
               maximized and checkpoint information will be retained together
@@ -274,7 +274,7 @@ If a new item is inserted with the same key as
               </p>
           </item>
           <item>
-            <p><c>{ram_overrides_dump,Bool} </c> Only applicable
+            <p><c>{ram_overrides_dump,Bool}</c>. Only applicable
               for <c>ram_copies</c>.  <c>Bool</c> allows you to choose
               to backup the table state as it is in RAM, or as it is on
               disc. <c>true</c> means that the latest committed
diff --git a/lib/mnesia/doc/src/mnesia_frag_hash.xml b/lib/mnesia/doc/src/mnesia_frag_hash.xml
index 73162c3974..665796f20d 100644
--- a/lib/mnesia/doc/src/mnesia_frag_hash.xml
+++ b/lib/mnesia/doc/src/mnesia_frag_hash.xml
@@ -64,7 +64,7 @@
         <p>Note that the <c>add_frag/2</c> function will be invoked
           one time each for the rest of the fragments (all but number 1)
           as a part of the table creation procedure.</p>
-        <p><c>State</c> is the initial value of the <c>hash_state</c><c>frag_property</c>. The <c>NewState</c> will be stored as
+        <p><c>State</c> is the initial value of the <c>hash_state</c> <c>frag_property</c>. The <c>NewState</c> will be stored as
           <c>hash_state</c> among the other <c>frag_properties</c>.
           </p>
       </desc>
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 11ca97f743..8a58dc2848 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1999</year><year>2010</year>
+      <year>1999</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -138,7 +138,7 @@
       <fsummary>Opens a connection to the database. </fsummary>
       <type>
         <v>ConnectStr = string()</v>
-        <d>An example of a connection string:<c>"DSN=sql-server;UID=aladdin;PWD=sesame"</c>where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example<c>"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame"</c>where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.</d>
+        <d>An example of a connection string: <c>"DSN=sql-server;UID=aladdin;PWD=sesame"</c> where DSN is your ODBC Data Source Name, UID is a database user id and PWD is the password for that user. These are usually the attributes required in the connection string, but some drivers have other driver specific attributes, for example <c>"DSN=Oracle8;DBQ=gandalf;UID=aladdin;PWD=sesame"</c> where DBQ is your TNSNAMES.ORA entry name e.g. some Oracle specific configuration attribute.</d>
         <v>Options = [] | [option()]</v>
         <d>All options has default values. </d>
         <v>option() = {auto_commit, on | off} | {timeout, milliseconds()}
@@ -432,7 +432,7 @@
       <desc>
         <p>Selects <c>N</c> consecutive rows of the result set. If
           <c>Position</c> is <c>next</c> it is semantically equivalent
-          of calling <c>next/[1,2]</c><c>N</c> times. If
+          of calling <c>next/[1,2]</c> <c>N</c> times. If
           <c>Position</c> is <c>{relative, Pos}</c>, <c>Pos</c> will be
           used as an offset from the current cursor position to
           determine the first selected row. If <c>Position</c> is
diff --git a/lib/orber/doc/src/orber_ifr.xml b/lib/orber/doc/src/orber_ifr.xml
index 021082e101..2d47d57476 100644
--- a/lib/orber/doc/src/orber_ifr.xml
+++ b/lib/orber/doc/src/orber_ifr.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1997</year><year>2009</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -297,7 +297,7 @@
       </desc>
     </func>
     <func>
-      <name>describe_contents(Objref,Limit_type,Exclude_inherited,Max_returned_objs) -> Return</name>
+      <name>describe_contents(Objref, Limit_type, Exclude_inherited, Max_returned_objs) -> Return</name>
       <fsummary>Return a list of descriptions of the IFR objects contained by the target Container object</fsummary>
       <type>
         <v>Objref = #IFR_objref</v>
diff --git a/lib/parsetools/doc/src/yecc.xml b/lib/parsetools/doc/src/yecc.xml
index 1d2a985d7d..66bc6f4795 100644
--- a/lib/parsetools/doc/src/yecc.xml
+++ b/lib/parsetools/doc/src/yecc.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>1996</year><year>2009</year>
+      <year>1996</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -336,7 +336,7 @@ element -> list : '$1'.    </code>
     <code type="none">
 {cons, {atom, 1, a,} {cons, {atom, 1, b},
                             {cons, {atom, 1, c}, nil}}}    </code>
-    <p>The associated code contains <c>pseudo variables</c><c>'$1'</c>, <c>'$2'</c>, <c>'$3'</c>, etc. which refer to (are
+    <p>The associated code contains <c>pseudo variables</c> <c>'$1'</c>, <c>'$2'</c>, <c>'$3'</c>, etc. which refer to (are
       bound to) the values associated previously by the parser with
       the symbols of the right hand side of the rule. When these
       symbols are terminal categories, the values are token tuples of
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>
diff --git a/lib/test_server/doc/src/ts.xml b/lib/test_server/doc/src/ts.xml
index 496ad3667a..f9b48d8372 100644
--- a/lib/test_server/doc/src/ts.xml
+++ b/lib/test_server/doc/src/ts.xml
@@ -77,7 +77,7 @@
         </p>
     <p><c>ts:install/0</c> is used if the target platform is the
         same as the controller host, i.e. if you run on "local target"
-        and no options are needed. Then running <c>ts:install/0</c><c>ts</c> 
+        and no options are needed. Then running <c>ts:install/0</c> <c>ts</c>
 	will run an autoconf script for your current
         environment and set up the necessary variables needed by the
         test suites.
diff --git a/lib/wx/src/gen/wxRegion.erl b/lib/wx/src/gen/wxRegion.erl
index 0ceba1d203..4e8d98a54f 100644
--- a/lib/wx/src/gen/wxRegion.erl
+++ b/lib/wx/src/gen/wxRegion.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -48,7 +48,7 @@ new() ->
 %% new(Bmp::wxBitmap:wxBitmap()) -> wxRegion() </c>
 %% </p>
 %% <p><c>
-%% new(Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> wxRegion() </c>
+%% new(Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> wxRegion() </c>
 %% </p>
 new(#wx_ref{type=BmpT,ref=BmpRef}) ->
   ?CLASS(BmpT,wxBitmap),
diff --git a/lib/wx/src/gen/wxWindow.erl b/lib/wx/src/gen/wxWindow.erl
index 33665a0ad6..031314bfe2 100644
--- a/lib/wx/src/gen/wxWindow.erl
+++ b/lib/wx/src/gen/wxWindow.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -1144,10 +1144,10 @@ setCaret(#wx_ref{type=ThisT,ref=ThisRef},#wx_ref{type=CaretT,ref=CaretRef}) ->
 %% @doc See <a href="http://www.wxwidgets.org/manuals/stable/wx_wxwindow.html#wxwindowsetclientsize">external documentation</a>.
 %% <br /> Alternatives:
 %% <p><c>
-%% setClientSize(This::wxWindow(), Size::{W::integer(),H::integer()}) -> ok </c>
+%% setClientSize(This::wxWindow(), Size::{W::integer(), H::integer()}) -> ok </c>
 %% </p>
 %% <p><c>
-%% setClientSize(This::wxWindow(), Rect::{X::integer(),Y::integer(),W::integer(),H::integer()}) -> ok </c>
+%% setClientSize(This::wxWindow(), Rect::{X::integer(), Y::integer(), W::integer(), H::integer()}) -> ok </c>
 %% </p>
 setClientSize(#wx_ref{type=ThisT,ref=ThisRef},{SizeW,SizeH})
  when is_integer(SizeW),is_integer(SizeH) ->