Merge branch 'maint'

14 files changed, 104 insertions, 105 deletions

diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index b020643149..6b6f46d39f 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -356,11 +356,11 @@ File3.asn        </pre>
           </item>
         </list>
 
-        <p>Schematically the following happens for each type in the module:
+        <p>Schematically the following happens for each type in the module:</p>
         <code type="none">
 {ok, Value} = asn1ct:value(Module, Type),
 {ok, Bytes} = asn1ct:encode(Module, Type, Value),
-{ok, Value} = asn1ct:decode(Module, Type, Bytes).</code></p>
+{ok, Value} = asn1ct:decode(Module, Type, Bytes).</code>
 
         <p>The <c>test</c> functions utilizes the <c>*.asn1db</c> files
           for all included modules. If they are located in a different
diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 84adbb5723..ea4522c40b 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -99,11 +99,11 @@
 	  be executed by Common Test. A test case is represented by an atom,
 	  the name of the test case function. A test case group is
 	  represented by a <c>group</c> tuple, where <c>GroupName</c>,
-	  an atom, is the name of the group (defined in <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  an atom, is the name of the group (defined in <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  Execution properties for groups may also be specified, both
 	  for a top level group and for any of its sub-groups.
 	  Group execution properties specified here, will override
-	  properties in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>).
+	  properties in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>).
 	  (With value <c>default</c>, the group definition properties
 	  will be used).</p>
 	
@@ -186,8 +186,8 @@
 	  test cases in the suite).</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -203,11 +203,11 @@
 	  in any of the configuration files, all test cases are skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test suite related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -266,7 +266,7 @@
 	
 	<p>This function is called as the last test case in the
 	  suite. It is meant to be used for cleaning up after
-	  <c><seealso marker="#Module:init_per_suite-1">init_per_suite/1</seealso></c>.
+	  <seealso marker="#Module:init_per_suite-1"><c>init_per_suite/1</c></seealso>.
 	  For information on <c>save_config</c>, please see 
 	  <seealso marker="dependencies_chapter#save_config">Dependencies
 	    between Test Cases and Suites</seealso> in the User's Guide.</p>
@@ -313,13 +313,13 @@
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of a test case group (i.e. its test cases
 	  and sub-groups). Properties set by
-	  <c><seealso marker="#Module:group-1">group/1</seealso></c> override
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso> override
 	  properties with the same key that have been previously set by
-	  <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time each
-	  test case is allowed to execute (including <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c>). If the timetrap time is
+	  test case is allowed to execute (including <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso>). If the timetrap time is
 	  exceeded, the test case fails with reason
 	  <c>timetrap_timeout</c>. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
@@ -334,11 +334,11 @@
 	  in any of the configuration files, all test cases in this group are skipped.
 	  For more information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case group related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-2">ct:userdata/2</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-2"><c>ct:userdata/2</c></seealso>.</p>
 
 	  <p>The <c>ct_hooks</c> tag specifies which 
 	  <seealso marker="ct_hooks_chapter">Common Test Hooks</seealso>
@@ -371,7 +371,7 @@
 	    test case group. It typically contains initializations which are 
 	    common for all test cases and sub-groups in the group, and which
 	    shall only be performed once. <c>GroupName</c> is the name of the
-	    group, as specified in the group definition (see <c><seealso marker="#Module:groups-0">groups/0</seealso></c>). The
+	    group, as specified in the group definition (see <seealso marker="#Module:groups-0"><c>groups/0</c></seealso>). The
 	    <c>Config</c> parameter is the configuration data which can be modified
 	    here. The return value of this function is given as <c>Config</c> 
 	    to all test cases and sub-groups in the group. If <c>{skip,Reason}</c>
@@ -400,10 +400,10 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p>This function is called after the execution of a test case group is finished.
-	    It is meant to be used for cleaning up after <c><seealso marker="#Module:init_per_group-2">init_per_group/2</seealso></c>.
+	    It is meant to be used for cleaning up after <seealso marker="#Module:init_per_group-2"><c>init_per_group/2</c></seealso>.
 	    By means of <c>{return_group_result,Status}</c>, it is possible to return a 
 	    status value for a nested sub-group. The status can be retrieved in
-	    <c><seealso marker="#Module:end_per_group-2">end_per_group/2</seealso></c> for the group on the level above. The status will also
+	    <seealso marker="#Module:end_per_group-2"><c>end_per_group/2</c></seealso> for the group on the level above. The status will also
 	    be used by Common Test for deciding if execution of a group should proceed in
 	    case the property <c>sequence</c> or <c>repeat_until_*</c> is set.</p>
 
@@ -454,7 +454,7 @@
 	  <p> OPTIONAL </p>
 	  
 	  <p> This function is called after each test case, and can be used
