Removed 'XML' from public identifiers for files that will now be common to both XML...

diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index 9ab083183d6543826a4ff959870a1414571eadaa..46ceea959e2fca26cb0f93fb1cb6b78f2059bc11 100644 (file)
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML CALS Table Model V4.2b0 .................................... -->
+<!-- DocBook CALS Table Model V4.2b0 ........................................ -->
 <!-- File calstblx.mod .................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -12,7 +12,7 @@
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -20,7 +20,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
@@ -195,5 +195,5 @@ of the current application.
         %secur;
 >
 
-<!-- End of DocBook XML CALS Table Model V4.2b0 ............................. -->
+<!-- End of DocBook CALS Table Model V4.2b0 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index 22dbe2ab95a4fb6ed2fc82eee210537651836869..bb849728d2cfcd3ae4ca3f0b125c808c63d44816 100644 (file)
--- a/docbook/xml/catalog.xml
+++ b/docbook/xml/catalog.xml
@@ -10,7 +10,7 @@
      information, see http://www.oasis-open.org/.
 <!-->
 
-<!-- This is the catalog data file for DocBook XML V4.2b0. It is provided as
+<!-- This is the catalog data file for DocBook V4.2b0. It is provided as
      a convenience in building your own catalog files. You need not use
      the filenames listed here, and need not use the filename method of
      identifying storage objects at all.  See the documentation for
@@ -28,25 +28,25 @@
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook XML CALS Table Model V4.2b0//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2b0//EN"
         uri="calstblx.dtd"/>
 
 <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
         uri="soextblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool V4.2b0//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2b0//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b0//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2b0//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2b0//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2b0//EN"
         uri="dbcentx.mod"/>
 
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbcentx.mod b/docbook/xml/dbcentx.mod
index 625d59d01a411653e5101724f37355f4f3b7f97e..e60318be73fbc5bd4d3a992c8cdde04a8716c411 100644 (file)
--- a/docbook/xml/dbcentx.mod
+++ b/docbook/xml/dbcentx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML character entities module V4.2b0 ........................... -->
+<!-- DocBook character entities module V4.2b0 ............................... -->
 <!-- File dbcentx.mod ..................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -9,7 +9,7 @@
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -17,7 +17,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
@@ -36,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbcent PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+     "-//OASIS//ENTITIES DocBook Character Entities V4.2b0//EN"
      "dbcentx.mod">
      %dbcent;
 
@@ -323,5 +323,5 @@
 %ISOpub;
 %ISOtech;
 
-<!-- End of DocBook XML character entity sets module V4.2b0 ................. -->
+<!-- End of DocBook character entity sets module V4.2b0 ..................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbgenent.mod b/docbook/xml/dbgenent.mod
index 922e46cef6a81c4851dc1f55de11d949acf06d3e..32abd213bb9895e1cbbaf42b333048badfb9f99f 100644 (file)
--- a/docbook/xml/dbgenent.mod
+++ b/docbook/xml/dbgenent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML additional general entities V4.2b0 ......................... -->
+<!-- DocBook additional general entities V4.2b0 ............................. -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
@@ -10,7 +10,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbgenent PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.2b0//EN"
      "dbgenent.mod">
      %dbgenent;
 -->
@@ -36,5 +36,5 @@
        %all-titles;
 -->
 
-<!-- End of DocBook XML additional general entities V4.2b0 .................. -->
+<!-- End of DocBook additional general entities V4.2b0 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index ec08f2cbbbd7522adf6d40ac94a5e66a57b4aa20..2243f8e81feadcdb1dadd670f68de07bf68bd850 100644 (file)
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML document hierarchy module V4.2b0 ........................... -->
+<!-- DocBook document hierarchy module V4.2b0 ............................... -->
 <!-- File dbhierx.mod ..................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -9,7 +9,7 @@
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -17,7 +17,7 @@
      any purpose.  It is provided "as is" without expressed or implied
      warranty.
 
-     If you modify the DocBook XML DTD in any way, except for declaring and
+     If you modify the DocBook DTD in any way, except for declaring and
      referencing additional sets of general entities and declaring
      additional notations, label your DTD as a variant of DocBook.  See
      the maintenance documentation for more information.
@@ -43,7 +43,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbhier PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b0//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -2107,5 +2107,5 @@ change will not be made after all. -->
 <!--end of article.attlist-->]]>
 <!--end of article.module-->]]>
 
-<!-- End of DocBook XML document hierarchy module V4.2b0 .................... -->
+<!-- End of DocBook document hierarchy module V4.2b0 ........................ -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 11e14af4b2cdaa629653d0ceea8caad15c31437e..dca957102a44d00d4928c47aa6d3a4429ebf0d28 100644 (file)
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML notations module V4.2b0 .................................... -->
+<!-- DocBook notations module V4.2b0 ........................................ -->
 <!-- File dbnotnx.mod ..................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -9,7 +9,7 @@
 
      $Id$
 
