DocBook V4.5 released

diff --git a/docbook/sgml/catalog.xml b/docbook/sgml/catalog.xml
index 5bd4849aa82574c62c75633d986bf0b3fb74515b..337dc39798e87c7eb95238050196e9f473ee36b5 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.5CR3 .................................... -->
+<!-- XML Catalog data for DocBook V4.5 .................................... -->
 <!-- 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.5CR3. It is provided as
+<!-- This is the catalog data file for DocBook V4.5. 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,49 +22,49 @@
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook V4.5CR3//EN"
+<public publicId="-//OASIS//DTD DocBook V4.5//EN"
         uri="docbook.dtd"/>
 
-<public publicId="-//OASIS//DTD DocBook XML V4.5CR3//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.5//EN"
         uri="docbookx.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/sgml/4.5b1/docbook.dtd"
+<system systemId="http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
        uri="docbook.dtd"/>
 
-<system systemId="http://docbook.org/sgml/4.5b1/docbook.dtd"
+<system systemId="http://docbook.org/sgml/4.5/docbook.dtd"
        uri="docbook.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/xml/4.5b1/docbookx.dtd"
+<system systemId="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
        uri="docbookx.dtd"/>
 
-<system systemId="http://docbook.org/xml/4.5b1/docbookx.dtd"
+<system systemId="http://docbook.org/xml/4.5/docbookx.dtd"
        uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5CR3//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//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.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//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.5CR3 ............................. -->
+<!-- End of catalog data for DocBook XML V4.5 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

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

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

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

diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index d153e69cc9e4c95bb6f00ddb922991790cad54f6..1e1d91b3758bbb267eb5c39b1a8685733dd3ce95 100644 (file)
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.5CR3 ........................................ -->
+<!-- DocBook CALS Table Model V4.5 ........................................ -->
 <!-- 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.5CR3.
+     combined HTML/CALS models supported by DocBook V4.5.
 -->
 
 <!-- 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.5CR3 ................................. -->
+<!-- End of DocBook CALS Table Model V4.5 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index 689ff0612043ce18e9e71125a2228cbd137fca23..f75c1d764d96b23f08afff91cb2b416b3ce027fc 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.5CR3 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.5 ................................ -->
 <!-- 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.5CR3. It is provided as
+<!-- This is the catalog data file for DocBook V4.5. 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.5CR3//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.5//EN"
         uri="docbookx.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/xml/4.5CR3/docbookx.dtd"
+<system systemId="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
        uri="docbookx.dtd"/>
 
-<system systemId="http://docbook.org/xml/4.5CR3/docbookx.dtd"
+<system systemId="http://docbook.org/xml/4.5/docbookx.dtd"
        uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5CR3//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//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.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5CR3//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.5//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5CR3//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//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.5CR3 ............................. -->
+<!-- End of catalog data for DocBook XML V4.5 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

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

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

diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index 886de83c012713b30dfa7739f606e74f342c9781..a2f46bebbfaa743f73b08c09db29887f3bf2182d 100644 (file)
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.5CR3 ............................... -->
+<!-- DocBook document hierarchy module V4.5 ............................... -->
 <!-- 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.5CR3//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//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.5CR3.  This
+<!-- Note that Part was to have its content model reduced in V4.5.  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.5CR3 ........................ -->
+<!-- End of DocBook document hierarchy module V4.5 ........................ -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 006bb5afad4fc402a2b342d6a5590db25e1a4152..74e312f081ff1de0fbe79e97308580cd86419945 100644 (file)
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.5CR3 ........................................ -->
+<!-- DocBook notations module V4.5 ........................................ -->
 <!-- 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.5CR3//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.5//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.5CR3 ................................. -->
+<!-- End of DocBook notations module V4.5 ................................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index a9c6684a862585944accb2751d016b748e911920..25969335d379d14f4a0c0cd298da8e458f364090 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.5CR3 ............................. -->
+<!-- DocBook XML information pool module V4.5 ............................. -->
 <!-- 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.5CR3//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//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.5CR3//EN"
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//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.5CR3//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//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.5CR3 ...................... -->
+<!-- End of DocBook XML information pool module V4.5 ...................... -->
 <!-- ...................................................................... -->

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

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

diff --git a/docbook/xml/htmltblx.mod b/docbook/xml/htmltblx.mod
index 1e66763dfefd683fb3dcc65b300d371a03ec078e..8bfbdcf15fb1cf8fe1aef8fb09172ec88b5abed2 100644 (file)
--- a/docbook/xml/htmltblx.mod
+++ b/docbook/xml/htmltblx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML HTML Table Module V4.5CR3 ................................... -->
+<!-- DocBook XML HTML Table Module V4.5 ................................... -->
 <!-- File htmltblx.mod .................................................... -->
 
 <!-- Copyright 2003-2006 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.5CR3
+     This module has been developed for use with the DocBook V4.5
      "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.5CR3//EN"
+     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
      "htmltblx.mod">
      %htmltbl;
 
@@ -241,5 +241,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.5CR3 ............................ -->
+<!-- End of DocBook XML HTML Table Module V4.5 ............................ -->
 <!-- ...................................................................... -->