Change version numbers to 4.5CR2

diff --git a/docbook/sgml/catalog.xml b/docbook/sgml/catalog.xml
index 0021d7c2d647a4f459fccdf02ec940898e25d391..dddd6cf3181f387bfbba5337651172c149101c9f 100644 (file)
--- a/docbook/sgml/catalog.xml
+++ b/docbook/sgml/catalog.xml
@@ -2,7 +2,7 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook V4.5CR1 .................................... -->
+<!-- XML Catalog data for DocBook V4.5CR2 .................................... -->
 <!-- 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.5CR1. It is provided as
+<!-- This is the catalog data file for DocBook V4.5CR2. 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,10 +22,10 @@
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook V4.5CR1//EN"
+<public publicId="-//OASIS//DTD DocBook V4.5CR2//EN"
         uri="docbook.dtd"/>
 
-<public publicId="-//OASIS//DTD DocBook XML V4.5CR1//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.5CR2//EN"
         uri="docbookx.dtd"/>
 
 <system systemId="http://www.oasis-open.org/docbook/sgml/4.5b1/docbook.dtd"
@@ -43,28 +43,28 @@
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5CR1//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5CR2//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
        uri="htmltblx.mod"/>
 
 <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
         uri="soextblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5CR1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5CR2//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5CR1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
         uri="dbcentx.mod"/>
 
 <!-- ...................................................................... -->
@@ -127,7 +127,7 @@
 <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
         uri="iso-cyr2.gml"/>
 
-<!-- End of catalog data for DocBook XML V4.5CR1 ............................. -->
+<!-- End of catalog data for DocBook XML V4.5CR2 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/sgml/docbook.cat b/docbook/sgml/docbook.cat
index bc398bf5655faff4681416b83dc2fb111127f0ac..c3ccab278d70d114c69bf3361204f81a43baf0dd 100644 (file)
--- a/docbook/sgml/docbook.cat
+++ b/docbook/sgml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook V4.5CR1 ........................................ --
+  -- Catalog data for DocBook V4.5CR2 ........................................ --
   -- 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.5CR1. It is provided as
+  -- This is the catalog data file for DocBook V4.5CR2. 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,37 +19,37 @@
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook V4.5CR1//EN"
+PUBLIC "-//OASIS//DTD DocBook V4.5CR2//EN"
        "docbook.dtd"
 
-PUBLIC "-//OASIS//DTD DocBook XML V4.5CR1//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5CR1//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5CR2//EN"
        "calstblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
        "htmltblx.mod"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5CR1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5CR2//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5CR1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
        "dbcentx.mod"
 
   -- ...................................................................... --
@@ -112,5 +112,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.5CR1 ................................. --
+  -- End of catalog data for DocBook V4.5CR2 ................................. --
   -- ...................................................................... --

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

diff --git a/docbook/sgml/docbook.dtd b/docbook/sgml/docbook.dtd
index 8e961cb6c9ace8f6dd4b6e0e2f9390c2ed2ef1bc..e846f06e6d6f5f6de0920e5a89e2b10bedeac8a5 100644 (file)
--- a/docbook/sgml/docbook.dtd
+++ b/docbook/sgml/docbook.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook DTD V4.5CR1 ..................................................... -->
+<!-- DocBook DTD V4.5CR2 ..................................................... -->
 <!-- File docbook.dtd ..................................................... -->
 
 <!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
@@ -30,21 +30,21 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.5CR1 of the DocBook DTD.
+<!-- This is the driver file for V4.5CR2 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook V4.5CR1//EN"
+     "-//OASIS//DTD DocBook V4.5CR2//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.5CR1//EN" [...]>
+     <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.5CR2//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.5CR1//EN">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook V4.5CR2//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.5CR1//EN"
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
                    "docbookx.dtd">
 %docbook;
 
-<!-- End of DocBook DTD V4.5CR1 .............................................. -->
+<!-- End of DocBook DTD V4.5CR2 .............................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index 1e1d91b3758bbb267eb5c39b1a8685733dd3ce95..a429d0ba35a8a6b74660dbf9c438b72b06af1351 100644 (file)
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.5 ........................................ -->
+<!-- DocBook CALS Table Model V4.5CR2 ........................................ -->
 <!-- File calstblx.mod .................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -35,7 +35,7 @@
 
 <!-- This module contains the definitions for the CALS Table Model
      converted to XML. It has been modified slightly for use in the
