Merge branch 'hasse/doc/fix_editorial_changes' into maint

* hasse/doc/fix_editorial_changes:
  doc: Correct errors introduced by Editorial changes

16 files changed, 83 insertions, 83 deletions

diff --git a/lib/kernel/doc/src/app.xml b/lib/kernel/doc/src/app.xml
index 5e0da409a3..d2e9390d7e 100644
--- a/lib/kernel/doc/src/app.xml
+++ b/lib/kernel/doc/src/app.xml
@@ -151,7 +151,7 @@ ApplicationVersion = string()</code>
           application is allowed to be started. <c>systools</c> uses
           this list to generate correct start scripts. Defaults to
           the empty list, but notice that all applications have
-          dependencies to (at least) <c>Kernel</c> and <c>STDLIB</c>.</p>
+          dependencies to (at least) Kernel and STDLIB.</p>
       </item>
       <tag><c>env</c></tag>
       <item>
@@ -171,7 +171,7 @@ ApplicationVersion = string()</code>
           implemented as a supervision tree, otherwise the application
           controller does not know how to start it. <c>mod</c>
           can be omitted for applications without processes, typically
-          code libraries, for example, <c>STDLIB</c>.</p>
+          code libraries, for example, STDLIB.</p>
       </item>
       <tag><c>start_phases</c></tag>
       <item>
@@ -236,7 +236,7 @@ ApplicationVersion = string()</code>
   <section>
     <title>See Also</title>
     <p><seealso marker="application"><c>application(3)</c></seealso>,
-      <seealso marker="sasl:systools"><c>sasl:systools(3)</c></seealso></p>
+      <seealso marker="sasl:systools"><c>systools(3)</c></seealso></p>
   </section>
 </fileref>
 
diff --git a/lib/kernel/doc/src/application.xml b/lib/kernel/doc/src/application.xml
index 8d33aa86e7..886286b76d 100644
--- a/lib/kernel/doc/src/application.xml
+++ b/lib/kernel/doc/src/application.xml
@@ -200,7 +200,7 @@
 	<seealso marker="app"><c>app(4)</c></seealso>.</p>
         <p>If <c><anno>Distributed</anno> == {<anno>Application</anno>,[<anno>Time</anno>,]<anno>Nodes</anno>}</c>,
           the application becomes distributed. The argument overrides
-          the value for the application in the <c>Kernel</c> configuration
+          the value for the application in the Kernel configuration
           parameter <c>distributed</c>. <c><anno>Application</anno></c> must be
           the application name (same as in the first argument).
           If a node crashes and <c><anno>Time</anno></c> is specified,
@@ -221,7 +221,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           the application is to be started at <c>cp2@cave</c>
           or <c>cp3@cave</c>.</p>
         <p>If <c>Distributed == default</c>, the value for
-          the application in the <c>Kernel</c> configuration parameter
+          the application in the Kernel configuration parameter
           <c>distributed</c> is used.</p>
       </desc>
     </func>
@@ -267,7 +267,7 @@ Nodes = [cp1@cave, {cp2@cave, cp3@cave}]</code>
           started, <c>Application</c> is started as well.</p>
         <p>By default, all applications are loaded with permission
           <c>true</c> on all nodes. The permission can be configured
-          using the <c>Kernel</c> configuration parameter <c>permissions</c>.</p>
+          using the Kernel configuration parameter <c>permissions</c>.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/auth.xml b/lib/kernel/doc/src/auth.xml
index 03f983b96d..5901446960 100644
--- a/lib/kernel/doc/src/auth.xml
+++ b/lib/kernel/doc/src/auth.xml
@@ -47,7 +47,7 @@
       <desc>
         <p>Use
           <seealso marker="erts:erlang#erlang:get_cookie/0"><c>erlang:get_cookie()</c></seealso>
-          in <c>ERTS</c> instead.</p>
+          in ERTS instead.</p>
       </desc>
     </func>
     <func>
@@ -59,7 +59,7 @@
       <desc>
         <p>Use
           <seealso marker="erts:erlang#erlang:set_cookie/2"><c>erlang:set_cookie(node(), <anno>Cookie</anno>)</c>
-	  in <c>ERTS</c></seealso> instead.</p>
+	  in ERTS</seealso> instead.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/kernel/doc/src/code.xml b/lib/kernel/doc/src/code.xml
index 21f8a2d54a..4db377bcde 100644
--- a/lib/kernel/doc/src/code.xml
+++ b/lib/kernel/doc/src/code.xml
@@ -86,11 +86,11 @@
       an <c>ebin</c> directory are ignored.</p>
     <p>All application directories found in the additional directories
       appears before the standard OTP applications, except for the
