Updated comments to reflect CR3

diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index 4a42b89e853266e78a8e1445f5bc38d567ab6072..10928dbfc77ece3112938c63d8e7a963121c6a78 100644 (file)
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.2CR1 ........................................ -->
+<!-- DocBook CALS Table Model V4.2CR3 ........................................ -->
 <!-- File calstblx.mod .................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      This DTD is based on the CALS Table Model
      PUBLIC "-//USA-DOD//DTD Table Model 951010//EN"
@@ -195,5 +196,5 @@ of the current application.
         %secur;
 >
 
-<!-- End of DocBook CALS Table Model V4.2CR1 ................................. -->
+<!-- End of DocBook CALS Table Model V4.2CR3 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index 9ee6eb00860cdd5e24d881b7e2f40500fbb0e4cf..f3dd9f48b67d70c42820d63141b7ba6566403f64 100644 (file)
--- a/docbook/xml/catalog.xml
+++ b/docbook/xml/catalog.xml
@@ -2,7 +2,7 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook XML V4.2CR1 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.2CR3 ................................ -->
 <!-- File catalog.xml ..................................................... -->
 
 <!-- Please direct all questions, bug reports, or suggestions for
@@ -10,7 +10,7 @@
      information, see http://www.oasis-open.org/.
 <!-->
 
-<!-- This is the catalog data file for DocBook V4.2CR1. It is provided as
+<!-- This is the catalog data file for DocBook V4.2CR3. 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
@@ -22,31 +22,31 @@
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook XML V4.2CR1//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.2CR3//EN"
         uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2CR1//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2CR3//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.2CR1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//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.2CR1 ............................. -->
+<!-- End of catalog data for DocBook XML V4.2CR3 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/xml/dbcentx.mod b/docbook/xml/dbcentx.mod
index 73c7bcdb57618d9833d3314654a3b586fdb0e803..97936f3019b48374a22467cca325f103b40f8cdd 100644 (file)
--- a/docbook/xml/dbcentx.mod
+++ b/docbook/xml/dbcentx.mod
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook character entities module V4.2CR1 ............................... -->
+<!-- DocBook character entities module V4.2CR3 ............................... -->
 <!-- File dbcentx.mod ..................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -36,7 +37,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbcent PUBLIC
-     "-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
+     "-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
      "dbcentx.mod">
      %dbcent;
 
@@ -379,5 +380,5 @@
 %ISOtech;
 ]]>
 
-<!-- End of DocBook character entity sets module V4.2CR1 ..................... -->
+<!-- End of DocBook character entity sets module V4.2CR3 ..................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbgenent.mod b/docbook/xml/dbgenent.mod
index 2cb111a2e27a469499a68168b3f9b5dce16a1095..fc1587b447ae4830625b082b4344e32073e81d20 100644 (file)
--- a/docbook/xml/dbgenent.mod
+++ b/docbook/xml/dbgenent.mod
@@ -1,16 +1,17 @@
 <!-- ...................................................................... -->
-<!-- DocBook additional general entities V4.2CR1 ............................. -->
+<!-- DocBook additional general entities V4.2CR3 ............................. -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, and the Organization for the Advancement of
-     Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      In DTD driver files referring to this module, please use an entity
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbgenent PUBLIC
-     "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
      "dbgenent.mod">
      %dbgenent;
 -->
@@ -36,5 +37,5 @@
        %all-titles;
 -->
 
-<!-- End of DocBook additional general entities V4.2CR1 ...................... -->
+<!-- End of DocBook additional general entities V4.2CR3 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index 8632f7fdb7946a8e932515ff9c8bb53d0cb5f64c..4a0a25174421025ea6ffbb9f2e7c5e980d540342 100644 (file)
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.2CR1 ............................... -->
+<!-- DocBook document hierarchy module V4.2CR3 ............................... -->
 <!-- File dbhierx.mod ..................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -43,7 +44,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbhier PUBLIC
-     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -722,7 +723,7 @@
 <!ENTITY % part.module "INCLUDE">
 <![%part.module;[
 
-<!-- Note that Part was to have its content model reduced in V4.2CR1.  This
+<!-- Note that Part was to have its content model reduced in V4.2CR3.  This
 change will not be made after all. -->
 
 <!ENTITY % local.part.attrib "">
@@ -2110,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.2CR1 ........................ -->
+<!-- End of DocBook document hierarchy module V4.2CR3 ........................ -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 75e57e6e8b179e705c547c63b7600f33118d3d58..0d39718fd2120bbd5c759275792d2d8b944f3564 100644 (file)
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.2CR1 ........................................ -->
+<!-- DocBook notations module V4.2CR3 ........................................ -->
 <!-- File dbnotnx.mod ..................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -36,7 +37,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
      "dbnotnx.mod">
      %dbnotn;
 
@@ -95,5 +96,5 @@
 <!NOTATION SVG         SYSTEM "http://www.w3.org/TR/SVG/">
 <!NOTATION linespecific        SYSTEM "linespecific">
 
-<!-- End of DocBook notations module V4.2CR1 ................................. -->
+<!-- End of DocBook notations module V4.2CR3 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index bf4c176d042ab68aa3e9c8a48b9a9f8d65091cde..8f9ad0d14928016e7e15a6e492637ba7abb21e72 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.2CR1 ............................. -->
+<!-- DocBook XML information pool module V4.2CR3 ............................. -->
 <!-- File dbpoolx.mod ..................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -49,7 +50,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbpool PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2CR1//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.2CR3//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -3486,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.2CR1//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR3//EN"
   "calstblx.dtd">
 ]]>
 