-	    to clean up after <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c> and the test case.
+	    to clean up after <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso> and the test case.
 	    Any return value (besides <c>{fail,Reason}</c> and <c>{save_config,SaveConfig}</c>) 
 	    is ignored. By returning <c>{fail,Reason}</c>, <c>TestCase</c> will be marked as
 	    failed (even though it was actually successful in the sense that it returned
@@ -496,15 +496,15 @@
 	<p>This is the test case info function. It is supposed to 
 	  return a list of tagged tuples that specify various properties
 	  related to the execution of this particular test case.
-	  Properties set by <c><seealso marker="#Module:Testcase-0">Testcase/0</seealso></c> override
+	  Properties set by <seealso marker="#Module:Testcase-0"><c>Testcase/0</c></seealso> override
 	  properties that have been previously set for the test case
-	  by <c><seealso marker="#Module:group-1">group/1</seealso></c> or <c><seealso marker="#Module:suite-0">suite/0</seealso></c>.</p>
+	  by <seealso marker="#Module:group-1"><c>group/1</c></seealso> or <seealso marker="#Module:suite-0"><c>suite/0</c></seealso>.</p>
 	  
 	<p>The <c>timetrap</c> tag sets the maximum time the
 	  test case is allowed to execute. If the timetrap time is
 	  exceeded, the test case fails with reason
-	  <c>timetrap_timeout</c>. <c><seealso marker="#Module:init_per_testcase-2">init_per_testcase/2</seealso></c>
-	  and <c><seealso marker="#Module:end_per_testcase-2">end_per_testcase/2</seealso></c> are included in the
+	  <c>timetrap_timeout</c>. <seealso marker="#Module:init_per_testcase-2"><c>init_per_testcase/2</c></seealso>
+	  and <seealso marker="#Module:end_per_testcase-2"><c>end_per_testcase/2</c></seealso> are included in the
 	  timetrap time. A <c>TimeFunc</c> function can be used to
 	  set a new timetrap by returning a <c>TimeVal</c>. It may also be
 	  used to trigger a timetrap timeout by, at some point, returning a
@@ -518,15 +518,15 @@
 	  configuration files, the test case is skipped. For more
 	  information about the 'require' functionality, see the
 	  reference manual for the function
-	  <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c>.</p>
+	  <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso>.</p>
 
 	<p>If <c>timetrap</c> and/or <c>require</c> is not set, the
-	  default values specified by <c><seealso marker="#Module:suite-0">suite/0</seealso></c> (or
-	  <c><seealso marker="#Module:group-1">group/1</seealso></c>) will be used.</p>
+	  default values specified by <seealso marker="#Module:suite-0"><c>suite/0</c></seealso> (or
+	  <seealso marker="#Module:group-1"><c>group/1</c></seealso>) will be used.</p>
 
 	<p>With <c>userdata</c>, it is possible for the user to
 	  specify arbitrary test case related information which can be 
-	  read by calling <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>.</p>
+	  read by calling <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>.</p>
 	
 	<p>Other tuples than the ones defined will simply be ignored.</p>
 
@@ -554,7 +554,7 @@
 	<p>This is the implementation of a test case. Here you must
 	  call the functions you want to test, and do whatever you
 	  need to check the result. If something fails, make sure the
-	  function causes a runtime error, or call <c><seealso marker="ct#fail-1">ct:fail/1/2</seealso></c>
+	  function causes a runtime error, or call <seealso marker="ct#fail-1"><c>ct:fail/1/2</c></seealso>
 	  (which also causes the test case process to terminate).</p>
 	
 	<p>Elements from the <c>Config</c> list can e.g. be read
@@ -582,7 +582,7 @@
 	  Test Cases and Suites</seealso> in the User's Guide.</p>
       </desc>
     </func>
-    
+     
   </funcs>
 
 </erlref>
diff --git a/lib/common_test/doc/src/config_file_chapter.xml b/lib/common_test/doc/src/config_file_chapter.xml
index 1849c17bb8..d3068db17b 100644
--- a/lib/common_test/doc/src/config_file_chapter.xml
+++ b/lib/common_test/doc/src/config_file_chapter.xml
@@ -80,7 +80,7 @@
     test is skipped (unless a default value has been specified, see the
     <seealso marker="write_test_chapter#info_function">test case info
     function</seealso> chapter for details). There is also a function
-    <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which can be called from a test case
+    <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> which can be called from a test case
     in order to check if a specific variable is available. The return 
     value from this function must be checked explicitly and appropriate 
     action be taken depending on the result (e.g. to skip the test case
@@ -90,7 +90,7 @@
     info-list should look like this:
     <c>{require,CfgVarName}</c> or <c>{require,AliasName,CfgVarName}</c>.
     The arguments <c>AliasName</c> and <c>CfgVarName</c> are the same as the
-    arguments to <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> which are described in the
+    arguments to <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> which are described in the
     reference manual for <seealso marker="ct">ct</seealso>.
     <c>AliasName</c> becomes an alias for the configuration variable,
     and can be used as reference to the configuration data value.
@@ -103,7 +103,7 @@
         (or test case) and improve readability.</item>
     </list>
     <p>To read the value of a config variable, use the function
-    <c><seealso marker="ct#get_config-1">get_config/1/2/3</seealso></c>
+    <seealso marker="ct#get_config-1"><c>get_config/1/2/3</c></seealso>
     which is also described in the reference
     manual for <seealso marker="ct">ct</seealso>.</p>
     <p>Example:</p>
@@ -121,7 +121,7 @@
   <section>
   <title>Using configuration variables defined in multiple files</title>
     <p>If a configuration variable is defined in multiple files and you 
-      want to access all possible values, you may use the <c><seealso marker="ct#get_config-3">ct:get_config/3</seealso></c>
+      want to access all possible values, you may use the <seealso marker="ct#get_config-3"><c>ct:get_config/3</c></seealso>
       function and specify <c>all</c> in the options list. The values will then
       be returned in a list and the order of the elements corresponds to the order 
       that the config files were specified at startup. Please see 
@@ -133,7 +133,7 @@
     <marker id="encrypted_config_files"></marker>
     <p>It is possible to encrypt configuration files containing sensitive data
       if these files must be stored in open and shared directories.</p> 
-      <p>Call <c><seealso marker="ct#encrypt_config_file-2">ct:encrypt_config_file/2/3</seealso></c> to have Common Test encrypt a
+      <p>Call <seealso marker="ct#encrypt_config_file-2"><c>ct:encrypt_config_file/2/3</c></seealso> to have Common Test encrypt a
       specified file using the DES3 function in the OTP <c>crypto</c> application.
       The encrypted file can then be used as a regular configuration file,
       in combination with other encrypted files or normal text files. The key
@@ -142,7 +142,7 @@
       <c>decrypt_file</c> flag/option, or a key file in a predefined location.</p>
       
       <p>Common Test also provides decryption functions, 
-      <c><seealso marker="ct#decrypt_config_file-2">ct:decrypt_config_file/2/3</seealso></c>, for recreating the original text
+      <seealso marker="ct#decrypt_config_file-2"><c>ct:decrypt_config_file/2/3</c></seealso>, for recreating the original text
       files.</p> 
 
       <p>Please see the <seealso marker="ct">ct</seealso> reference manual for
@@ -152,8 +152,8 @@
   <section>
     <title>Opening connections by using configuration data</title>
     <p>There are two different methods for opening a connection
-      by means of the support functions in e.g. <c><seealso marker="ct_ssh">ct_ssh</seealso></c>, <c><seealso marker="ct_ftp">ct_ftp</seealso></c>,
-      and <c><seealso marker="ct_telnet">ct_telnet</seealso></c>:</p>
+      by means of the support functions in e.g. <seealso marker="ct_ssh"><c>ct_ssh</c></seealso>, <seealso marker="ct_ftp"><c>ct_ftp</c></seealso>,
+      and <seealso marker="ct_telnet"><c>ct_telnet</c></seealso>:</p>
     <list>
       <item>Using a configuration target name (an alias) as reference.</item>
       <item>Using the configuration variable as reference.</item>
diff --git a/lib/common_test/doc/src/cover_chapter.xml b/lib/common_test/doc/src/cover_chapter.xml
index 2d504b485f..a215c8c2f3 100644
--- a/lib/common_test/doc/src/cover_chapter.xml
+++ b/lib/common_test/doc/src/cover_chapter.xml
@@ -94,7 +94,7 @@
     <p><c>$ ct_run -dir $TESTOBJS/db -cover $TESTOBJS/db/config/db.coverspec</c></p>
     
     <p>You may also pass the cover specification file name in a
-      call to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, by adding a <c>{cover,CoverSpec}</c>
+      call to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, by adding a <c>{cover,CoverSpec}</c>
       tuple to the <c>Opts</c> argument. Also, you can of course 
       enable code coverage in your test specifications (read
       more in the chapter about 
@@ -102,8 +102,8 @@
       specifications</seealso>).</p>
   </section>
 
-  <marker id="cover_stop"></marker>
   <section>
+  <marker id="cover_stop"></marker>
     <title>Stopping the cover tool when tests are completed</title>
     <p>By default the Cover tool is automatically stopped when the
       tests are completed. This causes the original (non cover
@@ -120,8 +120,8 @@
 
     <p>The option can be set by using the <c>-cover_stop</c> flag with
       <c>ct_run</c>, by adding <c>{cover_stop,true|false}</c> to the
-      Opts argument to <c><seealso
-      marker="ct#run_test-1">ct:run_test/1</seealso></c>, or by adding
+      Opts argument to <seealso
+      marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, or by adding
       a <c>cover_stop</c> term in your test specification (see chapter
       about <seealso
       marker="run_test_chapter#test_specifications">test
@@ -189,8 +189,8 @@
        specification file for Common Test).</p>
   </section>
 
-  <marker id="cross_cover"/>
   <section>
+  <marker id="cross_cover"/>
     <title>Cross cover analysis</title>
     <p>The cross cover mechanism allows cover analysis of modules
     across multiple tests. It is useful if some code, e.g. a library
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index fe871eb516..a706bbf9e6 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -192,12 +192,12 @@
     <section>
       <title>External configuration data and Logging</title>
       <p>It's possible in the CTH to read configuration data values
-	by calling <c><seealso marker="ct#get_config-1">ct:get_config/1/2/3</seealso></c> (as explained in the
+	by calling <seealso marker="ct#get_config-1"><c>ct:get_config/1/2/3</c></seealso> (as explained in the
 	<seealso marker="config_file_chapter#require_config_data">
 	  External configuration data</seealso>
 	chapter). The config variables in question must, as always, first have been
 	<c>required</c> by means of a suite-, group-, or test case info function,
-	or the <c><seealso marker="ct#require-1">ct:require/1/2</seealso></c> function. Note that the latter can also be used
+	or the <seealso marker="ct#require-1"><c>ct:require/1/2</c></seealso> function. Note that the latter can also be used
 	in CT hook functions.</p>
       <p>The CT hook functions may call any of the logging functions available
 	in the <c>ct</c> interface to print information to the log files, or to
@@ -252,13 +252,13 @@
     {ok, Handle} -&gt;
       {[{db_handle, Handle} | Config], CTHState#state{ handle = Handle }}
   end.</code>
-  <note>If using multiple CTHs, the first part of the return tuple will be
+  <note><p>If using multiple CTHs, the first part of the return tuple will be
   used as input for the next CTH. So in the case above the next CTH might
   get <c>{fail,Reason}</c> as the second parameter. If you have many CTHs
   which interact, it might be a good idea to not let each CTH return
   <c>fail</c> or <c>skip</c>. Instead return that an action should be taken
   through the <c>Config</c> list and implement a CTH which at the end takes
-  the correct action. </note>
+  the correct action.</p></note>
 	
     </section>
     
@@ -301,9 +301,9 @@ post_end_per_testcase(_TC, Config, Return, CTHState) -&gt;
   %% Do nothing if tc does not crash.
   {Return, CTHState}.</code>
 
-      <note>Recovering from a testcase failure using CTHs should only be done as
+      <note><p>Recovering from a testcase failure using CTHs should only be done as
 	a last resort. If used wrongly it could become very difficult to 
-	determine which tests pass or fail in a test run</note>
+	determine which tests pass or fail in a test run</p></note>
   
     </section>
 
diff --git a/lib/common_test/doc/src/ct_master_chapter.xml b/lib/common_test/doc/src/ct_master_chapter.xml
index e95823a560..37a0805055 100644
--- a/lib/common_test/doc/src/ct_master_chapter.xml
+++ b/lib/common_test/doc/src/ct_master_chapter.xml
@@ -220,6 +220,7 @@
 
     <p>The default <seealso marker="ct_slave">ct_slave</seealso> callback module,
       which is part of the Common Test application, has the following features:
+    </p>
     <list>
      <item>Starting Erlang target nodes on local or remote hosts
        (ssh is used for communication).
@@ -237,7 +238,6 @@
         Functions can be given as a list of {Module, Function, Arguments} tuples.
      </item>
     </list>
-    </p>
     <p>Note that it is possible to specify an <c>eval</c> term for the node as well
     as <c>startup_functions</c> in the <c>node_start</c> options list. In this
     case first the node will be started, then the <c>startup_functions</c> are
diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index a6e61984e6..39259b092a 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -36,8 +36,6 @@
     OS command line.
   </comsummary>
 
-  <marker id="top"></marker>
-
   <description>
   <p>The <c>ct_run</c> program is automatically installed with Erlang/OTP
     and Common Test (please see the Installation chapter in the Common
@@ -48,7 +46,7 @@
     particular mode.</p>
 
   <p>There is an interface function that corresponds to this program,
-    called <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, for starting Common Test from the Erlang
+    called <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, for starting Common Test from the Erlang
     shell (or an Erlang program). Please see the <c>ct</c> man page for
     details.</p>
 
@@ -83,9 +81,9 @@
     <p>it prints all valid start flags to stdout.</p>
   </description>
 
-  <marker id="ct_run"></marker>
 
   <section>
+  <marker id="ct_run"></marker>
     <title>Run tests from command line</title>
     <pre>
 	ct_run [-dir TestDir1 TestDir2 .. TestDirN] |
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 824240ef7d..65cc2a4042 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -64,7 +64,7 @@
     <marker id="usage"></marker>
     <title>Usage</title>
     <p>Event handlers may be installed by means of an <c>event_handler</c>
-    start flag (<c>ct_run</c>) or option (<c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), where the
+    start flag (<c>ct_run</c>) or option (<seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), where the
     argument specifies the names of one or more event handler modules.
     Example:</p>
     <p><c>$ ct_run -suite test/my_SUITE -event_handler handlers/my_evh1 
@@ -78,7 +78,7 @@
     example).</p>
 
     <p>An event_handler tuple in the argument <c>Opts</c> has the following
-      definition (see also <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> in the reference manual):</p>
+      definition (see also <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> in the reference manual):</p>
 
     <pre>
     {event_handler,EventHandlers}
@@ -224,8 +224,9 @@
 	<c>end_per_testcase</c> for the case failed.
 	</p></item>
 
+      <item>
 	<marker id="tc_auto_skip"></marker>
-      <item><c>#event{name = tc_auto_skip, data = {Suite,Func,Reason}}</c>
+        <c>#event{name = tc_auto_skip, data = {Suite,Func,Reason}}</c>
         <p><c>Suite = atom()</c>, the name of the suite.</p>
         <p><c>Func = atom()</c>, the name of the test case or configuration function.</p>
         <p><c>Reason = {failed,FailReason} |
@@ -251,8 +252,9 @@
 	the <c>tc_done</c> event.
 	</p></item>
 	
+      <item>
 	<marker id="tc_user_skip"></marker>
-      <item><c>#event{name = tc_user_skip, data = {Suite,TestCase,Comment}}</c>
+        <c>#event{name = tc_user_skip, data = {Suite,TestCase,Comment}}</c>
         <p><c>Suite = atom()</c>, name of the suite.</p>
         <p><c>TestCase = atom()</c>, name of the test case.</p>
         <p><c>Comment = string()</c>, reason for skipping the test case.</p>
@@ -308,7 +310,7 @@
     manager can look like.</p>
 
     <note><p>To ensure that printouts to standard out (or printouts made with
-    <c><seealso marker="ct#log-2">ct:log/2/3</seealso></c> or <c><seealso marker="ct:pal-2">ct:pal/2/3</seealso></c>) get written to the test case log
+    <seealso marker="ct#log-2"><c>ct:log/2/3</c></seealso> or <seealso marker="ct:pal-2"><c>ct:pal/2/3</c></seealso>) get written to the test case log
     file, and not to the Common Test framework log, you can syncronize
     with the Common Test server by matching on the <c>tc_start</c> and <c>tc_done</c>
     events. In the period between these events, all IO gets directed to the
diff --git a/lib/common_test/doc/src/getting_started_chapter.xml b/lib/common_test/doc/src/getting_started_chapter.xml
index 06610bef25..445c731d01 100644
--- a/lib/common_test/doc/src/getting_started_chapter.xml
+++ b/lib/common_test/doc/src/getting_started_chapter.xml
@@ -61,13 +61,11 @@
     <title>Test case execution</title>
     <p>Execution of test cases is handled this way:</p>
     
-    <p>
     <image file="tc_execution.gif">
       <icaption>
 	Successful vs unsuccessful test case execution.
       </icaption>
     </image>
-    </p>
 
     <p>For each test case that Common Test is told to execute, it spawns a
       dedicated process on which the test case function in question starts
@@ -90,7 +88,7 @@
     <p>As you can understand from the illustration above, Common Test requires
       that a test case generates a runtime error to indicate failure (e.g.
       by causing a bad match error or by calling <c>exit/1</c>, preferrably
-      through the <c><seealso marker="ct#fail-1">ct:fail/1,2</seealso></c> help function). A succesful execution is
+      through the <seealso marker="ct#fail-1"><c>ct:fail/1,2</c></seealso> help function). A succesful execution is
       indicated by means of a normal return from the test case function.
     </p>
     </section>
@@ -100,13 +98,15 @@
     <p>As you've seen in the basics chapter, the test suite module implements
       <seealso marker="common_test">callback functions</seealso>
       (mandatory or optional) for various purposes, e.g:
+    </p>
       <list>
 	<item>Init/end configuration function for the test suite</item>
 	<item>Init/end configuration function for a test case</item>
 	<item>Init/end configuration function for a test case group</item>
 	<item>Test cases</item>
       </list>
-      The configuration functions are optional and if you don't need them for
+    <p> 
+     The configuration functions are optional and if you don't need them for
       your test, a test suite with one simple test case could look like this:
     </p>
     <pre>
@@ -136,13 +136,11 @@
       "lower level"). The data flow looks like this:
     </p>
 
-    <p>
     <image file="config.gif">
       <icaption>
 	Config data flow in the suite.
       </icaption>
     </image>
-    </p>
 
     <p>
       Here's an example of a test suite which uses configuration functions
@@ -203,13 +201,11 @@
       shows the log file structure:
     </p>
 
-    <p>
     <image file="html_logs.gif">
       <icaption>
 	HTML log file structure.
       </icaption>
     </image>
-    </p>
   </section>
 
   <section>
diff --git a/lib/common_test/doc/src/install_chapter.xml b/lib/common_test/doc/src/install_chapter.xml
index ca15cba511..7f8c606324 100644
--- a/lib/common_test/doc/src/install_chapter.xml
+++ b/lib/common_test/doc/src/install_chapter.xml
@@ -56,13 +56,13 @@
       shell script version run_test, however, this script needs to be
       generated first, according to the instructions below.</p>
 
-    <p><note>Before reading on, please note that since Common Test version
+    <note><p>Before reading on, please note that since Common Test version
 	1.5, the run_test shell script is no longer required for starting
 	tests with Common Test from the OS command line. The ct_run
 	program (descibed above) is the new recommended command line interface
 	for Common Test. The shell script exists mainly for legacy reasons and
 	may not be updated in future releases of Common Test. It may even be removed.
-    </note></p>
+    </p></note>
 
     <p>Optional step to generate a shell script for starting Common Test:</p>
     <p>To generate the run_test shell script, navigate to the
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 4f826d4e31..138039c9ac 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -105,8 +105,8 @@
       RPC from a remote node.</p>
   </section>
 
-  <marker id="ct_run"></marker>
   <section>
+  <marker id="ct_run"></marker>
     <title>Running tests from the OS command line</title>
     
     <p>The <c>ct_run</c> program can be used for running tests from
@@ -225,15 +225,15 @@
     
     <p>Common Test provides an Erlang API for running tests. The main (and most
       flexible) function for specifying and executing tests is called
-      <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>.
+      <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>.
       This function takes the same start parameters as
-      the <c><seealso marker="run_test_chapter#ct_run">ct_run</seealso></c>
+      the <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
       program described above, only the flags are instead
       given as options in a list of key-value tuples. E.g. a test specified 
       with <c>ct_run</c> like:</p>
 
       <p><c>$ ct_run -suite ./my_SUITE -logdir ./results</c></p> 
-      <p>is with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> specified as:</p>
+      <p>is with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> specified as:</p>
       <p><c>1> ct:run_test([{suite,"./my_SUITE"},{logdir,"./results"}]).</c></p>
 
       <p>The function returns the test result, represented by the tuple:
@@ -245,7 +245,7 @@
 	<section>
 	  <title>Releasing the Erlang shell</title>
 	  <p>During execution of tests, started with
-	  <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>,
+	  <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
 	  the Erlang shell process, controlling stdin, will remain the top
 	  level process of the Common Test system of processes. The result
 	  is that the Erlang shell is not available for interaction during
@@ -260,19 +260,19 @@
 	  <c>ct:run_test/1</c> returns the pid of this process rather than the
 	  test result - which instead is printed to tty at the end of the test run.</p>
 	  <note><p>Note that in order to use the
-	  <c><seealso marker="ct#break-1">ct:break/1/2</seealso></c> and
-	  <c><seealso marker="ct#continue-0">ct:continue/0/1</seealso></c> functions,
+	  <seealso marker="ct#break-1"><c>ct:break/1/2</c></seealso> and
+	  <seealso marker="ct#continue-0"><c>ct:continue/0/1</c></seealso> functions,
 	  <c>release_shell</c> <em>must</em> be set to <c>true</c>.</p></note>
 	</section>
         
       <p>For detailed documentation about
-        <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>,
+        <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>,
         please see the
-        <c><seealso marker="ct#run_test-1">ct</seealso></c> manual page.</p>    
+        <seealso marker="ct#run_test-1"><c>ct</c></seealso> manual page.</p>    
   </section>
   
-  <marker id="group_execution"></marker>
    <section>
+    <marker id="group_execution"></marker>
     <title>Test case group execution</title>
     
     <p>With the <c>ct_run</c> flag, or <c>ct:run_test/1</c> option <c>group</c>,
@@ -442,9 +442,9 @@
       for trying out various operations during test suite development.</p>
 
     <p>To invoke the interactive shell mode, you can start an Erlang shell 
-      manually and call <c><seealso marker="ct#install-1">ct:install/1</seealso></c> to install any configuration
+      manually and call <seealso marker="ct#install-1"><c>ct:install/1</c></seealso> to install any configuration
       data you might need (use <c>[]</c> as argument otherwise), then
-      call <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> to start Common Test. If you use
+      call <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> to start Common Test. If you use
       the <c>ct_run</c> program, you may start the Erlang shell and Common Test
       in the same go by using the <c>-shell</c> and, optionally, the <c>-config</c>
       and/or <c>-userconfig</c> flag. Examples:
@@ -463,8 +463,8 @@
     
     <p>If any functions using "required config data" (e.g. ct_telnet or
       ct_ftp functions) are to be called from the erlang shell, config
-      data must first be required with <c><seealso marker="ct#require-1">
-      ct:require/1/2</seealso></c>. This is
+      data must first be required with <seealso marker="ct#require-1"><c>
+      ct:require/1/2</c></seealso>. This is
       equivalent to a <c>require</c> statement in the <seealso
 	marker="write_test_chapter#suite">Test Suite Info 
 	Function</seealso> or in the <seealso
@@ -491,11 +491,11 @@
       is not supported.</p>
     
     <p>If you wish to exit the interactive mode (e.g. to start an
-      automated test run with <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), call the function
-      <c><seealso marker="ct#stop_interactive-0">ct:stop_interactive/0</seealso></c>. This shuts down the
+      automated test run with <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), call the function
+      <seealso marker="ct#stop_interactive-0"><c>ct:stop_interactive/0</c></seealso>. This shuts down the
       running <c>ct</c> application. Associations between
       configuration names and data created with <c>require</c> are 
-      consequently deleted. <c><seealso marker="ct#start_interactive-0">ct:start_interactive/0</seealso></c> will get you
+      consequently deleted. <seealso marker="ct#start_interactive-0"><c>ct:start_interactive/0</c></seealso> will get you
       back into interactive mode, but the previous state is not restored.</p>
   </section>
 
@@ -503,7 +503,7 @@
     <title>Step by step execution of test cases with the Erlang Debugger</title>
    
     <p>By means of <c>ct_run -step [opts]</c>, or by passing the 
-       <c>{step,Opts}</c> option to <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>, it is possible
+       <c>{step,Opts}</c> option to <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>, it is possible
        to get the Erlang Debugger started automatically and use its
        graphical interface to investigate the state of the current test 
        case and to execute it step by step and/or set execution breakpoints.</p>
@@ -527,17 +527,17 @@
        with <c>dir</c>.</p>       
   </section>
 
-  <marker id="test_specifications"></marker>
   <section>
+  <marker id="test_specifications"></marker>
     <title>Test Specifications</title>
     <section>
 	<title>General description</title>
 	<p>The most flexible way to specify what to test, is to use a so
 	called test specification. A test specification is a sequence of
 	Erlang terms. The terms are normally declared in one or more text files
-	(see <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c>), but
+	(see <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso>), but
 	may also be passed to Common Test on the form of a list (see
-	<c><seealso marker="ct#run_testspec-1">ct:run_testspec/1</seealso></c>).
+	<seealso marker="ct#run_testspec-1"><c>ct:run_testspec/1</c></seealso>).
 	There are two general types of terms: configuration terms and test
 	specification terms.</p>
 	<p>With configuration terms it is possible to e.g. label the test