-      <c>Kernel</c> and <c>STDLIB</c> applications, which are placed before
+      Kernel and STDLIB applications, which are placed before
       any additional applications. In other words, modules found in any
       of the additional library directories override modules with
-      the same name in OTP, except for modules in <c>Kernel</c> and
-      <c>STDLIB</c>.</p>
+      the same name in OTP, except for modules in Kernel and
+      STDLIB.</p>
     <p>Environment variable <c>ERL_LIBS</c> (if defined) is to contain
       a colon-separated (for Unix-like systems) or semicolon-separated
       (for Windows) list of additional libraries.</p>
@@ -151,7 +151,7 @@ zip:create("mnesia-4.4.7.ez",
      <c>$OTPROOT/lib/mnesia.ez/mnesia/ebin</c> or
      <c>$OTPROOT/lib/mnesia-4.4.7.ez/mnesia-4.4.7/ebin</c>.</p>
 
-    <p>The code server uses module <c>erl_prim_loader</c> in <c>ERTS</c>
+    <p>The code server uses module <c>erl_prim_loader</c> in ERTS
      (possibly through <c>erl_boot_server</c>) to read code files from
      archives. However, the functions in <c>erl_prim_loader</c> can also be
      used by other applications to read files from archives. For
@@ -688,9 +688,9 @@ ok = code:finish_loading(Prepared),
         <p>Normally, <c><anno>Loaded</anno></c> is the absolute filename
           <c>Filename</c> from which the code is obtained. If the module
           is preloaded (see
-          <seealso marker="sasl:script"><c>sasl:script(4)</c></seealso>),
+          <seealso marker="sasl:script"><c>script(4)</c></seealso>),
           <c>Loaded==preloaded</c>. If the module is Cover-compiled (see
-          <seealso marker="tools:cover"><c>tools:cover(3)</c></seealso>),
+          <seealso marker="tools:cover"><c>cover(3)</c></seealso>),
           <c>Loaded==cover_compiled</c>.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/erl_boot_server.xml b/lib/kernel/doc/src/erl_boot_server.xml
index 897365f9b9..4109251387 100644
--- a/lib/kernel/doc/src/erl_boot_server.xml
+++ b/lib/kernel/doc/src/erl_boot_server.xml
@@ -38,13 +38,13 @@
       command-line flag <c>-loader inet</c>. All hosts specified
       with command-line flag <c>-hosts Host</c> must have one
       instance of this server running.</p>
-    <p>This server can be started with the <c>Kernel</c> configuration
+    <p>This server can be started with the Kernel configuration
       parameter <c>start_boot_server</c>.</p>
     <p>The <c>erl_boot_server</c> can read regular files and
       files in archives. See <seealso marker="code"><c>code(3)</c></seealso>
       and
     <seealso marker="erts:erl_prim_loader"><c>erl_prim_loader(3)</c></seealso>
-    in <c>ERTS</c>.</p>
+    in ERTS.</p>
     <warning><p>The support for loading code from archive files is
      experimental. It is released before it is ready
      to obtain early feedback. The file format, semantics,
diff --git a/lib/kernel/doc/src/erl_ddll.xml b/lib/kernel/doc/src/erl_ddll.xml
index a5ce58ef3e..75114e015c 100644
--- a/lib/kernel/doc/src/erl_ddll.xml
+++ b/lib/kernel/doc/src/erl_ddll.xml
@@ -201,7 +201,7 @@
       <desc>
         <p>Removes a driver monitor in much the same way as 
           <seealso marker="erts:erlang#erlang:demonitor/1"><c>erlang:demonitor/1</c></seealso>
-	  in <c>ERTS</c>
+	  in ERTS
 	  does with process monitors. For details about how to create
 	  driver monitors, see
 	  <seealso marker="#monitor/2"><c>monitor/2</c></seealso>,
@@ -431,7 +431,7 @@
         <p>Creates a driver monitor and works in many
           ways as
 	  <seealso marker="erts:erlang#erlang:monitor/2"><c>erlang:monitor/2</c></seealso>
-	  in <c>ERTS</c>,
+	  in ERTS,
           does for processes. When a driver changes state, the monitor
           results in a monitor message that is sent to the calling
           process. <c><anno>MonitorRef</anno></c> returned by this function is
@@ -745,7 +745,7 @@
             <p>This parameter is the name of the driver
 	      to be used in subsequent calls to function
 	      <seealso marker="erts:erlang#open_port/2"><c>erlang:open_port</c></seealso>