-     combined HTML/CALS models supported by DocBook V4.5.
+     combined HTML/CALS models supported by DocBook V4.5CR2.
 -->
 
 <!-- These definitions are not directly related to the table model, but are
@@ -211,5 +211,5 @@ of the current application.
         %secur;
 >
 
-<!-- End of DocBook CALS Table Model V4.5 ................................. -->
+<!-- End of DocBook CALS Table Model V4.5CR2 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index 2fc92b04e31769ddacc2e274862b3e22724f0e3f..f28f04f30b9f6f76d19c157ccf794d47cc1396a7 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" prefer="public">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook XML V4.5 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.5CR2 ................................ -->
 <!-- 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.5. It is provided as
+<!-- This is the catalog data file for DocBook V4.5CR2. 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,40 +22,40 @@
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook XML V4.5//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.5CR2//EN"
         uri="docbookx.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/xml/4.5CR1/docbookx.dtd"
+<system systemId="http://www.oasis-open.org/docbook/xml/4.5CR2/docbookx.dtd"
        uri="docbookx.dtd"/>
 
-<system systemId="http://docbook.org/xml/4.5CR1/docbookx.dtd"
+<system systemId="http://docbook.org/xml/4.5CR2/docbookx.dtd"
        uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5CR2//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
        uri="htmltblx.mod"/>
 
 <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
         uri="soextblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5CR2//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
         uri="dbcentx.mod"/>
 
 <!-- ...................................................................... -->
@@ -118,7 +118,7 @@
 <public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
         uri="ent/isocyr2.ent"/>
 
-<!-- End of catalog data for DocBook XML V4.5 ............................. -->
+<!-- End of catalog data for DocBook XML V4.5CR2 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/xml/dbcentx.mod b/docbook/xml/dbcentx.mod
index ced94c19443ca40634367640e58eb4088e908721..912d1b755ca9d69b6272d64680388d0125e66e1c 100644 (file)
--- a/docbook/xml/dbcentx.mod
+++ b/docbook/xml/dbcentx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook character entities module V4.5 ............................... -->
+<!-- DocBook character entities module V4.5CR2 ............................... -->
 <!-- File dbcentx.mod ..................................................... -->
 
 <!-- Copyright 1992-2004 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.5//EN"
+     "-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
      "dbcentx.mod">
      %dbcent;
 
@@ -380,5 +380,5 @@
 %ISOtech;
 ]]>
 
-<!-- End of DocBook character entity sets module V4.5 ..................... -->
+<!-- End of DocBook character entity sets module V4.5CR2 ..................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbgenent.mod b/docbook/xml/dbgenent.mod
index ff5ba90d1d52a3b79491527bfdc194eebc87b98e..3a1509b4fe69361875c9b67ade696b800d7a22a3 100644 (file)
--- a/docbook/xml/dbgenent.mod
+++ b/docbook/xml/dbgenent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook additional general entities V4.5 ............................. -->
+<!-- DocBook additional general entities V4.5CR2 ............................. -->
 
 <!-- Copyright 1992-2004 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.5//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
      "dbgenent.mod">
      %dbgenent;
 -->
@@ -37,5 +37,5 @@
        %all-titles;
 -->
 
-<!-- End of DocBook additional general entities V4.5 ...................... -->
+<!-- End of DocBook additional general entities V4.5CR2 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index a2f46bebbfaa743f73b08c09db29887f3bf2182d..f02029005cc2f5475232a828efa37952d8298265 100644 (file)
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.5 ............................... -->
+<!-- DocBook document hierarchy module V4.5CR2 ............................... -->
 <!-- File dbhierx.mod ..................................................... -->
 
 <!-- Copyright 1992-2004 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.5//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -741,7 +741,7 @@
 <!ENTITY % part.module "INCLUDE">
 <![%part.module;[
 
-<!-- Note that Part was to have its content model reduced in V4.5.  This
+<!-- Note that Part was to have its content model reduced in V4.5CR2.  This
 change will not be made after all. -->
 
 <!ENTITY % local.part.attrib "">
@@ -2189,5 +2189,5 @@ change will not be made after all. -->
 <!--end of article.attlist-->]]>
 <!--end of article.module-->]]>
 
