Author: bdubbs
Date: Thu Apr  9 13:11:25 2020
New Revision: 22981

Log:
Clarify naming of docbook xml and dtd pages.

Added:
   trunk/BOOK/pst/sgml/docbook-3.1-dtd.xml
      - copied, changed from r22980, trunk/BOOK/pst/sgml/sgml-dtd-3.xml
   trunk/BOOK/pst/sgml/docbook-4.5-dtd.xml
      - copied, changed from r22980, trunk/BOOK/pst/sgml/sgml-dtd.xml
   trunk/BOOK/pst/xml/docbook-45-xml.xml
      - copied, changed from r22980, trunk/BOOK/pst/xml/docbook.xml
Deleted:
   trunk/BOOK/pst/sgml/sgml-dtd-3.xml
   trunk/BOOK/pst/sgml/sgml-dtd.xml
   trunk/BOOK/pst/xml/docbook.xml
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/pst/sgml/openjade.xml
   trunk/BOOK/pst/sgml/sgml.xml
   trunk/BOOK/pst/xml/xml.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Thu Apr  9 10:45:41 
2020        (r22980)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Thu Apr  9 13:11:25 
2020        (r22981)
@@ -45,6 +45,9 @@
       <para>April 9th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Clarify naming of docbook xml and dtd pages.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to libva-2.7.0. Fixes
           <ulink url="&blfs-ticket-root;13387">#13387</ulink>.</para>
         </listitem>
@@ -52,8 +55,6 @@
           <para>[timtas] - Update to thunderbird-68.7.0. Fixes
           <ulink url="&blfs-ticket-root;13381">#13381</ulink>.</para>
         </listitem>
-      </itemizedlist>
-      <itemizedlist>
         <listitem>
           <para>[thomas] - Update to wireshark-3.2.3. Fixes
           <ulink url="&blfs-ticket-root;13380">#13380</ulink>.</para>

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Thu Apr  9 10:45:41 2020        (r22980)
+++ trunk/BOOK/packages.ent     Thu Apr  9 13:11:25 2020        (r22981)
@@ -1041,15 +1041,15 @@
 
 <!-- Chapter 48 -->
 <!ENTITY sgml-common-version          "0.6.3">
-<!ENTITY sgml-dtd-3-version           "3.1">
-<!ENTITY sgml-dtd-version             "4.5">
+<!ENTITY docbook-3.1-dtd-version      "3.1">
+<!ENTITY docbook-4.5-dtd-version      "4.5">
 <!ENTITY opensp-version               "1.5.2">
 <!ENTITY openjade-version             "1.3.2">
 <!ENTITY docbook-dsssl-version        "1.79">
 <!ENTITY docbook-utils-version        "0.6.14">
 
 <!-- Chapter 49 -->
-<!ENTITY DocBook-version              "4.5">
+<!ENTITY docBook-45-xml-version       "4.5">
 <!ENTITY docbook-xsl-version          "1.79.2">
 <!ENTITY itstool-version              "2.0.6">
 <!ENTITY xmlto-version                "0.0.28">

Copied and modified: trunk/BOOK/pst/sgml/docbook-3.1-dtd.xml (from r22980, 
trunk/BOOK/pst/sgml/sgml-dtd-3.xml)
==============================================================================
--- trunk/BOOK/pst/sgml/sgml-dtd-3.xml  Thu Apr  9 10:45:41 2020        
(r22980, copy source)
+++ trunk/BOOK/pst/sgml/docbook-3.1-dtd.xml     Thu Apr  9 13:11:25 2020        
(r22981)
@@ -4,7 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY sgml-dtd-3-download-http 
"http://www.docbook.org/sgml/&sgml-dtd-3-version;/docbk31.zip";>
+  <!ENTITY sgml-dtd-3-download-http 
"http://www.docbook.org/sgml/&docbook-3.1-dtd-version;/docbk31.zip";>
   <!ENTITY sgml-dtd-3-download-ftp  " ">
   <!ENTITY sgml-dtd-3-md5sum        "432749c0c806dbae81c8bcb70da3b5d3">
   <!ENTITY sgml-dtd-3-size          "55 KB">
@@ -12,23 +12,23 @@
   <!ENTITY sgml-dtd-3-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="sgml-dtd-3" xreflabel="docbook-&sgml-dtd-3-version;">