-	      in <c>ERTS</c>.
+	      in ERTS.
 	      The name can be specified as an <c>iolist()</c> or
               an <c>atom()</c>. The name specified when loading is used
               to find the object file (with the help of <c><anno>Path</anno></c>
diff --git a/lib/kernel/doc/src/error_logger.xml b/lib/kernel/doc/src/error_logger.xml
index a8273e59e2..814e8eac46 100644
--- a/lib/kernel/doc/src/error_logger.xml
+++ b/lib/kernel/doc/src/error_logger.xml
@@ -33,7 +33,7 @@
   <description>
     <p>The Erlang <em>error logger</em> is an event manager (see
       <seealso marker="doc/design_principles:des_princ">OTP Design Principles</seealso> and
-      <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>),
+      <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>),
       registered as <c>error_logger</c>. Errors, warnings, and info events
       are sent to the error logger from the Erlang runtime system and
       the different Erlang/OTP applications. The events are, by default,
@@ -44,12 +44,12 @@
       executing.</p>
     <p>Initially, <c>error_logger</c> has only a primitive event
       handler, which buffers and prints the raw event messages. During
-      system startup, the <c>Kernel</c> application replaces this with a
+      system startup, the Kernel application replaces this with a
       <em>standard event handler</em>, by default one that writes
-      nicely formatted output to the terminal. <c>Kernel</c> can also be
+      nicely formatted output to the terminal. Kernel can also be
       configured so that events are logged to a file instead, or not logged at all,
       see <seealso marker="kernel_app"><c>kernel(6)</c></seealso>.</p>
-    <p>Also the <c>SASL</c> application, if started, adds its own event
+    <p>Also the SASL application, if started, adds its own event
       handler, which by default writes supervisor, crash, and progress
       reports to the terminal. See
       <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso>.</p>
@@ -58,9 +58,9 @@
       User-defined event handlers can be added to handle application-specific
       events, see
       <seealso marker="#add_report_handler/1"><c>add_report_handler/1,2</c></seealso>.
-      Also, a useful event handler is provided in <c>STDLIB</c> for multi-file
+      Also, a useful event handler is provided in STDLIB for multi-file
       logging of events, see
-      <seealso marker="stdlib:log_mf_h"><c>stdlib:log_mf_h(3)</c></seealso>.</p>
+      <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>.</p>
     <p>Warning events were introduced in Erlang/OTP R9C and are enabled
       by default as from Erlang/OTP 18.0. To retain backwards compatibility
       with existing user-defined event handlers, the warning events can be
@@ -82,7 +82,7 @@
         <p>Adds a new event handler to the error logger. The event
           handler must be implemented as a <c>gen_event</c> callback
           module, see
-          <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>
         <p><c><anno>Handler</anno></c> is typically the name of the callback module
           and <c><anno>Args</anno></c> is an optional term (defaults to []) passed
           to the initialization callback function <c><anno>Handler</anno>:init/1</c>.
@@ -97,7 +97,7 @@
       <desc>
         <p>Deletes an event handler from the error logger by calling
           <c>gen_event:delete_handler(error_logger, <anno>Handler</anno>, [])</c>,
-          see <seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>.</p>
+          see <seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -110,7 +110,7 @@
           The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
 	  are the same as the arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in <c>STDLIB</c>.
+	  in STDLIB.
 	  The event is handled by the standard event handler.</p>
 	<p><em>Example:</em></p>
         <pre>
@@ -171,7 +171,7 @@ ok</pre>
           The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
 	  are the same as the arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in <c>STDLIB</c>. The event is handled by the standard event handler.</p>
+	  in STDLIB. The event is handled by the standard event handler.</p>
 	<p><em>Example:</em></p>
         <pre>
 1> <input>error_logger:info_msg("Something happened in ~p~n", [a_module]).</input>
@@ -235,7 +235,7 @@ ok</pre>
         <p>Enables or disables printout of standard events to a file.</p>
         <p>This is done by adding or deleting the standard event handler
           for output to file. Thus, calling this function overrides
-          the value of the <c>Kernel</c> <c>error_logger</c> configuration
+          the value of the Kernel <c>error_logger</c> configuration
           parameter.</p>
         <p>Enabling file logging can be used together with calling
           <c>tty(false)</c>, to have a silent system where
@@ -274,7 +274,7 @@ ok</pre>
 	  to the terminal.</p>
         <p>This is done by adding or deleting the standard event handler
           for output to the terminal. Thus, calling this function overrides
-          the value of the <c>Kernel</c> <c>error_logger</c> configuration parameter.</p>
+          the value of the Kernel <c>error_logger</c> configuration parameter.</p>
       </desc>
     </func>
     <func>
@@ -323,7 +323,7 @@ ok</pre>
           The <c><anno>Format</anno></c> and <c><anno>Data</anno></c> arguments
 	  are the same as the arguments of
 	  <seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	  in <c>STDLIB</c>.