@@ -7919,5 +7920,5 @@ OtherCredit. -->
 <!--end of seeseealso.module-->]]>
 <!--end of indexterm.content.module-->]]>
 
-<!-- End of DocBook XML information pool module V4.2CR1 ...................... -->
+<!-- End of DocBook XML information pool module V4.2CR3 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 20d496ecb8f21c092b4796fc53fea3d5404fdad3..96aa71118513e15cd339eb1b644b8d70064f2511 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.2CR1 .................................... --
+  -- Catalog data for DocBook XML V4.2CR3 .................................... --
   -- 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.2CR1. It is provided as
+  -- This is the catalog data file for DocBook XML V4.2CR3. 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.2CR1//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR1//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR3//EN"
        "calstblx.dtd"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2CR1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//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.2CR1 ............................. --
+  -- End of catalog data for DocBook XML V4.2CR3 ............................. --
   -- ...................................................................... --

diff --git a/docbook/xml/docbookx.dtd b/docbook/xml/docbookx.dtd
index cced9524175a994bcf8aaf7d6aeb045babcf949d..d8637acc5f9fbca52ef7a44096c069e49de70228 100644 (file)
--- a/docbook/xml/docbookx.dtd
+++ b/docbook/xml/docbookx.dtd
@@ -1,11 +1,12 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML DTD V4.2CR1 ................................................. -->
+<!-- DocBook XML DTD V4.2CR3 ................................................. -->
 <!-- File docbookx.dtd .................................................... -->
 
-<!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
+<!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
      O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software
-     Corporation, Norman Walsh, and the Organization for the Advancement
-     of Structured Information Standards (OASIS).
+     Corporation, Norman Walsh, Sun Microsystems, Inc., and the
+     Organization for the Advancement of Structured Information
+     Standards (OASIS).
 
      $Id$
 
@@ -29,24 +30,24 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.2CR1 of the DocBook DTD.
+<!-- This is the driver file for V4.2CR3 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook XML V4.2CR1//EN"
+     "-//OASIS//DTD DocBook XML V4.2CR3//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.2CR1//EN"
-                    "http://www.oasis-open.org/docbook/xml/4.2CR1/docbookx.dtd"
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.2CR3/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.2CR1//EN"
-                "http://www.oasis-open.org/docbook/xml/4.2CR1/docbookx.dtd">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.2CR3//EN"
+                "http://www.oasis-open.org/docbook/xml/4.2CR3/docbookx.dtd">
      %DocBookDTD;
 
      See the documentation for detailed information on the parameter
@@ -93,7 +94,7 @@
 <!ENTITY % dbnotn.module "INCLUDE">
 <![%dbnotn.module;[
 <!ENTITY % dbnotn PUBLIC
-"-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
+"-//OASIS//ENTITIES DocBook Notations V4.2CR3//EN"
 "dbnotnx.mod">
 %dbnotn;
 ]]>
@@ -112,7 +113,7 @@
 ]]>
 
 <!ENTITY % dbcent PUBLIC
-"-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
+"-//OASIS//ENTITIES DocBook Character Entities V4.2CR3//EN"
 "dbcentx.mod">
 %dbcent;
 ]]>
@@ -125,7 +126,7 @@
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module; [
 <!ENTITY % dbpool PUBLIC
-"-//OASIS//ELEMENTS DocBook Information Pool V4.2CR1//EN"
+"-//OASIS//ELEMENTS DocBook Information Pool V4.2CR3//EN"
 "dbpoolx.mod">
 %dbpool;
 ]]>
@@ -144,7 +145,7 @@
 <!ENTITY % dbhier.module "INCLUDE">
 <![ %dbhier.module; [
 <!ENTITY % dbhier PUBLIC
-"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR3//EN"
 "dbhierx.mod">
 %dbhier;
 ]]>
@@ -155,10 +156,10 @@
 <!ENTITY % dbgenent.module "INCLUDE">
 <![ %dbgenent.module; [
 <!ENTITY % dbgenent PUBLIC
-"-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR3//EN"
 "dbgenent.mod">
 %dbgenent;
 ]]>
 
-<!-- End of DocBook XML DTD V4.2CR1 .......................................... -->
+<!-- End of DocBook XML DTD V4.2CR3 .......................................... -->
 <!-- ...................................................................... -->