-  <?dbhtml filename="sgml-dtd-3.html"?>
+<sect1 id="sgml-dtd-3" xreflabel="docbook-&docbook-3.1-dtd-version;-dtd">
+  <?dbhtml filename="docbook-3.1-dtd.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>docbook-&sgml-dtd-3-version;</title>
+  <title>docbook-&docbook-3.1-dtd-version;-dtd</title>
 
   <indexterm zone="sgml-dtd-3">
-    <primary sortas="a-DocBook-SGML-DTD-&sgml-dtd-3-version;">DocBook SGML
-    DTD-&sgml-dtd-3-version;</primary>
+    <primary sortas="a-DocBook-SGML-DTD-&docbook-3.1-dtd-version;">DocBook SGML
+    DTD-&docbook-3.1-dtd-version;</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to DocBook SGML DTD</title>
+    <title>Introduction to DocBook-3.1 SGML DTD</title>
 
     <para>
       The <application>DocBook SGML DTD</application> package contains
@@ -74,7 +74,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">DocBook SGML DTD Dependencies</bridgehead>
+    <bridgehead renderas="sect3">DocBook-3.1 SGML DTD Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -88,18 +88,18 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of DocBook SGML DTD</title>
+    <title>Installation of DocBook-3.1 SGML DTD</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/use-unzip.xml"/>
 
     <para>
-      Install <application>DocBook SGML DTD</application> by running
+      Install <application>DocBook-3.1 SGML DTD</application> by running
       the following commands:
     </para>
 
 <screen><userinput>sed -i -e '/ISO 8879/d' \
-       -e 's|DTDDECL "-//OASIS//DTD DocBook 
V&sgml-dtd-3-version;//EN"|SGMLDECL|g' \
+       -e 's|DTDDECL "-//OASIS//DTD DocBook 
V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g' \
        docbook.cat</userinput></screen>
 
     <para>
@@ -110,15 +110,15 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version; &amp;&amp;
+<screen role="root"><userinput>install -v -d -m755 
/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
 chown -R root:root . &amp;&amp;
-install -v docbook.cat 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version; &amp;&amp;
+install -v docbook.cat 
/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &amp;&amp;
+cp -v -af *.dtd *.mod *.dcl 
/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version; &amp;&amp;
 
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-3-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version;/catalog &amp;&amp;
+install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat 
\
+    /usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog 
&amp;&amp;
 
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-3-version;.cat \
+install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-3.1-dtd-version;.cat 
\
     /etc/sgml/sgml-docbook.cat</userinput></screen>
 
   </sect2>
@@ -133,7 +133,7 @@
 
     <para>
       <command>sed -i -e 's|DTDDECL
-      "-//OASIS//DTD Docbook V&sgml-dtd-3-version;//EN"|SGMLDECL|g'
+      "-//OASIS//DTD Docbook V&docbook-3.1-dtd-version;//EN"|SGMLDECL|g'
       docbook.cat</command>: This command replaces the DTDDECL catalog entry,
       which is not supported by Linux SGML tools, with the SGMLDECL catalog
       entry.
@@ -142,7 +142,7 @@
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring DocBook SGML DTD</title>
+    <title>Configuring DocBook-3.1 SGML DTD</title>
 
     <sect3 id="sgml-dtd-3-config">
       <title>Config Files</title>
@@ -170,7 +170,7 @@
         <systemitem class="username">root</systemitem> user):
       </para>
 
-<screen role="root"><userinput>cat &gt;&gt; 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version;/catalog &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; 
/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;/catalog &lt;&lt; 
"EOF"
 <literal>  -- Begin Single Major Version catalog changes --
 
 PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
@@ -195,7 +195,7 @@
         <seg>None</seg>
         <seg>None</seg>
         <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-3-version;</seg>
+        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-3.1-dtd-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Copied and modified: trunk/BOOK/pst/sgml/docbook-4.5-dtd.xml (from r22980, 
trunk/BOOK/pst/sgml/sgml-dtd.xml)
==============================================================================
--- trunk/BOOK/pst/sgml/sgml-dtd.xml    Thu Apr  9 10:45:41 2020        
(r22980, copy source)
+++ trunk/BOOK/pst/sgml/docbook-4.5-dtd.xml     Thu Apr  9 13:11:25 2020        
(r22981)
@@ -4,7 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY sgml-dtd-download-http 
"http://www.docbook.org/sgml/&sgml-dtd-version;/docbook-&sgml-dtd-version;.zip";>
+  <!ENTITY sgml-dtd-download-http 
"http://www.docbook.org/sgml/&docbook-4.5-dtd-version;/docbook-&docbook-4.5-dtd-version;.zip";>
   <!ENTITY sgml-dtd-download-ftp  " ">
   <!ENTITY sgml-dtd-md5sum        "07c581f4bbcba6d3aac85360a19f95f7">
   <!ENTITY sgml-dtd-size          "70 KB">