+	  in STDLIB.
 	  The event is handled by the standard event handler. It is tagged
 	  as an error, warning, or info, see
           <seealso marker="#warning_map/0"><c>warning_map/0</c></seealso>.</p>
@@ -416,8 +416,8 @@ ok</pre>
   </section>
   <section>
     <title>See Also</title>
-    <p><seealso marker="stdlib:gen_event"><c>stdlib:gen_event(3)</c></seealso>,
-       <seealso marker="stdlib:log_mf_h"><c>stdlib:log_mf_h(3)</c></seealso>
+    <p><seealso marker="stdlib:gen_event"><c>gen_event(3)</c></seealso>,
+       <seealso marker="stdlib:log_mf_h"><c>log_mf_h(3)</c></seealso>
        <seealso marker="kernel_app"><c>kernel(6)</c></seealso>
        <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso></p>
   </section>
diff --git a/lib/kernel/doc/src/file.xml b/lib/kernel/doc/src/file.xml
index 7d86c3ebcb..d734ee25b8 100644
--- a/lib/kernel/doc/src/file.xml
+++ b/lib/kernel/doc/src/file.xml
@@ -79,7 +79,7 @@
     <seealso marker="#list_dir_all"><c>list_dir_all/1</c></seealso> and
     <seealso marker="#read_link_all"><c>read_link_all/1</c></seealso>.</p>
 
-    <p>See also section <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes About Raw Filenames</seealso> in the <c>STDLIB</c> User´s Giude.</p>
+    <p>See also section <seealso marker="stdlib:unicode_usage#notes-about-raw-filenames">Notes About Raw Filenames</seealso> in the STDLIB User´s Giude.</p>
 
   </description>
 
@@ -277,7 +277,7 @@ f.txt:  {person, "kalle", 25}.
 {ok,[{person,"kalle",25},{person,"pelle",30}]}</pre>
         <p>The encoding of <c><anno>Filename</anno></c> can be set
           by a comment, as described in
-	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -445,7 +445,7 @@ f.txt:  {person, "kalle", 25}.
         </taglist>
         <p>The encoding of <c><anno>Filename</anno></c> can be set
           by a comment, as described in
-	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -455,7 +455,7 @@ f.txt:  {person, "kalle", 25}.
         <p>The same as <c>eval/1</c>, but the variable bindings
           <c><anno>Bindings</anno></c> are used in the evaluation. For information
 	  about the variable bindings, see
-          <seealso marker="stdlib:erl_eval"><c>stdlib:erl_eval(3)</c></seealso>.</p>
+          <seealso marker="stdlib:erl_eval"><c>erl_eval(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -830,7 +830,7 @@ f.txt:  {person, "kalle", 25}.
 	    this module (<c>file</c>) for reading and writing data as the interfaces
 	    provided here work with byte-oriented data. Using other (Unicode)
 	    encodings makes the
-	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> functions
+	    <seealso marker="stdlib:io"><c>io(3)</c></seealso> functions
 	    <c>get_chars</c>, <c>get_line</c>, and <c>put_chars</c> more suitable,
 	    as they can work with the full Unicode range.</p>
 	    <p>If data is sent to an <c>io_device()</c> in a format that cannot be
@@ -847,7 +847,7 @@ f.txt:  {person, "kalle", 25}.
 	    that is,
 	    <seealso marker="#read/2"><c>read/2</c></seealso> are
 	    returned "as is". If module
-	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> is used for
+	    <seealso marker="stdlib:io"><c>io(3)</c></seealso> is used for
 	    writing, the file can only cope with Unicode characters up to code point
 	    255 (the ISO Latin-1 range).</p>
 	    </item>
@@ -861,7 +861,7 @@ f.txt:  {person, "kalle", 25}.
 	    the file lies beyond the ISO Latin-1 range (0..255), but failure occurs
 	    if the data contains Unicode code points beyond that range. The file is
 	    best read with the functions in the Unicode aware module
-	    <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso>.</p>
+	    <seealso marker="stdlib:io"><c>io(3)</c></seealso>.</p>
 	    <p>Bytes written to the file by any means are translated to UTF-8 encoding
 	    before being stored on the disk file.</p>
 	    </item>
@@ -891,7 +891,7 @@ f.txt:  {person, "kalle", 25}.
 	    So a file can be analyzed in latin1 encoding for, for example, a BOM,
 	    positioned beyond the BOM and then be set for the right encoding before
 	    further reading. For functions identifying BOMs, see module
-	    <seealso marker="stdlib:unicode"><c>stdlib:unicode(3)</c></seealso>. </p>
+	    <seealso marker="stdlib:unicode"><c>unicode(3)</c></seealso>. </p>
 	    <p>This option is not allowed on <c>raw</c> files.</p>
           </item>
           <tag><c>ram</c></tag>
@@ -932,7 +932,7 @@ f.txt:  {person, "kalle", 25}.
           closed and the process itself is terminated.
           An <c><anno>IoDevice</anno></c> returned from this call can be used
           as an argument to the I/O functions (see
-          <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso>).</p>
+          <seealso marker="stdlib:io"><c>io(3)</c></seealso>).</p>
         <note>
           <p>In previous versions of <c>file</c>, modes were specified
             as one of the atoms <c>read</c>, <c>write</c>, or
