DocBook XML V4.2 released

diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index 10928dbfc77ece3112938c63d8e7a963121c6a78..a7606e842b1cc86b092fcf002a1bce4119715e0a 100644 (file)
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.2CR3 ........................................ -->
+<!-- DocBook CALS Table Model V4.2 ........................................ -->
 <!-- File calstblx.mod .................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -196,5 +196,5 @@ of the current application.
         %secur;
 >
 
-<!-- End of DocBook CALS Table Model V4.2CR3 ................................. -->
+<!-- End of DocBook CALS Table Model V4.2 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index f3dd9f48b67d70c42820d63141b7ba6566403f64..6920c2f7e0d764a4b7d724d1559707bb96e79411 100644 (file)
--- a/docbook/xml/catalog.xml
+++ b/docbook/xml/catalog.xml
@@ -2,51 +2,51 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook XML V4.2CR3 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.2 ................................ -->
 <!-- File catalog.xml ..................................................... -->
 
 <!-- Please direct all questions, bug reports, or suggestions for
      changes to the docbook@lists.oasis-open.org mailing list. For more
      information, see http://www.oasis-open.org/.
-<!-->
+  -->
 
-<!-- This is the catalog data file for DocBook V4.2CR3. It is provided as
+<!-- This is the catalog data file for DocBook V4.2. 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
      detailed information on the files associated with the DocBook DTD.
      See XML Catalogs at http://www.oasis-open.org/committees/entity/ for
      detailed information on supplying and using catalog data.
-<!-->
+  -->
 
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook XML V4.2CR3//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.2//EN"
         uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2CR3//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2//EN"
         uri="calstblx.dtd"/>
 
 <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
         uri="soextblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
         uri="dbcentx.mod"/>
 
 <!-- ...................................................................... -->
@@ -109,7 +109,7 @@
 <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
         uri="ent/iso-cyr2.ent"/>
 
-<!-- End of catalog data for DocBook XML V4.2CR3 ............................. -->
+<!-- End of catalog data for DocBook XML V4.2 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/xml/dbcentx.mod b/docbook/xml/dbcentx.mod
index 97936f3019b48374a22467cca325f103b40f8cdd..e8ce8f429890856a1848fca3402716094bb6efd4 100644 (file)
--- a/docbook/xml/dbcentx.mod
+++ b/docbook/xml/dbcentx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook character entities module V4.2CR3 ............................... -->
+<!-- DocBook character entities module V4.2 ............................... -->
 <!-- File dbcentx.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -37,7 +37,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbcent PUBLIC
-     "-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
+     "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
      "dbcentx.mod">
      %dbcent;
 
@@ -380,5 +380,5 @@
 %ISOtech;
 ]]>
 
-<!-- End of DocBook character entity sets module V4.2CR3 ..................... -->
+<!-- End of DocBook character entity sets module V4.2 ..................... -->
 <!-- ...................................................................... -->

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

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index 4a0a25174421025ea6ffbb9f2e7c5e980d540342..54446389b6a2960aa4f514fa9cd41b5dfe566926 100644 (file)
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.2CR3 ............................... -->
+<!-- DocBook document hierarchy module V4.2 ............................... -->
 <!-- File dbhierx.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -44,7 +44,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbhier PUBLIC
-     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -723,7 +723,7 @@
 <!ENTITY % part.module "INCLUDE">
 <![%part.module;[
 
-<!-- Note that Part was to have its content model reduced in V4.2CR3.  This
+<!-- Note that Part was to have its content model reduced in V4.2.  This
 change will not be made after all. -->
 
 <!ENTITY % local.part.attrib "">
@@ -2111,5 +2111,5 @@ change will not be made after all. -->
 <!--end of article.attlist-->]]>
 <!--end of article.module-->]]>
 
-<!-- End of DocBook document hierarchy module V4.2CR3 ........................ -->
+<!-- End of DocBook document hierarchy module V4.2 ........................ -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 0d39718fd2120bbd5c759275792d2d8b944f3564..891e150e54e2969c557e6ac38f1eab263ee64fe1 100644 (file)
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.2CR3 ........................................ -->
+<!-- DocBook notations module V4.2 ........................................ -->
 <!-- File dbnotnx.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -37,7 +37,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.2//EN"
      "dbnotnx.mod">
      %dbnotn;
 
@@ -96,5 +96,5 @@
 <!NOTATION SVG         SYSTEM "http://www.w3.org/TR/SVG/">
 <!NOTATION linespecific        SYSTEM "linespecific">
 
