Merge branch 'maint'

* maint:
  doc: Correct errors introduced by Editorial changes

8 files changed, 20 insertions, 20 deletions

diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml
index 3b134d00b7..2e4261d72e 100644
--- a/lib/stdlib/doc/src/dets.xml
+++ b/lib/stdlib/doc/src/dets.xml
@@ -391,7 +391,7 @@
           <item>
             <p><c>{hash, Hash}</c> - Describes which BIF is
               used to calculate the hash values of the objects stored in the
-              <c>dets</c> table. Possible values of <c>Hash</c>:</p>
+              Dets table. Possible values of <c>Hash</c>:</p>
             <list>
               <item>
                 <p><c>hash</c> - Implies that the <c>erlang:hash/2</c> BIF
diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 3653c6a632..5f5d2b7f36 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -369,7 +369,7 @@
           variable that in turn is passed to the function.</p>
         <p>The parse transform is provided in the <c>ms_transform</c>
           module and the source <em>must</em> include
-          file <c>ms_transform.hrl</c> in <c>STDLIB</c> for this
+          file <c>ms_transform.hrl</c> in STDLIB for this
           pseudo function to work. Failing to include the hrl file in
           the source results in a runtime error, not a compile
           time error. The include file is easiest included by adding line
@@ -1644,7 +1644,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
         </taglist>
         <p>Whenever option <c>extended_info</c> is used, it
           results in a file not readable by versions of ETS before
-          that in <c>STDLIB</c> 1.15.1</p>
+          that in STDLIB 1.15.1</p>
         <p>If option <c>sync</c> is set to <c>true</c>, it ensures that
           the content of the file is written to the disk before
           <c>tab2file</c> returns. Defaults to <c>{sync, false}</c>.</p>
@@ -1725,7 +1725,7 @@ is_integer(X), is_integer(Y), X + Y < 4711]]></code>
             <p>A tuple <c>{<anno>Major</anno>,<anno>Minor</anno>}</c>
               containing the major and
               minor version of the file format for ETS table dumps. This
-              version field was added beginning with <c>STDLIB</c> 1.5.1.
+              version field was added beginning with STDLIB 1.5.1.
               Files dumped with older versions return <c>{0,0}</c> in this
               field.</p>
           </item>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index d8fec1147f..f0347703e7 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -526,7 +526,7 @@
         </item>
         <item>
           <p>
-	    The <c>stdlib</c> reference manual is updated to show
+	    The STDLIB reference manual is updated to show
 	    correct information about the return value of
 	    <c>gen_fsm:reply/2</c>.</p>
           <p>
@@ -6236,7 +6236,7 @@
             documentation for <c>compile</c> on how to provide the key
             for encrypting, and the documentation for <c>beam_lib</c>
             on how to provide the key for decryption so that tools such