@@ -1055,7 +1055,7 @@ f.txt:  {person, "kalle", 25}.
         </taglist>
         <p>The encoding of <c><anno>Filename</anno></c> can be set
           by a comment as described in
-	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -1128,7 +1128,7 @@ f.txt:  {person, "kalle", 25}.
         </taglist>
         <p>The encoding of <c><anno>Filename</anno></c> can be set
           by a comment as described in
-	  <seealso marker="stdlib:epp#encoding"><c>stdlib:epp(3)</c></seealso>.</p>
+	  <seealso marker="stdlib:epp#encoding"><c>epp(3)</c></seealso>.</p>
    </desc>
     </func>
     <func>
@@ -1389,7 +1389,7 @@ f.txt:  {person, "kalle", 25}.
           <c>{ok, <anno>FileInfo</anno>}</c> if successful, otherwise
           <c>{error, <anno>Reason</anno>}</c>. <c><anno>FileInfo</anno></c>
           is a record
-          <c>file_info</c>, defined in the <c>Kernel</c> include file
+          <c>file_info</c>, defined in the Kernel include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
         <code type="none">
@@ -1552,7 +1552,7 @@ f.txt:  {person, "kalle", 25}.
 	  raw line-oriented reading.</p>
 	  <p>If <c>encoding</c> is set to something else than <c>latin1</c>, the
 	  <c>read_line/1</c> call fails if the data contains characters larger than 255,
-	  why module <seealso marker="stdlib:io"><c>stdlib:io(3)</c></seealso> is to be
+	  why module <seealso marker="stdlib:io"><c>io(3)</c></seealso> is to be
 	  preferred when reading such a file.</p>
 	  <p>The function returns:</p>
         <taglist>
@@ -1970,7 +1970,7 @@ f.txt:  {person, "kalle", 25}.
         <p>Changes file information. Returns <c>ok</c> if successful,
           otherwise <c>{error, <anno>Reason</anno>}</c>.
           <c><anno>FileInfo</anno></c> is a record
-          <c>file_info</c>, defined in the <c>Kernel</c> include file
+          <c>file_info</c>, defined in the Kernel include file
           <c>file.hrl</c>. Include the following directive in the module
           from which the function is called:</p>
         <code type="none">
diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 83242c2df8..08454b9832 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -216,7 +216,7 @@ do_recv(Sock, Bs) ->
           time-out in milliseconds. Defaults to <c>infinity</c>.</p>
         <note>
           <p>The default values for options specified to <c>connect</c> can
-            be affected by the <c>Kernel</c> configuration parameter
+            be affected by the Kernel configuration parameter
             <c>inet_default_connect_options</c>. For details, see
             <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
         </note>
@@ -293,7 +293,7 @@ do_recv(Sock, Bs) ->
           <seealso marker="#accept/1"><c>accept/1,2</c></seealso>.</p>
         <note>
           <p>The default values for options specified to <c>listen</c> can
-            be affected by the <c>Kernel</c> configuration parameter
+            be affected by the Kernel configuration parameter
             <c>inet_default_listen_options</c>. For details, see
             <seealso marker="inet"><c>inet(3)</c></seealso>.</p>
         </note>
@@ -307,7 +307,7 @@ do_recv(Sock, Bs) ->
       <type_desc variable="HttpPacket">See the description of
         <c>HttpPacket</c> in
         <seealso marker="erts:erlang#decode_packet/3"><c>erlang:decode_packet/3</c></seealso>
-      in <c>ERTS</c>.
+      in ERTS.
       </type_desc>
       <desc>
         <p>Receives a packet from a socket in passive
diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
index 8cc21bf3e2..3f4e3684f4 100644
--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
@@ -36,7 +36,7 @@
       <seealso marker="erts:inet_cfg">ERTS User's Guide:
       Inet Configuration</seealso> for more information about how to
       configure an Erlang runtime system for IP communication.</p>
-    <p>The following two <c>Kernel</c> configuration parameters affect the
+    <p>The following two Kernel configuration parameters affect the
       behavior of all sockets opened on an Erlang node:</p>
     <list type="bulleted">
       <item><p><c>inet_default_connect_options</c> can contain a list of
