From b3a2a9f0395b0e7b3145ea518fff3210e49c65a5 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 27 Jan 2005 13:54:31 +0000
Subject: [PATCH] Fix version information

---
 docbook/sgml/catalog.xml | 32 ++++++++++++++++----------------
 docbook/sgml/docbook.cat | 24 ++++++++++++------------
 docbook/sgml/docbook.dcl |  4 ++--
 docbook/xml/calstblx.dtd |  6 +++---
 docbook/xml/catalog.xml  | 26 +++++++++++++-------------
 docbook/xml/dbcentx.mod  |  6 +++---
 docbook/xml/dbgenent.mod |  6 +++---
 docbook/xml/dbhierx.mod  |  8 ++++----
 docbook/xml/dbnotnx.mod  |  6 +++---
 docbook/xml/dbpoolx.mod  | 10 +++++-----
 docbook/xml/docbook.cat  | 22 +++++++++++-----------
 docbook/xml/htmltblx.mod |  8 ++++----
 12 files changed, 79 insertions(+), 79 deletions(-)

diff --git a/docbook/sgml/catalog.xml b/docbook/sgml/catalog.xml
index 33cce0925..d21f0be9c 100644
--- 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.4CR4 .................................... -->
+<!-- XML Catalog data for DocBook V4.4 .................................... -->
 <!-- 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.4CR4. It is provided as
+<!-- This is the catalog data file for DocBook V4.4. 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.4CR4//EN"
+<public publicId="-//OASIS//DTD DocBook V4.4//EN"
         uri="docbook.dtd"/>
 
-<public publicId="-//OASIS//DTD DocBook XML V4.4CR4//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.4//EN"
         uri="docbookx.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/sgml/4.4CR4/docbook.dtd"
+<system systemId="http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
 	uri="docbook.dtd"/>
 
-<system systemId="http://docbook.org/sgml/4.4CR4/docbook.dtd"
+<system systemId="http://docbook.org/sgml/4.4/docbook.dtd"
 	uri="docbook.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/xml/4.4CR4/docbookx.dtd"
+<system systemId="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 	uri="docbookx.dtd"/>
 
-<system systemId="http://docbook.org/xml/4.4CR4/docbookx.dtd"
+<system systemId="http://docbook.org/xml/4.4/docbookx.dtd"
 	uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4CR4//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//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.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//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.4CR4 ............................. -->
+<!-- End of catalog data for DocBook XML V4.4 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>
diff --git a/docbook/sgml/docbook.cat b/docbook/sgml/docbook.cat
index 019b12b29..d6e317ec6 100644
--- a/docbook/sgml/docbook.cat
+++ b/docbook/sgml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook V4.4CR4 ........................................ --
+  -- Catalog data for DocBook V4.4 ........................................ --
   -- 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.4CR4. It is provided as
+  -- This is the catalog data file for DocBook V4.4. 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.4CR4//EN"
+PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
        "docbook.dtd"
 
-PUBLIC "-//OASIS//DTD DocBook XML V4.4CR4//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4CR4//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
        "calstblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
        "htmltblx.mod"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.4//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//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.4CR4 ................................. --
+  -- End of catalog data for DocBook V4.4 ................................. --
   -- ...................................................................... --
diff --git a/docbook/sgml/docbook.dcl b/docbook/sgml/docbook.dcl
index 83acf5346..c3521bb05 100644
--- a/docbook/sgml/docbook.dcl
+++ b/docbook/sgml/docbook.dcl
@@ -1,6 +1,6 @@
 <!SGML  "ISO 8879:1986"
   -- ...................................................................... --
-  -- DocBook SGML declaration V4.4CR4 ........................................ --
+  -- DocBook SGML declaration V4.4 ........................................ --
   -- file docbook.dcl ..................................................... --
 
 CHARSET
@@ -101,6 +101,6 @@ FEATURES
 
 APPINFO NONE
 
-  -- End of DocBook SGML declaration V4.4CR4 ................................. --
+  -- End of DocBook SGML declaration V4.4 ................................. --
   -- ...................................................................... --
 >
diff --git a/docbook/xml/calstblx.dtd b/docbook/xml/calstblx.dtd
index 32d9f5afe..efc27d95e 100644
--- a/docbook/xml/calstblx.dtd
+++ b/docbook/xml/calstblx.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook CALS Table Model V4.4CR4 ........................................ -->
+<!-- DocBook CALS Table Model V4.4 ........................................ -->
 <!-- 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.4CR4.
+     combined HTML/CALS models supported by DocBook V4.4.
 -->
 
 <!-- These definitions are not directly related to the table model, but are
@@ -201,5 +201,5 @@ of the current application.
         %secur;
 >
 
-<!-- End of DocBook CALS Table Model V4.4CR4 ................................. -->
+<!-- End of DocBook CALS Table Model V4.4 ................................. -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index 2d0d05c3e..8d709ba10 100644
--- 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.4CR4 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.4 ................................ -->
 <!-- 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.4CR4. It is provided as
+<!-- This is the catalog data file for DocBook V4.4. 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.4CR4//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.4//EN"
         uri="docbookx.dtd"/>
 
-<system systemId="http://www.oasis-open.org/docbook/xml/4.4CR4/docbookx.dtd"
+<system systemId="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
 	uri="docbookx.dtd"/>
 
-<system systemId="http://docbook.org/xml/4.4CR4/docbookx.dtd"
+<system systemId="http://docbook.org/xml/4.4/docbookx.dtd"
 	uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4CR4//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
         uri="calstblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//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.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4CR4//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.4//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4CR4//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//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.4CR4 ............................. -->
