Merge branch 'maint'

* maint:
  doc: Correct errors introduced by Editorial changes

10 files changed, 75 insertions, 75 deletions

diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml
index 3f83747485..48ffe653e4 100644
--- a/lib/common_test/doc/src/common_test_app.xml
+++ b/lib/common_test/doc/src/common_test_app.xml
@@ -566,7 +566,7 @@
 	  (which also causes the test case process to terminate).</p>
 
 	<p>Elements from the <c>Config</c> list can, for example, be read
-	  with <c>proplists:get_value/2</c> in <c>STDLIB</c>
+	  with <c>proplists:get_value/2</c> in STDLIB
 	  (or the macro <c>?config</c> defined in <c>ct.hrl</c>).</p>
 
 	<p>If you decide not to run the test case after all, return
diff --git a/lib/common_test/doc/src/ct.xml b/lib/common_test/doc/src/ct.xml
index 264bcff251..ffc64cba67 100644
--- a/lib/common_test/doc/src/ct.xml
+++ b/lib/common_test/doc/src/ct.xml
@@ -777,7 +777,7 @@
           caught by any installed event manager.</p>
 
         <p>See also
-          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+          <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1236,7 +1236,7 @@
         <v>Millisecs = integer() | float()</v>
       </type>
       <desc><marker id="sleep-1"/>
-        <p>This function, similar to <c>timer:sleep/1</c> in <c>STDLIB</c>, 
+        <p>This function, similar to <c>timer:sleep/1</c> in STDLIB,
           suspends the test case for a specified time.
           However, this function also multiplies <c>Time</c> with the
           <c>multiply_timetraps</c> value (if set) and under certain
@@ -1330,7 +1330,7 @@
           caught by any installed event manager.</p>
 
         <p>See also
-          <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.
+          <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.
         </p>
       </desc>
     </func>
diff --git a/lib/common_test/doc/src/ct_hooks.xml b/lib/common_test/doc/src/ct_hooks.xml
index 3b1e564b66..c2cf29c530 100644
--- a/lib/common_test/doc/src/ct_hooks.xml
+++ b/lib/common_test/doc/src/ct_hooks.xml
@@ -94,7 +94,7 @@
           <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>,
           or a <c>reference</c> (created using
           <seealso marker="erts:erlang#make_ref-0">erlang:make_ref/0</seealso>
-          in <c>ERTS</c>) if
+          in ERTS) if
           <seealso marker="#Module:id-1"><c>ct_hooks:id/1</c></seealso>
           is not implemented.</p>
 
diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml
index 1998f15697..0e4c35e11f 100644
--- a/lib/common_test/doc/src/ct_hooks_chapter.xml
+++ b/lib/common_test/doc/src/ct_hooks_chapter.xml
@@ -374,7 +374,7 @@
      <title>Example CTH</title>
      <p>The following CTH logs information about a test run into a format 
        parseable by <seealso marker="kernel:file#consult-1">file:consult/1</seealso> 
-       (in <c>Kernel</c>):
+       (in Kernel):
      </p>
      <code>
  %%% @doc Common Test Example Common Test Hook module.
@@ -499,13 +499,13 @@
        <tag><c>cth_log_redirect</c></tag>
        <item>
        <p>Built-in</p>
-       <p>Captures all <c>error_logger</c> and <c>SASL</c> logging 
+       <p>Captures all <c>error_logger</c> and SASL logging
 	events and prints them to the current test case log. If an event cannot be 
 	associated with a test case, it is printed in the <c>Common Test</c> framework log. 
 	This happens for test cases running in parallel and events occuring
 	in-between test cases. You can configure the level of
-	<seealso marker="sasl:sasl_app"><c>SASL</c></seealso> events report
-	using the normal <c>SASL</c> mechanisms.</p>
+	<seealso marker="sasl:sasl_app">SASL</seealso> events report
+	using the normal SASL mechanisms.</p>
        </item>
        <tag><c>cth_surefire</c></tag>
        <item>
diff --git a/lib/common_test/doc/src/ct_ssh.xml b/lib/common_test/doc/src/ct_ssh.xml
index d00737aa5a..137e4c3f1d 100644
--- a/lib/common_test/doc/src/ct_ssh.xml
+++ b/lib/common_test/doc/src/ct_ssh.xml
@@ -64,7 +64,7 @@
     <p><c>ConnType = ssh | sftp</c>.</p>
 
     <p>For other types, see