@@ -12,26 +12,26 @@
   <!ENTITY sgml-dtd-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="sgml-dtd" xreflabel="docbook-&sgml-dtd-version;">
-  <?dbhtml filename="sgml-dtd.html"?>
+<sect1 id="sgml-dtd" xreflabel="docbook-&docbook-4.5-dtd-version;-dtd">
+  <?dbhtml filename="docbook-4.5-dtd.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>docbook-&sgml-dtd-version;</title>
+  <title>docbook-&docbook-4.5-dtd-version;-dtd</title>
 
   <indexterm zone="sgml-dtd">
-    <primary sortas="a-DocBook-SGML-DTD-&sgml-dtd-version;">DocBook SGML
-    DTD-&sgml-dtd-version;</primary>
+    <primary sortas="a-DocBook-SGML-DTD-&docbook-4.5-dtd-version;">DocBook SGML
+    DTD-&docbook-4.5-dtd-version;</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to DocBook SGML DTD</title>
+    <title>Introduction to DocBook-4.5 SGML DTD</title>
 
     <para>
-      The <application>DocBook SGML DTD</application> package contains
+      The <application>DocBook-4.5 SGML DTD</application> package contains
       document type definitions for verification of SGML data files against the
       DocBook rule set. These are useful for structuring books and software
       documentation to a standard allowing you to utilize transformations
@@ -74,7 +74,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">DocBook SGML DTD Dependencies</bridgehead>
+    <bridgehead renderas="sect3">DocBook-4.5 SGML DTD Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -88,13 +88,13 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of DocBook SGML DTD</title>
+    <title>Installation of DocBook-4.5 SGML DTD</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/use-unzip.xml"/>
 
     <para>
-      Install <application>DocBook SGML DTD</application> by running
+      Install <application>DocBook-4.5 SGML DTD</application> by running
       the following commands:
     </para>
 
@@ -109,16 +109,16 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>install -v -d 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version; &amp;&amp;
+<screen role="root"><userinput>install -v -d 
/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
 chown -R root:root . &amp;&amp;
 
-install -v docbook.cat 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog &amp;&amp;
-cp -v -af *.dtd *.mod *.dcl 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version; &amp;&amp;
+install -v docbook.cat 
/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &amp;&amp;
+cp -v -af *.dtd *.mod *.dcl 
/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version; &amp;&amp;
 
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat \
-    /usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog &amp;&amp;
+install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat 
\
+    /usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog 
&amp;&amp;
 
-install-catalog --add /etc/sgml/sgml-docbook-dtd-&sgml-dtd-version;.cat \
+install-catalog --add /etc/sgml/sgml-docbook-dtd-&docbook-4.5-dtd-version;.cat 
\
     /etc/sgml/sgml-docbook.cat</userinput></screen>
 
   </sect2>
@@ -134,7 +134,7 @@
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring DocBook SGML DTD</title>
+    <title>Configuring DocBook-4.5 SGML DTD</title>
 
     <sect3 id="sgml-dtd-config">
       <title>Config Files</title>
@@ -162,7 +162,7 @@
         <systemitem class="username">root</systemitem> user):
       </para>
 
-<screen role="root"><userinput>cat &gt;&gt; 
/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;/catalog &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; 
/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;/catalog &lt;&lt; 
"EOF"
 <literal>  -- Begin Single Major Version catalog changes --
 
 PUBLIC "-//OASIS//DTD DocBook V4.4//EN" "docbook.dtd"
@@ -191,7 +191,7 @@
         <seg>None</seg>
         <seg>None</seg>
         <seg>SGML DTD and MOD files</seg>
-        <seg>/usr/share/sgml/docbook/sgml-dtd-&sgml-dtd-version;</seg>
+        <seg>/usr/share/sgml/docbook/sgml-dtd-&docbook-4.5-dtd-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/pst/sgml/openjade.xml
==============================================================================
--- trunk/BOOK/pst/sgml/openjade.xml    Thu Apr  9 10:45:41 2020        (r22980)
+++ trunk/BOOK/pst/sgml/openjade.xml    Thu Apr  9 13:11:25 2020        (r22981)
@@ -213,8 +213,8 @@
         As the <systemitem class="username">root</systemitem> user:
       </para>
 