-<!-- End of DocBook document hierarchy module V4.5 ........................ -->
+<!-- End of DocBook document hierarchy module V4.5CR2 ........................ -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 74e312f081ff1de0fbe79e97308580cd86419945..e2eeb49a0597e5fb98a36e5c93cfd7c33f1399e9 100644 (file)
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.5 ........................................ -->
+<!-- DocBook notations module V4.5CR2 ........................................ -->
 <!-- File dbnotnx.mod ..................................................... -->
 
 <!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
@@ -36,7 +36,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbnotn PUBLIC
-     "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
      "dbnotnx.mod">
      %dbnotn;
 
@@ -97,5 +97,5 @@
 <!NOTATION SWF          SYSTEM "http://www.macromedia.com/software/flash">
 <!NOTATION linespecific        SYSTEM "linespecific">
 
-<!-- End of DocBook notations module V4.5 ................................. -->
+<!-- End of DocBook notations module V4.5CR2 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index 25969335d379d14f4a0c0cd298da8e458f364090..65d47966322bb2334ea2a5414d4fe6dcff99bf10 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.5 ............................. -->
+<!-- DocBook XML information pool module V4.5CR2 ............................. -->
 <!-- File dbpoolx.mod ..................................................... -->
 
 <!-- Copyright 1992-2004 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.5//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5CR2//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -3789,7 +3789,7 @@ in the text (no (0) value, the default)
   <!-- ====================================================== -->
 
 <!ENTITY % htmltbl
-  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
   "htmltblx.mod">
 %htmltbl;
 <!--end of allow.html.tables-->]]>
@@ -3825,7 +3825,7 @@ in the text (no (0) value, the default)
 
 <!-- Reference CALS Table Model -->
 <!ENTITY % tablemodel
-  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5CR2//EN"
   "calstblx.dtd">
 ]]>
 
@@ -8697,5 +8697,5 @@ OtherCredit. -->
 <!--end of seeseealso.module-->]]>
 <!--end of indexterm.content.module-->]]>
 
-<!-- End of DocBook XML information pool module V4.5 ...................... -->
+<!-- End of DocBook XML information pool module V4.5CR2 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 25ac4dff02e9c941f11ff0d7f975be4df7289412..9f430c267a6ce5d1b758c396dd3b6b3e7b2c2443 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.5 .................................... --
+  -- Catalog data for DocBook XML V4.5CR2 .................................... --
   -- 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.5. It is provided as
+  -- This is the catalog data file for DocBook XML V4.5CR2. 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 XML V4.5//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5CR2//EN"
        "calstblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
        "htmltblx.mod"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5CR2//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
        "dbcentx.mod"
 
   -- ...................................................................... --
@@ -109,5 +109,5 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
 PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
        "ent/isocyr2.ent"
 
-  -- End of catalog data for DocBook XML V4.5 ............................. --
+  -- End of catalog data for DocBook XML V4.5CR2 ............................. --
   -- ...................................................................... --

diff --git a/docbook/xml/docbookx.dtd b/docbook/xml/docbookx.dtd
index b661fef1fc9e5e8c2841189bd7c818320eb2e065..22b3407a79072cecae6cb0789a4eb22d231035ed 100644 (file)
--- a/docbook/xml/docbookx.dtd
+++ b/docbook/xml/docbookx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML DTD V4.5 ................................................. -->
+<!-- DocBook XML DTD V4.5CR2 ................................................. -->
 <!-- File docbookx.dtd .................................................... -->
 
 <!-- Copyright 1992-2004 HaL Computer Systems, Inc.,
@@ -32,24 +32,24 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.5 of the DocBook DTD.
+<!-- This is the driver file for V4.5CR2 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook XML V4.5//EN"
+     "-//OASIS//DTD DocBook XML V4.5CR2//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.5//EN"
-                    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
+     <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
+                    "http://www.oasis-open.org/docbook/xml/4.5CR2/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.5//EN"
-                "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook XML V4.5CR2//EN"
+                "http://www.oasis-open.org/docbook/xml/4.5CR2/docbookx.dtd">
      %DocBookDTD;
 
      See the documentation for detailed information on the parameter