@@ -48,7 +48,7 @@
     <p>When <c>accept</c> is issued, the values of the listening socket options
       are inherited. No such application variable is therefore needed for
       <c>accept</c>.</p>
-    <p>Using the <c>Kernel</c> configuration parameters above, one
+    <p>Using the Kernel configuration parameters above, one
       can set default options for all TCP sockets on a node, but use this
       with care. Options such as <c>{delay_send,true}</c> can be
       specified in this way. The following is an example of starting an Erlang
@@ -95,7 +95,7 @@ fe80::204:acff:fe17:bf38
     <datatype>
       <name name="hostent"/>
       <desc>
-        <p>The record is defined in the <c>Kernel</c> include file
+        <p>The record is defined in the Kernel include file
           <c>"inet.hrl"</c>.</p>
         <p>Add the following directive to the module:</p>
         <code>
@@ -391,7 +391,7 @@ get_tcpi_sacked(Sock) ->
     <<_:28/binary,TcpiSacked:32/native,_/binary>> = Info,
     TcpiSacked.]]></code>
         <p>Preferably, you would check the machine type, the operating system,
-          and the <c>Kernel</c> version before executing anything similar to
+          and the Kernel version before executing anything similar to
           this code.</p>
       </desc>
     </func>
@@ -661,7 +661,7 @@ get_tcpi_sacked(Sock) ->
             <p>The size of the user-level software buffer used by
               the driver. Not to be confused with options <c>sndbuf</c>
               and <c>recbuf</c>, which correspond to the
-              <c>Kernel</c> socket buffers. It is recommended
+              Kernel socket buffers. It is recommended
               to have <c>val(buffer) &gt;= max(val(sndbuf),val(recbuf))</c> to
               avoid performance issues because of unnecessary copying.
               <c>val(buffer)</c> is automatically set to the above
@@ -720,7 +720,7 @@ get_tcpi_sacked(Sock) ->
 	    <p>The socket message queue is set to a busy
 	      state when the amount of data on the message
 	      queue reaches this limit. Notice that this limit only
-	      concerns data that has not yet reached the <c>ERTS</c> internal
+	      concerns data that has not yet reached the ERTS internal
 	      socket implementation. Defaults to 8 kB.</p>
 	    <p>Senders of data to the socket are suspended if
 	      either the socket message queue is busy or the socket
@@ -736,7 +736,7 @@ get_tcpi_sacked(Sock) ->
           <tag><c>{high_watermark, Size}</c> (TCP/IP sockets)</tag>
           <item>
 	    <p>The socket is set to a busy state when the amount
-	      of data queued internally by the <c>ERTS</c> socket implementation
+	      of data queued internally by the ERTS socket implementation
 	      reaches this limit. Defaults to 8 kB.</p>
 	    <p>Senders of data to the socket are suspended if
 	      either the socket message queue is busy or the socket
@@ -816,7 +816,7 @@ get_tcpi_sacked(Sock) ->
 	      socket message queue is set in a not busy state when
 	      the amount of data queued in the message queue falls
 	      below this limit. Notice that this limit only concerns data
-	      that has not yet reached the <c>ERTS</c> internal socket
+	      that has not yet reached the ERTS internal socket
 	      implementation. Defaults to 4 kB.</p>
 	    <p>Senders that are suspended because of either a
 	      busy message queue or a busy socket are resumed
@@ -834,7 +834,7 @@ get_tcpi_sacked(Sock) ->
           <item>
 	    <p>If the socket is in a busy state, the socket is
 	      set in a not busy state when the amount of data
-	      queued internally by the <c>ERTS</c> socket implementation
+	      queued internally by the ERTS socket implementation
 	      falls below this limit. Defaults to 4 kB.</p>
 	    <p>Senders that are suspended because of a
 	      busy message queue or a busy socket are resumed
@@ -954,7 +954,7 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp</code>
                  are returned with the format according to <c>HttpPacket</c>
                  described in
                  <seealso marker="erts:erlang#decode_packet/3">
-                 <c>erlang:decode_packet/3</c></seealso> in <c>ERTS</c>.
+                 <c>erlang:decode_packet/3</c></seealso> in ERTS.
                  A socket in passive
                  mode returns <c>{ok, HttpPacket}</c> from <c>gen_tcp:recv</c>
                  while an active socket sends messages like
@@ -1130,7 +1130,7 @@ inet:setopts(Sock,[{raw,6,8,<<30:32/native>>}]),]]></code>
           can respond differently to this kind of option
           manipulation. Use with care.</p>
         <p>Notice that the default options for TCP/IP sockets can be
-          changed with the <c>Kernel</c> configuration parameters mentioned in
+          changed with the Kernel configuration parameters mentioned in
           the beginning of this manual page.</p>
       </desc>
     </func>