-<screen role="root"><userinput>echo "SYSTEM 
\"http://www.oasis-open.org/docbook/xml/&DocBook-version;/docbookx.dtd\"; \
-    \"/usr/share/xml/docbook/xml-dtd-&DocBook-version;/docbookx.dtd\"" 
&gt;&gt; \
+<screen role="root"><userinput>echo "SYSTEM 
\"http://www.oasis-open.org/docbook/xml/&docbook-4.5-dtd-version;/docbookx.dtd\";
 \
+    \"/usr/share/xml/docbook/xml-dtd-&docbook-4.5-dtd-version;/docbookx.dtd\"" 
&gt;&gt; \
     /usr/share/sgml/openjade-&openjade-version;/catalog</userinput></screen>
 
       <para>

Modified: trunk/BOOK/pst/sgml/sgml.xml
==============================================================================
--- trunk/BOOK/pst/sgml/sgml.xml        Thu Apr  9 10:45:41 2020        (r22980)
+++ trunk/BOOK/pst/sgml/sgml.xml        Thu Apr  9 13:11:25 2020        (r22981)
@@ -22,8 +22,8 @@
   </para>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="sgml-common.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="sgml-dtd-3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sgml-dtd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="docbook-3.1-dtd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="docbook-4.5-dtd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="opensp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="openjade.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="docbook-dsssl.xml"/>

Copied and modified: trunk/BOOK/pst/xml/docbook-45-xml.xml (from r22980, 
trunk/BOOK/pst/xml/docbook.xml)
==============================================================================
--- trunk/BOOK/pst/xml/docbook.xml      Thu Apr  9 10:45:41 2020        
(r22980, copy source)
+++ trunk/BOOK/pst/xml/docbook-45-xml.xml       Thu Apr  9 13:11:25 2020        
(r22981)
@@ -4,7 +4,7 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY DocBook-download-http 
"http://www.docbook.org/xml/&DocBook-version;/docbook-xml-&DocBook-version;.zip";>
+  <!ENTITY DocBook-download-http 
"http://www.docbook.org/xml/&docBook-45-xml-version;/docbook-xml-&docBook-45-xml-version;.zip";>
   <!ENTITY DocBook-download-ftp  " ">
   <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
   <!ENTITY DocBook-size          "96 KB">
@@ -12,7 +12,7 @@
   <!ENTITY DocBook-time          "less than 0.1 SBU">
 ]>
 
-<sect1 id="DocBook" xreflabel="docbook-xml-&DocBook-version;">
+<sect1 id="DocBook" xreflabel="docbook-xml-&docBook-45-xml-version;">
   <?dbhtml filename="docbook.html"?>
 
   <sect1info>
@@ -20,17 +20,17 @@
     <date>$Date$</date>
   </sect1info>
 
-  <title>docbook-xml-&DocBook-version;</title>
+  <title>docbook-xml-&docBook-45-xml-version;</title>
 
   <indexterm zone="DocBook">
     <primary sortas="a-DocBook-XML-DTD">DocBook XML DTD</primary>
   </indexterm>
 
   <sect2 role="package">
-    <title>Introduction to DocBook XML DTD</title>
+    <title>Introduction to DocBook-4.5 XML DTD</title>
 
     <para>
-      The <application>DocBook XML DTD</application>-&DocBook-version;
+      The <application>DocBook-4.5 XML 
DTD</application>-&docBook-45-xml-version;
       package contains document type definitions for verification of XML data
       files against the DocBook rule set. These are useful for structuring
       books and software documentation to a standard allowing you to utilize
@@ -73,7 +73,7 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">DocBook XML DTD Dependencies</bridgehead>
+    <bridgehead renderas="sect3">DocBook-4.5 XML DTD Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
@@ -88,7 +88,7 @@
   </sect2>
 
   <sect2 role="installation">
-    <title>Installation of DocBook XML DTD</title>
+    <title>Installation of DocBook-4.5 XML DTD</title>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/use-unzip.xml"/>
@@ -99,11 +99,11 @@
       user:
     </para>
 
-<screen role="root"><userinput>install -v -d -m755 
/usr/share/xml/docbook/xml-dtd-&DocBook-version; &amp;&amp;
+<screen role="root"><userinput>install -v -d -m755 
/usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version; &amp;&amp;
 install -v -d -m755 /etc/xml &amp;&amp;
 chown -R root:root . &amp;&amp;
 cp -v -af docbook.cat *.dtd ent/ *.mod \
-    /usr/share/xml/docbook/xml-dtd-&DocBook-version;</userinput></screen>
+    
/usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</userinput></screen>
 
     <para>
       Create (or update) and populate the <filename>/etc/xml/docbook</filename>