@@ -96,7 +96,7 @@
 <!ENTITY % dbnotn.module "INCLUDE">
 <![%dbnotn.module;[
 <!ENTITY % dbnotn PUBLIC
-"-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+"-//OASIS//ENTITIES DocBook Notations V4.5CR2//EN"
 "dbnotnx.mod">
 %dbnotn;
 ]]>
@@ -118,7 +118,7 @@
 ]]>
 
 <!ENTITY % dbcent PUBLIC
-"-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+"-//OASIS//ENTITIES DocBook Character Entities V4.5CR2//EN"
 "dbcentx.mod">
 %dbcent;
 ]]>
@@ -131,7 +131,7 @@
 <!ENTITY % dbpool.module "INCLUDE">
 <![ %dbpool.module; [
 <!ENTITY % dbpool PUBLIC
-"-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+"-//OASIS//ELEMENTS DocBook Information Pool V4.5CR2//EN"
 "dbpoolx.mod">
 %dbpool;
 ]]>
@@ -150,7 +150,7 @@
 <!ENTITY % dbhier.module "INCLUDE">
 <![ %dbhier.module; [
 <!ENTITY % dbhier PUBLIC
-"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+"-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR2//EN"
 "dbhierx.mod">
 %dbhier;
 ]]>
@@ -161,10 +161,10 @@
 <!ENTITY % dbgenent.module "INCLUDE">
 <![ %dbgenent.module; [
 <!ENTITY % dbgenent PUBLIC
-"-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+"-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR2//EN"
 "dbgenent.mod">
 %dbgenent;
 ]]>
 
-<!-- End of DocBook XML DTD V4.5 .......................................... -->
+<!-- End of DocBook XML DTD V4.5CR2 .......................................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/freshmeat.xsl b/docbook/xml/freshmeat.xsl
index dec76414776b7afbdc671b8545a8b35dcf55e0eb..0b5773bf84e68d834b88c7d234f2d3eb639a10be 100644 (file)
--- a/docbook/xml/freshmeat.xsl
+++ b/docbook/xml/freshmeat.xsl
@@ -42,7 +42,7 @@
   <fm:Changes>There are no backwards-incompatible changes in this release.
 
 Updated version number for final release.
-There are no technical changes from DocBook V4.5CR1.
+There are no technical changes from DocBook V4.5CR2.
   </fm:Changes>  
 </fm:project>
 

diff --git a/docbook/xml/htmltblx.mod b/docbook/xml/htmltblx.mod
index 02dcc5ee4e138a390d6456d698af0cc9622f36ca..502256bb400bcd827bb8ad642d28bdf2d3e0211d 100644 (file)
--- a/docbook/xml/htmltblx.mod
+++ b/docbook/xml/htmltblx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML HTML Table Module V4.5 ................................... -->
+<!-- DocBook XML HTML Table Module V4.5CR2 ................................... -->
 <!-- File htmltblx.mod .................................................... -->
 
 <!-- Copyright 2003, 2004 ArborText, Inc., Norman Walsh, Sun Microsystems,
@@ -34,7 +34,7 @@
      HTML one is more like what browsers are likely to accept today
      and users are likely to use.
 
-     This module has been developed for use with the DocBook V4.5
+     This module has been developed for use with the DocBook V4.5CR2
      "union table model" in which elements and attlists common to both
      models are defined (as the union) in the CALS table module by
      setting various parameter entities appropriately in this file.
@@ -43,7 +43,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % htmltbl PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR2//EN"
      "htmltblx.mod">
      %htmltbl;
 
@@ -238,5 +238,5 @@ top|bottom|topbot|all|sides|none">
 <!ENTITY % tbl.tbody.mdl       "(tr+|row+)">
 <!ENTITY % tbl.valign.attval   "top|middle|bottom|baseline">
 
-<!-- End of DocBook XML HTML Table Module V4.5 ............................ -->
+<!-- End of DocBook XML HTML Table Module V4.5CR2 ............................ -->
 <!-- ...................................................................... -->