-      <seealso marker="ssh:ssh"><c>ssh:ssh(3)</c></seealso>.</p>
+      <seealso marker="ssh:ssh"><c>ssh(3)</c></seealso>.</p>
 
     <p>All time-out parameters in <c>ct_ssh</c> functions are values in
       milliseconds.</p>
@@ -88,7 +88,7 @@
       <tag><c>ssh_sftp_return() = term()</c></tag>
       <item><marker id="type-ssh_sftp_return"/>
         <p>Return value from an
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp</c></seealso>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp</c></seealso>
             function.</p></item>
     </taglist>
   </section>
@@ -104,7 +104,7 @@
       </type>
       <desc><marker id="apread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -118,7 +118,7 @@
       </type>
       <desc><marker id="apread-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -132,7 +132,7 @@
       </type>
       <desc><marker id="apwrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -146,7 +146,7 @@
       </type>
       <desc><marker id="apwrite-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -160,7 +160,7 @@
       </type>
       <desc><marker id="aread-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -174,7 +174,7 @@
       </type>
       <desc><marker id="aread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -188,7 +188,7 @@
       </type>
       <desc><marker id="awrite-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -202,7 +202,7 @@
       </type>
       <desc><marker id="awrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -216,7 +216,7 @@
       </type>
       <desc><marker id="close-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -230,7 +230,7 @@
       </type>
       <desc><marker id="close-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -310,7 +310,7 @@
       </type>
       <desc><marker id="del_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -324,7 +324,7 @@
       </type>
       <desc><marker id="del_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -338,7 +338,7 @@
       </type>
       <desc><marker id="delete-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -352,7 +352,7 @@
       </type>
       <desc><marker id="delete-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -423,7 +423,7 @@
       </type>
       <desc><marker id="get_file_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -437,7 +437,7 @@
       </type>
       <desc><marker id="get_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -451,7 +451,7 @@
       </type>
       <desc><marker id="list_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -465,7 +465,7 @@
       </type>
       <desc><marker id="list_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -479,7 +479,7 @@
       </type>
       <desc><marker id="make_dir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -493,7 +493,7 @@
       </type>
       <desc><marker id="make_dir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -507,7 +507,7 @@
       </type>
       <desc><marker id="make_symlink-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -521,7 +521,7 @@
       </type>
       <desc><marker id="make_symlink-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -535,7 +535,7 @@
       </type>
       <desc><marker id="open-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -549,7 +549,7 @@
       </type>
       <desc><marker id="open-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -563,7 +563,7 @@
       </type>
       <desc><marker id="opendir-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -577,7 +577,7 @@
       </type>
       <desc><marker id="opendir-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -591,7 +591,7 @@
       </type>
       <desc><marker id="position-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -605,7 +605,7 @@
       </type>
       <desc><marker id="position-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -619,7 +619,7 @@
       </type>
       <desc><marker id="pread-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -633,7 +633,7 @@
       </type>
       <desc><marker id="pread-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -647,7 +647,7 @@
       </type>
       <desc><marker id="pwrite-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -661,7 +661,7 @@
       </type>
       <desc><marker id="pwrite-5"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -675,7 +675,7 @@
       </type>
       <desc><marker id="read-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -689,7 +689,7 @@
       </type>
       <desc><marker id="read-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -703,7 +703,7 @@
       </type>
       <desc><marker id="read_file-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -717,7 +717,7 @@
       </type>
       <desc><marker id="read_file-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -731,7 +731,7 @@
       </type>
       <desc><marker id="read_file_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -745,7 +745,7 @@
       </type>
       <desc><marker id="read_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -759,7 +759,7 @@
       </type>
       <desc><marker id="read_link-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -773,7 +773,7 @@
       </type>
       <desc><marker id="read_link-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -787,7 +787,7 @@
       </type>
       <desc><marker id="read_link_info-2"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -801,7 +801,7 @@
       </type>
       <desc><marker id="read_link_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -853,7 +853,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
 
         <p>If <c>End</c> is a fun, this fun is called with one argument, the
           data value in a received <c>ssh_cm</c> message (see
-          <seealso marker="ssh:ssh_connection"><c>ssh:ssh_connection(3)</c></seealso>.
+          <seealso marker="ssh:ssh_connection"><c>ssh_connection(3)</c></seealso>.
           The fun is to return either <c>true</c> to end the receiving
           operation (and have the so far collected data returned) or
           <c>false</c> to wait for more data from the server. Even if a fun
@@ -872,7 +872,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
       </type>
       <desc><marker id="rename-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -886,7 +886,7 @@ ChannelId, End, DefaultTimeout)</c></seealso>.</p>
       </type>
       <desc><marker id="rename-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1070,7 +1070,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1084,7 +1084,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1098,7 +1098,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1112,7 +1112,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1126,7 +1126,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file_info-3"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
 
@@ -1140,7 +1140,7 @@ ChannelId, 0, Data, End, Timeout)</c></seealso>.</p>
       </type>
       <desc><marker id="write_file_info-4"/>
         <p>For information and other types, see