@@ -989,7 +989,7 @@
 	  <c>ct_run</c>. This forces Common Test to ignore unrecognizable terms.
 	  Note that in this mode, Common Test is not able to check the specification 
 	  for errors as efficiently as if the scanner runs in default mode. 
-	  If <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> is used
+	  If <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> is used
 	  for starting the tests, the relaxed scanner
 	  mode is enabled by means of the tuple: <c>{allow_user_terms,true}</c></p>
 	</section>
@@ -999,7 +999,7 @@
     <title>Running tests from the Web based GUI</title>
     
     <p>The web based GUI, VTS, is started with the
-      <c><seealso marker="run_test_chapter#ct_run">ct_run</seealso></c>
+      <seealso marker="run_test_chapter#ct_run"><c>ct_run</c></seealso>
       program. From the GUI you can load config files, and select
       directories, suites and cases to run. You can also state the
       config files, directories, suites and cases on the command line
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 69b17f3c4b..055fb90641 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -129,8 +129,8 @@
     </p>
   </section>
 
-  <marker id="per_testcase"/>
   <section>
+  <marker id="per_testcase"/>
     <title>Init and end per test case</title>
 
     <p>Each test suite module can contain the optional configuration functions
@@ -173,7 +173,7 @@
     </p>
 
     <p>The <c>end_per_testcase/2</c> function is called even after a
