Added wordsize effectivity attribute; fixed several errant public identifiers

diff --git a/docbook/xml/dbpoolx.mod b/docbook/xml/dbpoolx.mod
index e996f54aeb95b64cf637989f7e2fc564513001c1..5d00275493f4ed9b80ab5811df04c69381735bfb 100644 (file)
--- a/docbook/xml/dbpoolx.mod
+++ b/docbook/xml/dbpoolx.mod
@@ -50,7 +50,7 @@
      declaration that uses the public identifier shown below:
 
      <!ENTITY % dbpool PUBLIC
-     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4b1//EN"
+     "-//OASIS//ELEMENTS DocBook XML Information Pool V4.4CR1//EN"
      "dbpoolx.mod">
      %dbpool;
 
@@ -562,12 +562,16 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
 <!ENTITY % userlevel.attrib
        "userlevel      CDATA           #IMPLIED">
 
-
 <!-- Vendor: Computer vendor to which element applies; no default -->
 
 <!ENTITY % vendor.attrib
        "vendor         CDATA           #IMPLIED">
 
+<!-- Wordsize: Computer word size (32 bit, 64 bit, etc.); no default -->
+
+<!ENTITY % wordsize.attrib
+       "wordsize       CDATA           #IMPLIED">
+
 <!ENTITY % local.effectivity.attrib "">
 <!ENTITY % effectivity.attrib
        "%arch.attrib;
@@ -578,6 +582,7 @@ d. Just Acronym, Emphasis, and Trademark; no other word elements.
         %security.attrib;
        %userlevel.attrib;
        %vendor.attrib;
+       %wordsize.attrib;
        %local.effectivity.attrib;"
 >
 
@@ -3645,7 +3650,7 @@ in the text (no (0) value, the default)
   <!-- ====================================================== -->
 
 <!ENTITY % htmltbl
-  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4b1//EN"
+  PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4CR1//EN"
   "htmltblx.mod">
 %htmltbl;
 <!--end of allow.html.tables-->]]>
@@ -3680,7 +3685,7 @@ in the text (no (0) value, the default)
 
 <!-- Reference CALS Table Model -->
 <!ENTITY % tablemodel
-  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4b1//EN"
+  PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4CR1//EN"
   "calstblx.dtd">
 ]]>