Updated version numbers and public identifiers

diff --git a/docbook/sgml/docbook.cat b/docbook/sgml/docbook.cat
index 2b6b44ad85e27de3d68a1b457673cec8b5f31ebd..fd08c78237ec64a3a6fe197c20603851cf5714fe 100644 (file)
--- a/docbook/sgml/docbook.cat
+++ b/docbook/sgml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook V4.1 ........................................ --
+  -- Catalog data for DocBook V4.2b0 ........................................ --
   -- 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.1. It is provided as
+  -- This is the catalog data file for DocBook V4.2b0. 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
@@ -16,48 +16,98 @@
      on supplying and using catalog data.
   --
 
-  -- ...................................................................... --
-  -- SGML declaration associated with DocBook ............................. --
-
-DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.2b0//EN"
+       "docbook.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
+       "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN" "dbpool.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "dbhier.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2b0//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2b0//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b0//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2b0//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2b0//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2b0//EN"
+       "dbcentx.mod"
 
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
 
-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-
-  -- End of catalog data for DocBook V4.1 ................................. --
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+       "iso-dia.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+       "iso-num.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+       "iso-pub.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+       "iso-tech.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+       "iso-lat1.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+       "iso-lat2.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+       "iso-grk1.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+       "iso-grk2.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+       "iso-grk3.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+       "iso-grk4.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+       "iso-amsa.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+       "iso-amsb.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+       "iso-amsc.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+       "iso-amsn.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+       "iso-amso.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+       "iso-amsr.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+       "iso-box.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+       "iso-cyr1.gml"
+
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+       "iso-cyr2.gml"
+
+  -- End of catalog data for DocBook V4.2b0 ................................. --
   -- ...................................................................... --

diff --git a/docbook/sgml/docbook.dcl b/docbook/sgml/docbook.dcl
index befb4132a33f977c7b8cb9b1d523a1f4201945d4..539072482c078185da627b53019e033a31abface 100644 (file)
--- a/docbook/sgml/docbook.dcl
+++ b/docbook/sgml/docbook.dcl
@@ -1,6 +1,6 @@
 <!SGML  "ISO 8879:1986"
   -- ...................................................................... --
-  -- DocBook SGML declaration V4.1 ........................................ --
+  -- DocBook SGML declaration V4.2b0 ........................................ --
   -- file docbook.dcl ..................................................... --
 
 CHARSET
@@ -101,6 +101,6 @@ FEATURES
 
 APPINFO NONE
 
-  -- End of DocBook SGML declaration V4.1 ................................. --
+  -- End of DocBook SGML declaration V4.2b0 ................................ --
   -- ...................................................................... --
 >

diff --git a/docbook/sgml/docbook.dtd b/docbook/sgml/docbook.dtd
index f152e63a5570d4c87e56e04f11cc575ab71a1ddf..ffdcc64ec82002d61fbca2d44b100d412dbf0650 100644 (file)
--- a/docbook/sgml/docbook.dtd
+++ b/docbook/sgml/docbook.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- DocBook DTD V4.1 ..................................................... -->
+<!-- DocBook DTD V4.2b0 ..................................................... -->
 <!-- File docbook.dtd ..................................................... -->
 
 <!-- Copyright 1992-2000 HaL Computer Systems, Inc.,
@@ -29,21 +29,21 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V4.1 of the DocBook DTD.
+<!-- This is the driver file for V4.2b0 of the DocBook DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD DocBook V4.1//EN"
+     "-//OASIS//DTD DocBook V4.2b0//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.1//EN" [...]>
+     <!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.2b0//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.1//EN">
+     <!ENTITY % DocBookDTD PUBLIC "-//OASIS//DTD DocBook V4.2b0//EN">
      %DocBookDTD;
 
      The DocBook DTD is accompanied by an SGML declaration.
@@ -56,9 +56,9 @@
 
 <!ENTITY % sgml.features "INCLUDE">
 
-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V5.0a2//EN"
-                   "../xml/docbookx.dtd">
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.2b0//EN"
+                   "docbookx.dtd">
 %docbook;
 
-<!-- End of DocBook DTD V4.1 .............................................. -->
+<!-- End of DocBook DTD V4.2b0 .............................................. -->
 <!-- ...................................................................... -->