-      test case terminates due to a call to <c><seealso marker="ct#abort_current_testcase-1">ct:abort_current_testcase/1</seealso></c>,
+      test case terminates due to a call to <seealso marker="ct#abort_current_testcase-1"><c>ct:abort_current_testcase/1</c></seealso>,
       or after a timetrap timeout. However, <c>end_per_testcase</c>
       will then execute on a different process than the test case
       function, and in this situation, <c>end_per_testcase</c> will
@@ -243,8 +243,8 @@
 
     <note><p>The test case function argument <c>Config</c> should not be 
 	confused with the information that can be retrieved from 
-	configuration files (using <c><seealso marker="ct#get_config-1">
-	ct:get_config/1/2</seealso></c>). The Config argument
+	configuration files (using <seealso marker="ct#get_config-1"><c>
+	ct:get_config/1/2</c></seealso>). The Config argument
 	should be used for runtime configuration of the test suite and the 
 	test cases, while configuration files should typically contain data 
 	related to the SUT. These two types of configuration data are handled 
@@ -303,7 +303,7 @@
 	<item>
 	  <p>
 	    Use this to specify arbitrary data related to the testcase. This
-	    data can be retrieved at any time using the <c><seealso marker="ct#userdata-3">ct:userdata/3</seealso></c>
+	    data can be retrieved at any time using the <seealso marker="ct#userdata-3"><c>ct:userdata/3</c></seealso>
 	    utility function.
 	  </p>
 	</item>
