DocBook V4.2 released

diff --git a/docbook/sgml/catalog.xml b/docbook/sgml/catalog.xml
index 7d81a9054d69195fce11c2ace5b06722a662563a..e75672f239648a98b51b8a02ebd05b0e41632f08 100644 (file)
--- a/docbook/sgml/catalog.xml
+++ b/docbook/sgml/catalog.xml
@@ -2,54 +2,54 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook V4.2CR3 .................................... -->
+<!-- XML Catalog data for DocBook 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 V4.2CR3//EN"
+<public publicId="-//OASIS//DTD DocBook V4.2//EN"
         uri="docbook.dtd"/>
 
-<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"/>
 
 <!-- ...................................................................... -->
@@ -112,7 +112,7 @@
 <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
         uri="iso-cyr2.gml"/>
 
-<!-- End of catalog data for DocBook XML V4.2CR3 ............................. -->
+<!-- End of catalog data for DocBook XML V4.2 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/sgml/docbook.cat b/docbook/sgml/docbook.cat
index baf2efc949e4de74b396c290b5912d4933b13b45..525612b34d4e0d86c727c1704a217a2be9a520c1 100644 (file)
--- a/docbook/sgml/docbook.cat
+++ b/docbook/sgml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook V4.2CR3 ........................................ --
+  -- Catalog data for DocBook 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 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
@@ -19,34 +19,34 @@
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook V4.2CR3//EN"
+PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
        "docbook.dtd"
 
-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"
 
   -- ...................................................................... --
@@ -109,5 +109,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
        "iso-cyr2.gml"
 
-  -- End of catalog data for DocBook V4.2CR3 ................................. --
+  -- End of catalog data for DocBook V4.2 ................................. --
   -- ...................................................................... --

diff --git a/docbook/sgml/docbook.dcl b/docbook/sgml/docbook.dcl
index c28053b9d87436997e811595337b5fe01a4805f3..d523ef55b8f50fe6fb4ff2c4cee07cd4a57b5b6d 100644 (file)
--- a/docbook/sgml/docbook.dcl
+++ b/docbook/sgml/docbook.dcl
@@ -1,6 +1,6 @@
 <!SGML  "ISO 8879:1986"
   -- ...................................................................... --
-  -- DocBook SGML declaration V4.2CR3 ........................................ --
+  -- DocBook SGML declaration V4.2 ........................................ --
   -- file docbook.dcl ..................................................... --
 
 CHARSET
@@ -101,6 +101,6 @@ FEATURES
 
 APPINFO NONE
 
-  -- End of DocBook SGML declaration V4.2CR3 ................................ --
+  -- End of DocBook SGML declaration V4.2 ................................. --
   -- ...................................................................... --
 >

diff --git a/docbook/sgml/docbook.dtd b/docbook/sgml/docbook.dtd
index 0110bdea40798ed324fbd57db0e746cca6b6e223..5120679365326d38b520e430a48d466597a86f63 100644 (file)
--- a/docbook/sgml/docbook.dtd
+++ b/docbook/sgml/docbook.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook DTD V4.2CR3 ..................................................... -->
+<!-- DocBook DTD V4.2 ..................................................... -->
 <!-- File docbook.dtd ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -30,21 +30,21 @@
 
 <!-- ...................................................................... -->
 
-<!-- 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 V4.2CR3//EN"
+     "-//OASIS//DTD DocBook 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 V4.2CR3//EN" [...]>
+     <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [...]>
 
      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 V4.2CR3//EN">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
      %DocBookDTD;
 
      The DocBook DTD is accompanied by an SGML declaration.
@@ -57,9 +57,9 @@
 
 <!ENTITY % sgml.features "INCLUDE">
 
-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
                    "docbookx.dtd">
 %docbook;
 
-<!-- End of DocBook DTD V4.2CR3 .............................................. -->
+<!-- End of DocBook DTD V4.2 .............................................. -->
 <!-- ...................................................................... -->