-     Permission to use, copy, modify and distribute the DocBook XML DTD
+     Permission to use, copy, modify and distribute the DocBook DTD
      and its accompanying documentation for any purpose and without fee
      is hereby granted in perpetuity, provided that the above copyright
      notice and this paragraph appear in all copies.  The copyright
@@ -36,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.2b0//EN"
      "dbnotnx.mod">
      %dbnotn;
 
@@ -94,5 +94,5 @@
 <!NOTATION SVG         SYSTEM "http://www.w3.org/TR/SVG/">
 <!NOTATION linespecific        SYSTEM "linespecific">
 
-<!-- End of DocBook XML notations module V4.2b0 ............................. -->
+<!-- End of DocBook notations module V4.2b0 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index 96e9829d86a38db0df007da1abbec09327550e28..32e5dcd3b394b717fcd075955a451f22ec585d21 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -3390,7 +3390,7 @@ in the text (no (0) value, the default)
 
 <!-- Reference CALS Table Model -->
 <!ENTITY % tablemodel
-  PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.2b0//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2b0//EN"
   "calstblx.dtd">
 ]]>
 

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 683d8cc19e6048cd94b888aa055754ee7471ed64..e19698a25e7f8a42d85085dfa0868e076bc0d7ff 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -25,25 +25,25 @@ PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook XML CALS Table Model V4.2b0//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2b0//EN"
        "calstblx.dtd"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2b0//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2b0//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b0//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2b0//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2b0//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2b0//EN"
        "dbcentx.mod"
 
   -- ...................................................................... --

diff --git a/docbook/xml/docbookx.dtd b/docbook/xml/docbookx.dtd
index 9faec441acdfc61a0772e1f28ecee4cdd74f53f4..7252307a0395b48e5e92f9139a5479b488b9da17 100644 (file)
--- a/docbook/xml/docbookx.dtd
+++ b/docbook/xml/docbookx.dtd
@@ -39,14 +39,14 @@
      declaration:
 
      <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
-                    "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd"
+                    "http://www.oasis-open.org/docbook/xml/4.2b0/docbookx.dtd"
                     [...]>
 
      Or, if you have a higher-level driver file that customizes DocBook,
      use the FPI in the parameter entity declaration:
 
      <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
-                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
+                "http://www.oasis-open.org/docbook/xml/4.2b0/docbookx.dtd">
      %DocBookDTD;
 
      See the documentation for detailed information on the parameter
@@ -86,7 +86,7 @@ ERROR: Exactly one of xml.features and sgml.features must be turned on!
 <!ENTITY % dbnotn.module "INCLUDE">
 <![%dbnotn.module;[
 <!ENTITY % dbnotn PUBLIC
-"-//OASIS//ENTITIES DocBook XML Notations V4.2b0//EN"
+"-//OASIS//ENTITIES DocBook Notations V4.2b0//EN"
 "dbnotnx.mod">
 %dbnotn;
 ]]>
@@ -105,7 +105,7 @@ ERROR: Exactly one of xml.features and sgml.features must be turned on!
 ]]>
 
 <!ENTITY % dbcent PUBLIC
-"-//OASIS//ENTITIES DocBook XML Character Entities V4.2b0//EN"
+"-//OASIS//ENTITIES DocBook Character Entities V4.2b0//EN"
 "dbcentx.mod">
 %dbcent;
 ]]>
@@ -118,7 +118,7 @@ ERROR: Exactly one of xml.features and sgml.features must be turned on!
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module; [
 <!ENTITY % dbpool PUBLIC
-"-//OASIS//ELEMENTS DocBook XML Information Pool V4.2b0//EN"
+"-//OASIS//ELEMENTS DocBook Information Pool V4.2b0//EN"
 "dbpoolx.mod">
 %dbpool;
 ]]>
@@ -137,7 +137,7 @@ ERROR: Exactly one of xml.features and sgml.features must be turned on!
 <!ENTITY % dbhier.module "INCLUDE">
 <![ %dbhier.module; [
 <!ENTITY % dbhier PUBLIC
-"-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.2b0//EN"
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b0//EN"
 "dbhierx.mod">
 %dbhier;
 ]]>
@@ -148,7 +148,7 @@ ERROR: Exactly one of xml.features and sgml.features must be turned on!
 <!ENTITY % dbgenent.module "INCLUDE">
 <![ %dbgenent.module; [
 <!ENTITY % dbgenent PUBLIC
-"-//OASIS//ENTITIES DocBook XML Additional General Entities V4.2b0//EN"
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.2b0//EN"
 "dbgenent.mod">
 %dbgenent;
 ]]>