@@ -348,8 +348,8 @@
       </taglist>
 
 	<p>See the <seealso marker="config_file_chapter#require_config_data">Config files</seealso>
-	  chapter and the <c><seealso marker="ct#require-1">
-	  ct:require/1/2</seealso></c> function in the
+	  chapter and the <seealso marker="ct#require-1"><c>
+	  ct:require/1/2</c></seealso> function in the
 	   <seealso marker="ct">ct</seealso> reference manual for more information about
 	   <c>require</c>.</p>
 
@@ -826,14 +826,16 @@
       Common Test to create one dedicated private directory per
       test case and execution instead. This is accomplished by means of
       the flag/option: <c>create_priv_dir</c> (to be used with the
-      <c>ct_run</c> program, the <c><seealso marker="ct#run_test-1">ct:run_test/1</seealso></c> function, or
+      <c>ct_run</c> program, the <seealso marker="ct#run_test-1"><c>ct:run_test/1</c></seealso> function, or
       as test specification term). There are three possible values
       for this option:
+     </p>
       <list>
 	<item><c>auto_per_run</c></item>
 	<item><c>auto_per_tc</c></item>
 	<item><c>manual_per_tc</c></item>
       </list>
+     <p>
       The first value indicates the default priv_dir behaviour, i.e.
       one private directory created per test run. The two latter
       values tell Common Test to generate a unique test directory name