-          <seealso marker="ssh:ssh_sftp"><c>ssh:ssh_sftp(3)</c></seealso>.</p>
+          <seealso marker="ssh:ssh_sftp"><c>ssh_sftp(3)</c></seealso>.</p>
       </desc>
     </func>
   </funcs>
diff --git a/lib/common_test/doc/src/ct_telnet.xml b/lib/common_test/doc/src/ct_telnet.xml
index e2a45e894b..eba3c3030d 100644
--- a/lib/common_test/doc/src/ct_telnet.xml
+++ b/lib/common_test/doc/src/ct_telnet.xml
@@ -198,7 +198,7 @@
       <item><marker id="type-prompt_regexp"/>
         <p>Regular expression matching all possible prompts for a specific
           target type. <c>regexp</c> must not have any groups, that is, when
-          matching, <c>re:run/3</c> (in <c>STDLIB</c>) must return a list with
+          matching, <c>re:run/3</c> (in STDLIB) must return a list with
           one single element.</p></item>
     </taglist>
   </section>
diff --git a/lib/common_test/doc/src/event_handler_chapter.xml b/lib/common_test/doc/src/event_handler_chapter.xml
index 2978226a19..bd9ed21cb4 100644
--- a/lib/common_test/doc/src/event_handler_chapter.xml
+++ b/lib/common_test/doc/src/event_handler_chapter.xml
@@ -50,7 +50,7 @@
     pass the information on. The event handlers are Erlang modules
     implemented by the <c>Common Test</c> user according to the <c>gen_event</c> 
     behavior (for details, see module
-    <seealso marker="stdlib:gen_event"><c>stdlib:gen_event</c></seealso> and
+    <seealso marker="stdlib:gen_event"><c>gen_event</c></seealso> and
     section
     <seealso marker="doc/design_principles:events"><c>gen_event Behaviour</c></seealso>
     in OTP Design Principles in the System Documentation).
@@ -69,8 +69,8 @@
     manager, either by telling <c>Common Test</c> to install them before the test
     run (described later), or by adding the handlers dynamically during the test
     run using
-    <seealso marker="stdlib:gen_event#add_handler-3"><c>stdlib:gen_event:add_handler/3</c></seealso> or 
-    <seealso marker="stdlib:gen_event#add_sup_handler-3"><c>stdlib:gen_event:add_sup_handler/3</c></seealso>.
+    <seealso marker="stdlib:gen_event#add_handler-3"><c>gen_event:add_handler/3</c></seealso> or
+    <seealso marker="stdlib:gen_event#add_sup_handler-3"><c>gen_event:add_sup_handler/3</c></seealso>.
     In the latter scenario, the reference of the <c>Common Test</c> event manager is
     required. To get it, call 
     <seealso marker="ct#get_event_mgr_ref-0"><c>ct:get_event_mgr_ref/0</c></seealso> 
diff --git a/lib/common_test/doc/src/introduction.xml b/lib/common_test/doc/src/introduction.xml
index 40724f24e9..df12bea6dd 100644
--- a/lib/common_test/doc/src/introduction.xml
+++ b/lib/common_test/doc/src/introduction.xml
@@ -45,7 +45,7 @@
       </list>
       <p><c>Common Test</c> also integrates use of the OTP
       <seealso marker="tools:cover">cover</seealso> tool in application 