-            as the Debugger, <c>xref</c>, or <c>cover</c> can be used.</p>
+            as the Debugger, Xref, or Cover can be used.</p>
           <p>The <c>beam_lib:chunks/2</c> functions now accepts an
             additional chunk type <c>compile_info</c> to retrieve
             the compilation information directly as a term. (Thanks
diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index 58ca5644cf..da03c39a26 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -59,9 +59,9 @@
     <p>When a process that is started using <c>proc_lib</c> terminates
       abnormally (that is, with another exit reason than <c>normal</c>,
       <c>shutdown</c>, or <c>{shutdown,Term}</c>), a <em>crash report</em>
-      is generated, which is written to terminal by the default <c>SASL</c>
+      is generated, which is written to terminal by the default SASL
       event handler. That is, the crash report is normally only visible
-      if the <c>SASL</c> application is started; see
+      if the SASL application is started; see
       <seealso marker="sasl:sasl_app"><c>sasl(6)</c></seealso> and section
       <seealso marker="sasl:error_logging">SASL Error Logging</seealso>
       in the SASL User's Guide.</p>
diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml
index cde73269a8..f857cc394b 100644
--- a/lib/stdlib/doc/src/stdlib_app.xml
+++ b/lib/stdlib/doc/src/stdlib_app.xml
@@ -31,14 +31,14 @@
   <app>STDLIB</app>
   <appsummary>The STDLIB application.</appsummary>
   <description>
-    <p>The <c>STDLIB</c> application is mandatory in the sense that the minimal
-      system based on Erlang/OTP consists of <c>Kernel</c> and <c>STDLIB</c>.
-      The <c>STDLIB</c> application contains no services.</p>
+    <p>The STDLIB application is mandatory in the sense that the minimal
+      system based on Erlang/OTP consists of Kernel and STDLIB.
+      The STDLIB application contains no services.</p>
   </description>
 
   <section>
     <title>Configuration</title>
-    <p>The following configuration parameters are defined for the <c>STDLIB</c>
+    <p>The following configuration parameters are defined for the STDLIB
       application. For more information about configuration parameters, see the
       <seealso marker="kernel:app"><c>app(4)</c></seealso> module in Kernel.</p>
 
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index 8f2ce36b06..fcaccdb2cb 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -253,7 +253,7 @@
           is needed. This is useful during development, but in a
           target system the server is to be started explicitly. Use
           configuration parameters for
-          <seealso marker="kernel:index"><c>Kernel</c></seealso> for this.</p>
+          <seealso marker="kernel:index">Kernel</seealso> for this.</p>
       </desc>
     </func>
 
diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index 7f79ac88a1..efc8b75075 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -274,8 +274,8 @@
         marker="stdlib:io"><c>io</c></seealso> module, the file
         handling, the <seealso
         marker="stdlib:unicode"><c>unicode</c></seealso> module, and
-        the bit syntax). Today most modules in <c>Kernel</c> and
-        <c>STDLIB</c>, as well as the VM are Unicode-aware.</p>
+        the bit syntax). Today most modules in Kernel and
+        STDLIB, as well as the VM are Unicode-aware.</p>
       </item>
       <tag>File I/O</tag>
       <item>
@@ -765,7 +765,7 @@ Eshell V5.10.1  (abort with ^G)
     file system). The Unicode character list is used to denote
     filenames or directory names. If the file system content is
     listed, you also get Unicode lists as return value. The support
-    lies in the <c>Kernel</c> and <c>STDLIB</c> modules, which is why
+    lies in the Kernel and STDLIB modules, which is why
     most applications (that does not explicitly require the filenames
     to be in the ISO Latin-1 range) benefit from the Unicode support
     without change.</p>
@@ -843,7 +843,7 @@ Eshell V5.10.1  (abort with ^G)
       <title>Notes About Raw Filenames</title>
       <marker id="notes-about-raw-filenames"/>
       <p>Raw filenames were introduced together with Unicode filename support
-        in <c>ERTS</c> 5.8.2 (Erlang/OTP R14B01). The reason &quot;raw
+        in ERTS 5.8.2 (Erlang/OTP R14B01). The reason &quot;raw
         filenames&quot; were introduced in the system was
 	to be able to represent
         filenames, specified in different encodings on the same system,
diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index de23608046..0b5eac1e16 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -138,7 +138,7 @@
             <p>File information as in
               <seealso marker="kernel:file#read_file_info/1">
               <c>file:read_file_info/1</c></seealso>
-	    in <c>Kernel</c></p>
+	    in Kernel</p>
           </item>
           <tag><c>comment</c></tag>
           <item>
@@ -345,7 +345,7 @@
               prepended to filenames when extracting them from the
               zip archive. (Acting like
 	      <seealso marker="kernel:file#set_cwd/1">
-              <c>file:set_cwd/1</c></seealso> in <c>Kernel</c>,
+              <c>file:set_cwd/1</c></seealso> in Kernel,
 	      but without changing the global <c>cwd</c> property.)</p>
           </item>
         </taglist>
@@ -420,7 +420,7 @@
               (<c>cwd</c>). This is prepended to filenames when adding them,
               although not in the zip archive (acting like
 	      <seealso marker="kernel:file#set_cwd/1">
-              <c>file:set_cwd/1</c></seealso> in <c>Kernel</c>, but without
+              <c>file:set_cwd/1</c></seealso> in Kernel, but without
               changing the global <c>cwd</c> property.).</p>
           </item>
           <tag><c>{compress, <anno>What</anno>}</c></tag>