@@ -842,7 +844,7 @@
       become very inefficient for test runs with many test cases and/or
       repetitions. Therefore, in case the manual version is instead used, the
       test case must tell Common Test to create priv_dir when it needs it.
-      It does this by calling the function <c><seealso marker="ct#make_priv_dir-0">ct:make_priv_dir/0</seealso></c>.
+      It does this by calling the function <seealso marker="ct#make_priv_dir-0"><c>ct:make_priv_dir/0</c></seealso>.
       </p>
 
       <note><p>You should not depend on current working directory for
@@ -890,7 +892,7 @@
     
     <p>It is also possible to dynamically set/reset a timetrap during the
     excution of a test case, or configuration function. This is done by calling
-    <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c>. This function cancels the current timetrap
+    <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso>. This function cancels the current timetrap
     and starts a new one (that stays active until timeout, or end of the
     current function).</p>
     
@@ -903,12 +905,12 @@
     
     <p>If a test case needs to suspend itself for a time that also gets
     multipled by <c>multiply_timetraps</c> (and possibly also scaled up if
-    <c>scale_timetraps</c> is enabled), the function <c><seealso marker="ct#sleep-1">ct:sleep/1</seealso></c>
+    <c>scale_timetraps</c> is enabled), the function <seealso marker="ct#sleep-1"><c>ct:sleep/1</c></seealso>
     may be used (instead of e.g. <c>timer:sleep/1</c>).</p>
     
     <p>A function (<c>fun/0</c> or <c>MFA</c>) may be specified as
     timetrap value in the suite-, group- and test case info function, as
