Merge branch 'lars/system-doc-xmllint-errors/OTP-13638'

* lars/system-doc-xmllint-errors/OTP-13638:
  [erl_docgen] Fix anchor bug for sections in ref manuals
  Remove usage of non dtd defined tag (<output>)
  [erl_docgen] Fix support for quote tag
  [erl_docgen] Correct the handling of marker tags
  Correct usage of marker tag
  [erl_docgen] Add new formatting for header level 4 and below
  Make it possible to run xmllint target in system documentation

4 files changed, 11 insertions, 11 deletions

diff --git a/system/doc/design_principles/sup_princ.xml b/system/doc/design_principles/sup_princ.xml
index a77b3964fc..0a24e97950 100644
--- a/system/doc/design_principles/sup_princ.xml
+++ b/system/doc/design_principles/sup_princ.xml
@@ -80,8 +80,8 @@ init(_Args) ->
     </section>
 
   <section>
-    <title>Supervisor Flags</title>
     <marker id="flags"/>
+    <title>Supervisor Flags</title>
     <p>This is the type definition for the supervisor flags:</p>
     <code type="none"><![CDATA[
 sup_flags() = #{strategy => strategy(),         % optional
@@ -106,9 +106,8 @@ sup_flags() = #{strategy => strategy(),         % optional
   </section>
 
   <section>
-    <marker id="strategy"></marker>
+    <marker id="strategy"/>
     <title>Restart Strategy</title>
-
     <p> The restart strategy is specified by
       the <c>strategy</c> key in the supervisor flags map returned by
       the callback function <c>init</c>:</p>
diff --git a/system/doc/system_principles/create_target.xmlsrc b/system/doc/system_principles/create_target.xmlsrc
index 8a463076f5..f9b27ffc35 100644
--- a/system/doc/system_principles/create_target.xmlsrc
+++ b/system/doc/system_principles/create_target.xmlsrc
@@ -374,10 +374,10 @@ os> <input>/usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.1</input></pre>
     </p>
     <pre>
 2> <input>release_handler:install_release(Vsn).</input>
-<output>{continue_after_restart,"FIRST",[]}
+{continue_after_restart,"FIRST",[]}
 heart: Tue Apr  1 12:15:10 2014: Erlang has closed.
 heart: Tue Apr  1 12:15:11 2014: Executed "/usr/local/erl-target/bin/start /usr/local/erl-target/releases/new_start_erl.data" -> 0. Terminating.
-[End]</output></pre>
+[End]</pre>
     <p>
       The above return value and output after the call to
       <c>release_handler:install_release/1</c> means that the
@@ -398,12 +398,12 @@ os> <input>/usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.2</input></pre>
     </p>
     <pre>
 1> <input>release_handler:which_releases().</input>
-<output>[{"MYSYSTEM","SECOND",
+[{"MYSYSTEM","SECOND",
   ["kernel-3.0","stdlib-2.0","sasl-2.4","pea-2.0"],
   current},
  {"MYSYSTEM","FIRST",
   ["kernel-2.16.4","stdlib-1.19.4","sasl-2.3.4","pea-1.0"],
-  permanent}]</output></pre>
+  permanent}]</pre>
     <p>
       Our new release, "SECOND", is now the current release, but we
       can also see that our "FIRST" release is still permanent. This
@@ -420,12 +420,12 @@ os> <input>/usr/local/erl-target/bin/to_erl /tmp/erlang.pipe.2</input></pre>
     </p>
     <pre>
 3> <input>release_handler:which_releases().</input>
-<output>[{"MYSYSTEM","SECOND",
+[{"MYSYSTEM","SECOND",
   ["kernel-3.0","stdlib-2.0","sasl-2.4","pea-2.0"],
   permanent},
  {"MYSYSTEM","FIRST",
   ["kernel-2.16.4","stdlib-1.19.4","sasl-2.3.4","pea-1.0"],
-  old}]</output></pre>
+  old}]</pre>
   <p>
     We see that the new release version is <c>permanent</c>, so
     it would be safe to restart the node.</p>
diff --git a/system/doc/system_principles/versions.xml b/system/doc/system_principles/versions.xml
index 3772d773fc..b9f7fa4bf6 100644
--- a/system/doc/system_principles/versions.xml
+++ b/system/doc/system_principles/versions.xml
@@ -57,11 +57,11 @@
       <p>In an OTP source code tree, the OTP version can be read from
       the text file <c>&lt;OTP source root&gt;/OTP_VERSION</c>. The
       absolute path to the file can be constructed by calling
-      <c>filename:join([<seealso marker="kernel:code#root_dir/0">code:root_dir()</seealso>, "OTP_VERSION"])</c>.</p>
+      <c>filename:join([</c><seealso marker="kernel:code#root_dir/0"><c>code:root_dir()</c></seealso><c>, "OTP_VERSION"])</c>.</p>
       <p>In an installed OTP development system, the OTP version can be read
       from the text file <c>&lt;OTP installation root&gt;/releases/&lt;OTP release number&gt;/OTP_VERSION</c>.
       The absolute path to the file can by constructed by calling
-      <c>filename:join([<seealso marker="kernel:code#root_dir/0">code:root_dir()</seealso>, "releases", <seealso marker="erts:erlang#system_info_otp_release"> erlang:system_info(otp_release)</seealso>, "OTP_VERSION"]).</c></p>
+      <c>filename:join([</c><seealso marker="kernel:code#root_dir/0"><c>code:root_dir()</c></seealso><c>, "releases", </c><seealso marker="erts:erlang#system_info_otp_release"><c>erlang:system_info(otp_release)</c></seealso><c>, "OTP_VERSION"]).</c></p>
       <p>If the version read from the <c>OTP_VERSION</c> file in a
       development system has a <c>**</c> suffix, the system has been
       patched using the
diff --git a/system/doc/top/Makefile b/system/doc/top/Makefile
index caae19a8d1..6aa9d8d340 100644
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
@@ -74,6 +74,7 @@ XML_FILES = \
 
 BOOK_FILES = book.xml
 
+XMLLINT_SRCDIRS= ../installation_guide:../system_principles:../embedded:../getting_started:../reference_manual:../programming_examples:../efficiency_guide:../tutorial:../design_principles:../oam
 HTMLDIR= ../html
 PDFREFDIR= pdf