@@ -115,48 +115,48 @@
     xmlcatalog --noout --create /etc/xml/docbook
 fi &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML V&DocBook-version;//EN" \
-    "http://www.oasis-open.org/docbook/xml/&DocBook-version;/docbookx.dtd"; \
+    "-//OASIS//DTD DocBook XML V&docBook-45-xml-version;//EN" \
+    
"http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;/docbookx.dtd"; \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//DTD DocBook XML CALS Table Model V&DocBook-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/calstblx.dtd" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V&docBook-45-xml-version;//EN" 
\
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/calstblx.dtd" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
     "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/soextblx.dtd" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/soextblx.dtd" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Information Pool V&DocBook-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbpoolx.mod" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool 
V&docBook-45-xml-version;//EN" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbpoolx.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V&DocBook-version;//EN" 
\
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbhierx.mod" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy 
V&docBook-45-xml-version;//EN" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbhierx.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ELEMENTS DocBook XML HTML Tables V&DocBook-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/htmltblx.mod" \
+    "-//OASIS//ELEMENTS DocBook XML HTML Tables V&docBook-45-xml-version;//EN" 
\
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/htmltblx.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Notations V&DocBook-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbnotnx.mod" \
+    "-//OASIS//ENTITIES DocBook XML Notations V&docBook-45-xml-version;//EN" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbnotnx.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Character Entities V&DocBook-version;//EN" 
\
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbcentx.mod" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities 
V&docBook-45-xml-version;//EN" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbcentx.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "public" \
-    "-//OASIS//ENTITIES DocBook XML Additional General Entities 
V&DocBook-version;//EN" \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;/dbgenent.mod" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities 
V&docBook-45-xml-version;//EN" \
+    
"file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;/dbgenent.mod" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "rewriteSystem" \
-    "http://www.oasis-open.org/docbook/xml/&DocBook-version;"; \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;"; \
+    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
     /etc/xml/docbook &amp;&amp;
 xmlcatalog --noout --add "rewriteURI" \
-    "http://www.oasis-open.org/docbook/xml/&DocBook-version;"; \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+    "http://www.oasis-open.org/docbook/xml/&docBook-45-xml-version;"; \
+    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
     /etc/xml/docbook</userinput></screen>
 
     <para>
@@ -189,7 +189,7 @@
   </sect2>
 
   <sect2 role="configuration">
-    <title>Configuring DocBook XML DTD</title>
+    <title>Configuring DocBook-4.5 XML DTD</title>
 
     <sect3 id="docbook-config">
       <title>Config Files</title>
@@ -215,7 +215,7 @@
       <para>
         The above installation creates the files and updates the catalogs.
         In order to utilize <application>DocBook XML DTD</application>
-        V&DocBook-version; when any version 4.x is requested in the System
+        V&docBook-45-xml-version; when any version 4.x is requested in the 
System
         Identifier, you need to add additional statements to the catalog
         files. If you have any of the <application>DocBook XML
         DTD</application>'s referenced below already installed on your
@@ -232,11 +232,11 @@
     /etc/xml/docbook
   xmlcatalog --noout --add "rewriteSystem" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
     /etc/xml/docbook
   xmlcatalog --noout --add "rewriteURI" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION"; \
-    "file:///usr/share/xml/docbook/xml-dtd-&DocBook-version;" \
+    "file:///usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;" \
     /etc/xml/docbook
   xmlcatalog --noout --add "delegateSystem" \
     "http://www.oasis-open.org/docbook/xml/$DTDVERSION/"; \
@@ -265,7 +265,7 @@
         <seg>None</seg>
         <seg>None</seg>
         <seg>DTD, MOD and ENT files</seg>
-        <seg>/etc/xml and 
/usr/share/xml/docbook/xml-dtd-&DocBook-version;</seg>
+        <seg>/etc/xml and 
/usr/share/xml/docbook/xml-dtd-&docBook-45-xml-version;</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/pst/xml/xml.xml
==============================================================================
--- trunk/BOOK/pst/xml/xml.xml  Thu Apr  9 10:45:41 2020        (r22980)
+++ trunk/BOOK/pst/xml/xml.xml  Thu Apr  9 13:11:25 2020        (r22981)
@@ -21,7 +21,7 @@
     format and publish DocBook documents.
   </para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="docbook.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="docbook-45-xml.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="docbook5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="docbook51.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; 
href="docbook-xsl.xml"/>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to