-    well as argument to the <c><seealso marker="ct#timetrap-1">ct:timetrap/1</seealso></c> function. Examples:</p>
+    well as argument to the <seealso marker="ct#timetrap-1"><c>ct:timetrap/1</c></seealso> function. Examples:</p>
 
     <p><c>{timetrap,{my_test_utils,timetrap,[?MODULE,system_start]}}</c></p>
     <p><c>ct:timetrap(fun() -> my_timetrap(TestCaseName, Config) end)</c></p>
diff --git a/lib/erl_docgen/priv/dtd/common.dtd b/lib/erl_docgen/priv/dtd/common.dtd
index fdc02c55a1..f999ef8ea4 100644
--- a/lib/erl_docgen/priv/dtd/common.dtd
+++ b/lib/erl_docgen/priv/dtd/common.dtd
@@ -67,7 +67,7 @@
 
 <!-- References -->
 
-<!ELEMENT seealso             (#PCDATA) >
+<!ELEMENT seealso             (#PCDATA|c|em)* >
 <!ATTLIST seealso             marker CDATA #REQUIRED >
 <!ELEMENT url                 (#PCDATA) >
 <!ATTLIST url                 href CDATA #REQUIRED >
diff --git a/lib/odbc/doc/src/odbc.xml b/lib/odbc/doc/src/odbc.xml
index 0e9505390b..99b9bbbe88 100644
--- a/lib/odbc/doc/src/odbc.xml
+++ b/lib/odbc/doc/src/odbc.xml
@@ -213,12 +213,13 @@
 			  Note that this information is probably of little use when writing database-independent code,
 			  but can be of assistance in providing more sophisticated error handling when dealing with
 			  a known underlying database.
+	           </p>
 			 <list type="bulleted">
 				  <item><c>ODBCErrorCode</c> is the ODBC error string returned by the ODBC driver.</item>
 				  <item><c>NativeErrorCode</c> is the numberic error code returned by the underlying database. The possible values
 					  and their meanings are dependent on the database being used.</item>
 				  <item><c>Reason</c> is as per the <c>Reason</c> field when extended errors are not enabled.</item>
-		  </list></p>
+		  </list>
       </desc>
     </func>
     <func>