-<!-- End of DocBook notations module V4.2CR3 ................................. -->
+<!-- End of DocBook notations module V4.2 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index 8f9ad0d14928016e7e15a6e492637ba7abb21e72..84b842c79aabbccd1677dae89dd3779f7b368137 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.2CR3 ............................. -->
+<!-- DocBook XML information pool module V4.2 ............................. -->
 <!-- File dbpoolx.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -50,7 +50,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbpool PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2CR3//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -3487,7 +3487,7 @@ in the text (no (0) value, the default)
 
 <!-- Reference CALS Table Model -->
 <!ENTITY % tablemodel
-  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR3//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2//EN"
   "calstblx.dtd">
 ]]>
 
@@ -7920,5 +7920,5 @@ OtherCredit. -->
 <!--end of seeseealso.module-->]]>
 <!--end of indexterm.content.module-->]]>
 
-<!-- End of DocBook XML information pool module V4.2CR3 ...................... -->
+<!-- End of DocBook XML information pool module V4.2 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 96aa71118513e15cd339eb1b644b8d70064f2511..5fa6524c54337e7ba76027a027f1558125dbcba3 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.2CR3 .................................... --
+  -- Catalog data for DocBook XML V4.2 .................................... --
   -- File docbook.cat ..................................................... --
 
   -- Please direct all questions, bug reports, or suggestions for
@@ -7,7 +7,7 @@
      information, see http://www.oasis-open.org/.
   --
 
-  -- This is the catalog data file for DocBook XML V4.2CR3. It is provided as
+  -- This is the catalog data file for DocBook XML V4.2. 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
@@ -19,31 +19,31 @@
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR3//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2//EN"
        "calstblx.dtd"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
        "dbcentx.mod"
 
   -- ...................................................................... --
@@ -106,5 +106,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
        "ent/iso-cyr2.ent"
 
-  -- End of catalog data for DocBook XML V4.2CR3 ............................. --
+  -- End of catalog data for DocBook XML V4.2 ............................. --
   -- ...................................................................... --

diff --git a/docbook/xml/docbookx.dtd b/docbook/xml/docbookx.dtd
index d8637acc5f9fbca52ef7a44096c069e49de70228..8896f6f291644a4faeef4f442b612da174c1f52b 100644 (file)
--- a/docbook/xml/docbookx.dtd
+++ b/docbook/xml/docbookx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML DTD V4.2CR3 ................................................. -->
+<!-- DocBook XML DTD V4.2 ................................................. -->
 <!-- File docbookx.dtd .................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -30,24 +30,24 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.2CR3 of the DocBook DTD.
+<!-- This is the driver file for V4.2 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook XML V4.2CR3//EN"
+     "-//OASIS//DTD DocBook XML V4.2//EN"
 
      For example, if your document's top-level element is Book, and
      you are using DocBook directly, use the FPI in the DOCTYPE
      declaration:
 
-     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
-                    "http://www.oasis-open.org/docbook/xml/4.2CR3/docbookx.dtd"
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.2/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.2CR3//EN"
-                "http://www.oasis-open.org/docbook/xml/4.2CR3/docbookx.dtd">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+                "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
      %DocBookDTD;
 
      See the documentation for detailed information on the parameter
@@ -94,7 +94,7 @@
 <!ENTITY % dbnotn.module "INCLUDE">
 <![%dbnotn.module;[
 <!ENTITY % dbnotn PUBLIC
-"-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
+"-//OASIS//ENTITIES DocBook Notations V4.2//EN"
 "dbnotnx.mod">
 %dbnotn;
 ]]>
@@ -113,7 +113,7 @@
 ]]>
 
 <!ENTITY % dbcent PUBLIC
-"-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
+"-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
 "dbcentx.mod">
 %dbcent;
 ]]>
@@ -126,7 +126,7 @@
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module; [
 <!ENTITY % dbpool PUBLIC
-"-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
+"-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN"
 "dbpoolx.mod">
 %dbpool;
 ]]>
@@ -145,7 +145,7 @@
 <!ENTITY % dbhier.module "INCLUDE">
 <![ %dbhier.module; [
 <!ENTITY % dbhier PUBLIC
-"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN"
 "dbhierx.mod">
 %dbhier;
 ]]>
@@ -156,10 +156,10 @@
 <!ENTITY % dbgenent.module "INCLUDE">
 <![ %dbgenent.module; [
 <!ENTITY % dbgenent PUBLIC
-"-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN"
 "dbgenent.mod">
 %dbgenent;
 ]]>
 
-<!-- End of DocBook XML DTD V4.2CR3 .......................................... -->
+<!-- End of DocBook XML DTD V4.2 .......................................... -->
 <!-- ...................................................................... -->