-      <c>Tools</c> for code coverage analysis of Erlang/OTP programs.</p>
+      Tools for code coverage analysis of Erlang/OTP programs.</p>
       
       <p><c>Common Test</c> executes test suite programs automatically,
       without operator interaction. Test progress and results are
diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 43e36adfb6..76e306c4ed 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -274,7 +274,7 @@
 
     <note><p>Directories passed to <c>Common Test</c> can have either relative or absolute paths.</p></note>
 
-    <note><p>Any start flags to the Erlang runtime system (application <c>ERTS</c>) can also be passed as
+    <note><p>Any start flags to the Erlang runtime system (application ERTS) can also be passed as
              parameters to <c>ct_run</c>. It is, for example, useful to be able to
 	     pass directories to be added to the Erlang code server search path
 	     with flag <c>-pa</c> or <c>-pz</c>. If you have common help- or library 
@@ -286,7 +286,7 @@
 	  <p>The absolute path of directory <c>chat_server/ebin</c>
 	     is here passed to the code server. This is essential because relative
 	     paths are stored by the code server as relative, and <c>Common Test</c> changes 
-	     the current working directory of <c>ERTS</c> during the test run.</p>
+	     the current working directory of ERTS during the test run.</p>
     </note>
     
     <p>The <c>ct_run</c> program sets the exit status before shutting down. The following values
@@ -1258,7 +1258,7 @@
       <p>The minor log files contain full details of every single test
 	case, each in a separate file. This way, it is
 	straightforward	to compare the latest results to that of previous
-	test runs, even if the set of test cases changes. If application <c>SASL</c> 
+	test runs, even if the set of test cases changes. If application SASL
 	is running, its logs are also printed to the current minor log file by the
 	<seealso marker="common_test:ct_hooks_chapter#builtin_cths">
 	  cth_log_redirect built-in hook</seealso>.
diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml
index 83daf771a6..7bd2ccf588 100644
--- a/lib/common_test/doc/src/write_test_chapter.xml
+++ b/lib/common_test/doc/src/write_test_chapter.xml
@@ -269,10 +269,10 @@
     
     <p>As parameter <c>Config</c> is a list of key-value tuples, that is,
     a data type called a property list, it can be handled by the
-    <seealso marker="stdlib:proplists"><c>stdlib:proplists</c></seealso> module. 
+    <seealso marker="stdlib:proplists"><c>proplists</c></seealso> module.
     A value can, for example, be searched for and returned with function 
     <seealso marker="stdlib:proplists#get_value-2"><c>proplists:get_value/2</c></seealso>.
-    Also, or alternatively, the general <seealso marker="stdlib:lists"><c>stdlib:lists</c></seealso> 
+    Also, or alternatively, the general <seealso marker="stdlib:lists"><c>lists</c></seealso>
     module contains useful functions. Normally, the only operations 
     performed on <c>Config</c> is insert (adding a tuple to the head of the list) 
     and lookup. <c>Common Test</c> provides a simple macro named <c>?config</c>, 
@@ -652,7 +652,7 @@
     <title>Parallel Test Cases and I/O</title>
     <p>A parallel test case has a private I/O server as its group leader. 
       (For a description of the group leader concept, see
-      <seealso marker="erts:index"><c>ERTS</c></seealso>). 
+      <seealso marker="erts:index">ERTS</seealso>).
       The central I/O server process, which handles the output from 
       regular test cases and configuration functions, does not respond to I/O messages
       during execution of parallel groups. This is important to understand
@@ -1032,8 +1032,8 @@
  6. Categorized error, importance = 99</pre>
 
     <p>The arguments <c>Format</c> and <c>FormatArgs</c> in <c>ct:log/print/pal</c> are
-    always passed on to the <c>stdlib</c> function <c>io:format/3</c> (For details,
-    see the <seealso marker="stdlib:io"><c>stdlib:io</c></seealso> manual page).</p>
+    always passed on to the STDLIB function <c>io:format/3</c> (For details,
+    see the <seealso marker="stdlib:io"><c>io</c></seealso> manual page).</p>
 
     <p><c>ct:pal/4</c> and <c>ct:log/5</c> add headers to strings being printed to the
     log file. The strings are also wrapped in div tags with a CSS class