+<!-- End of catalog data for DocBook XML V4.4 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>
diff --git a/docbook/xml/dbcentx.mod b/docbook/xml/dbcentx.mod
index 8aa7c9843..0a7772f8c 100644
--- a/docbook/xml/dbcentx.mod
+++ b/docbook/xml/dbcentx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook character entities module V4.4CR4 ............................... -->
+<!-- DocBook character entities module V4.4 ............................... -->
 <!-- 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.4CR4//EN"
+     "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
      "dbcentx.mod">
      %dbcent;
 
@@ -380,5 +380,5 @@
 %ISOtech;
 ]]>
 
-<!-- End of DocBook character entity sets module V4.4CR4 ..................... -->
+<!-- End of DocBook character entity sets module V4.4 ..................... -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/dbgenent.mod b/docbook/xml/dbgenent.mod
index 33c33e185..20f717a2c 100644
--- a/docbook/xml/dbgenent.mod
+++ b/docbook/xml/dbgenent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook additional general entities V4.4CR4 ............................. -->
+<!-- DocBook additional general entities V4.4 ............................. -->
 
 <!-- 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.4CR4//EN"
+     "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
      "dbgenent.mod">
      %dbgenent;
 -->
@@ -37,5 +37,5 @@
        %all-titles;
 -->
 
-<!-- End of DocBook additional general entities V4.4CR4 ...................... -->
+<!-- End of DocBook additional general entities V4.4 ...................... -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/dbhierx.mod b/docbook/xml/dbhierx.mod
index d43da2b21..a8f31cd1c 100644
--- a/docbook/xml/dbhierx.mod
+++ b/docbook/xml/dbhierx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook document hierarchy module V4.4CR4 ............................... -->
+<!-- DocBook document hierarchy module V4.4 ............................... -->
 <!-- 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.4CR4//EN"
+     "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
      "dbhierx.mod">
      %dbhier;
 
@@ -720,7 +720,7 @@
 <!ENTITY % part.module "INCLUDE">
 <![%part.module;[
 
-<!-- Note that Part was to have its content model reduced in V4.4CR4.  This
+<!-- Note that Part was to have its content model reduced in V4.4.  This
 change will not be made after all. -->
 
 <!ENTITY % local.part.attrib "">
@@ -2109,5 +2109,5 @@ change will not be made after all. -->
 <!--end of article.attlist-->]]>
 <!--end of article.module-->]]>
 
-<!-- End of DocBook document hierarchy module V4.4CR4 ........................ -->
+<!-- End of DocBook document hierarchy module V4.4 ........................ -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/dbnotnx.mod b/docbook/xml/dbnotnx.mod
index 3cd5f2f42..cefd47774 100644
--- a/docbook/xml/dbnotnx.mod
+++ b/docbook/xml/dbnotnx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook notations module V4.4CR4 ........................................ -->
+<!-- DocBook notations module V4.4 ........................................ -->
 <!-- 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.4CR4//EN"
+     "-//OASIS//ENTITIES DocBook Notations V4.4//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.4CR4 ................................. -->
+<!-- End of DocBook notations module V4.4 ................................. -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index a01bce410..30f463634 100644
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML information pool module V4.4CR4 ............................. -->
+<!-- DocBook XML information pool module V4.4 ............................. -->
 <!-- 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.4CR4//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -3650,7 +3650,7 @@ in the text (no (0) value, the default)
   <!-- ====================================================== -->
 
 <!ENTITY % htmltbl
-  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR4//EN"
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
   "htmltblx.mod">
 %htmltbl;
 <!--end of allow.html.tables-->]]>
@@ -3686,7 +3686,7 @@ in the text (no (0) value, the default)
 
 <!-- Reference CALS Table Model -->
 <!ENTITY % tablemodel
-  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4CR4//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
   "calstblx.dtd">
 ]]>
 
@@ -8351,5 +8351,5 @@ OtherCredit. -->
 <!--end of seeseealso.module-->]]>
 <!--end of indexterm.content.module-->]]>
 
-<!-- End of DocBook XML information pool module V4.4CR4 ...................... -->
+<!-- End of DocBook XML information pool module V4.4 ...................... -->
 <!-- ...................................................................... -->
diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 574c278d9..8c6fb1943 100644
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.4CR4 .................................... --
+  -- Catalog data for DocBook XML V4.4 .................................... --
   -- 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.4CR4. It is provided as
+  -- This is the catalog data file for DocBook XML V4.4. 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.4CR4//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4CR4//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
        "calstblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
        "htmltblx.mod"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4CR4//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.4//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4CR4//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//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.4CR4 ............................. --
+  -- End of catalog data for DocBook XML V4.4 ............................. --
   -- ...................................................................... --
diff --git a/docbook/xml/htmltblx.mod b/docbook/xml/htmltblx.mod
index d359feb14..9c9988024 100644
--- a/docbook/xml/htmltblx.mod
+++ b/docbook/xml/htmltblx.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook XML HTML Table Module V4.4CR4 ................................... -->
+<!-- DocBook XML HTML Table Module V4.4 ................................... -->
 <!-- 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.4CR4
+     This module has been developed for use with the DocBook V4.4
      "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.4CR4//EN"
+     "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
      "htmltblx.mod">
      %htmltbl;
 
@@ -233,5 +233,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.4CR4 ............................ -->
+<!-- End of DocBook XML HTML Table Module V4.4 ............................ -->
 <!-- ...................................................................... -->
-- 
2.40.0