diff --git a/lib/kernel/doc/src/init_stub.xml b/lib/kernel/doc/src/init_stub.xml
index df89b174ca..1297c8264d 100644
--- a/lib/kernel/doc/src/init_stub.xml
+++ b/lib/kernel/doc/src/init_stub.xml
@@ -34,6 +34,6 @@
   <modulesummary>Coordination of system startup.</modulesummary>
   <description>
   <p>This module is moved to the
-    <seealso marker="erts:init"><c>ERTS</c></seealso> application.</p>
+    <seealso marker="erts:init">ERTS</seealso> application.</p>
   </description>
 </erlref>
diff --git a/lib/kernel/doc/src/kernel_app.xml b/lib/kernel/doc/src/kernel_app.xml
index fb6421e1c5..df681a505f 100644
--- a/lib/kernel/doc/src/kernel_app.xml
+++ b/lib/kernel/doc/src/kernel_app.xml
@@ -31,12 +31,12 @@
   <app>kernel</app>
   <appsummary>The Kernel application.</appsummary>
   <description>
-    <p>The <c>Kernel</c> application has all the code necessary to run
+    <p>The Kernel application has all the code necessary to run
       the Erlang runtime system: file servers, code servers,
       and so on.</p>
-    <p>The <c>Kernel</c> application is the first application started. It is
+    <p>The Kernel application is the first application started. It is
       mandatory in the sense that the minimal system based on
-      Erlang/OTP consists of <c>Kernel</c> and <c>STDLIB</c>. <c>Kernel</c>
+      Erlang/OTP consists of Kernel and STDLIB. Kernel
       contains the following functional areas:</p>
     <list type="bulleted">
       <item>Start, stop, supervision, configuration, and distribution of applications</item>
@@ -53,13 +53,13 @@
   <section>
     <title>Error Logger Event Handlers</title>
     <p>Two standard error logger event handlers are defined in
-      the <c>Kernel</c> application. These are described in
+      the Kernel application. These are described in
       <seealso marker="error_logger"><c>error_logger(3)</c></seealso>.</p>
   </section>
 
   <section>
     <title>Configuration</title>
-    <p>The following configuration parameters are defined for the <c>Kernel</c>
+    <p>The following configuration parameters are defined for the Kernel
       application. For more information about configuration parameters,
     see file <seealso marker="app"><c>app(4)</c></seealso>.</p>
     <taglist>
@@ -162,8 +162,8 @@
         depth to which terms are printed by the error logger event
         handlers included in OTP. This
         configuration parameter is used by the two event handlers
-        defined by the <c>Kernel</c> application and the two event
-        handlers in the <c>SASL</c> application.
+        defined by the Kernel application and the two event
+        handlers in the SASL application.
 	(If you have implemented your own error handlers, this configuration
 	parameter has no effect on them.)</p>
 
@@ -173,7 +173,7 @@
 	<c>~P</c> and <c>~W</c>, respectively, and <c>Depth</c> is
 	used as the depth parameter. For details, see
 	<seealso marker="stdlib:io#format/2"><c>io:format/2</c></seealso>
-	in <c>STDLIB</c>.</p>
+	in STDLIB.</p>
 
 	<note><p>A reasonable starting value for <c>Depth</c> is
 	<c>30</c>. We recommend to test crashing various processes in your
@@ -241,7 +241,7 @@
         <p>The name (string) of an Inet user configuration file. For details,
 	see section
 	<seealso marker="erts:inet_cfg"><c>Inet Configuration</c></seealso>
-	in the <c>ERTS</c> User's Guide.</p>
+	in the ERTS User's Guide.</p>
       </item>
       <tag><c>net_setuptime = SetupTime</c></tag>
       <item>
@@ -360,7 +360,7 @@ MaxT = TickTime + TickTime / 4</code>
       <tag><c>start_timer = true | false</c></tag>
       <item>
         <p>Starts the <c>timer_server</c> if the parameter is
-          <c>true</c> (see <seealso marker="stdlib:timer"><c>stdlib:timer(3)</c></seealso>).
+          <c>true</c> (see <seealso marker="stdlib:timer"><c>timer(3)</c></seealso>).
 	  This parameter is to be set to <c>true</c> in an embedded system
 	  using this service.</p>
         <p>Defaults to <c>false</c>.</p>
diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml
index 3c1b3d5190..4e2b0c69db 100644
--- a/lib/kernel/doc/src/net_kernel.xml
+++ b/lib/kernel/doc/src/net_kernel.xml
@@ -55,7 +55,7 @@ $ <input>erl -sname foobar</input></pre>
       <seealso marker="erts:erl"><c>erl</c></seealso>.</p>
     <p>Normally, connections are established automatically when
       another node is referenced. This functionality can be disabled
-      by setting <c>Kernel</c> configuration parameter
+      by setting Kernel configuration parameter
       <c>dist_auto_connect</c> to <c>false</c>, see
       <seealso marker="kernel_app"><c>kernel(6)</c></seealso>. In this case,
       connections must be established explicitly by calling
@@ -146,7 +146,7 @@ $ <input>erl -sname foobar</input></pre>
           are stopped. Two
           option lists are considered the same if they contain the same
           set of options.</p>
-        <p>As from <c>Kernel</c> version 2.11.4, and <c>ERTS</c> version
+        <p>As from Kernel version 2.11.4, and ERTS version
           5.5.4, the following is guaranteed:</p>
         <list type="bulleted">
           <item><p><c>nodeup</c> messages are delivered before delivery
@@ -156,13 +156,13 @@ $ <input>erl -sname foobar</input></pre>
             messages from the remote node that have been passed
             through the connection have been delivered.</p></item>
         </list>
-        <p>Notice that this is <em>not</em> guaranteed for <c>Kernel</c>
+        <p>Notice that this is <em>not</em> guaranteed for Kernel
           versions before 2.11.4.</p>
-        <p>As from <c>Kernel</c> version 2.11.4, subscriptions can also be
+        <p>As from Kernel version 2.11.4, subscriptions can also be
           made before the <c>net_kernel</c> server is started, that is,
           <c>net_kernel:monitor_nodes/[1,2]</c> does not return
           <c>ignored</c>.</p>
-        <p>As from <c>Kernel</c> version 2.13, and <c>ERTS</c> version
+        <p>As from Kernel version 2.13, and ERTS version
           5.7, the following is guaranteed:</p>
         <list type="bulleted">
           <item><p><c>nodeup</c> messages are delivered after the
@@ -172,7 +172,7 @@ $ <input>erl -sname foobar</input></pre>
 	    corresponding node has disappeared in results from
 	    <c>erlang:nodes/X</c>.</p></item>
         </list>
-        <p>Notice that this is <em>not</em> guaranteed for <c>Kernel</c>
+        <p>Notice that this is <em>not</em> guaranteed for Kernel
           versions before 2.13.</p>
         <p>The format of the node status change messages depends on
           <c><anno>Options</anno></c>. If <c><anno>Options</anno></c> is
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 3d35f6f57f..9e9be3f661 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -3482,7 +3482,7 @@
 	    types (for instance, <c>ensure_loaded/1</c> now only
 	    accepts an atom as documented; it used to accept a string
 	    too).</p>
-	    <p><c>Dialyzer</c> will generally emit warnings for any
+	    <p>Dialyzer will generally emit warnings for any
 	    calls that use undocumented argument types. Even if the
 	    call happens to still work in R12B, you should correct
 	    your code. A future release will adhere to the
diff --git a/lib/kernel/doc/src/rpc.xml b/lib/kernel/doc/src/rpc.xml
index 8cad9fe4fc..5944e9321a 100644
--- a/lib/kernel/doc/src/rpc.xml
+++ b/lib/kernel/doc/src/rpc.xml
@@ -320,7 +320,7 @@
       <fsummary>Information about a process.</fsummary>
       <desc>
         <p>Location transparent version of the BIF
-          <seealso marker="erts:erlang#process_info/1"><c>erlang:process_info/1</c></seealso> in <c>ERTS</c>.</p>
+          <seealso marker="erts:erlang#process_info/1"><c>erlang:process_info/1</c></seealso> in ERTS.</p>
       </desc>
     </func>
 
@@ -330,7 +330,7 @@
       <fsummary>Information about a process.</fsummary>
       <desc>
         <p>Location transparent version of the BIF
-          <seealso marker="erts:erlang#process_info/2"><c>erlang:process_info/2</c></seealso> in <c>ERTS</c>.</p>
+          <seealso marker="erts:erlang#process_info/2"><c>erlang:process_info/2</c></seealso> in ERTS.</p>
       </desc>
     </func>
 
diff --git a/lib/kernel/doc/src/zlib_stub.xml b/lib/kernel/doc/src/zlib_stub.xml
index b111581b10..9ab9c4eb62 100644
--- a/lib/kernel/doc/src/zlib_stub.xml
+++ b/lib/kernel/doc/src/zlib_stub.xml
@@ -34,6 +34,6 @@
   <modulesummary>Zlib compression interface.</modulesummary>
   <description>
   <p>This module is moved to the
-    <seealso marker="erts:zlib"><c>ERTS</c></seealso> application.</p>
+    <seealso marker="erts:zlib">ERTS</seealso> application.</p>
   </description>
 </erlref>