Prepare for CR1 and fix search-and-replace typos

diff --git a/docbook/xml/catalog.xml b/docbook/xml/catalog.xml
index c94483a649971d73eefe00b4e0cae66cc18565a3..9ee6eb00860cdd5e24d881b7e2f40500fbb0e4cf 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">
 
 <!-- ...................................................................... -->
-<!-- XML Catalog data for DocBook XML V4.2b1 ................................ -->
+<!-- XML Catalog data for DocBook XML V4.2CR1 ................................ -->
 <!-- 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.2b1. It is provided as
+<!-- This is the catalog data file for DocBook V4.2CR1. 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,94 +22,94 @@
 <!-- ...................................................................... -->
 <!-- DocBook driver file .................................................. -->
 
-<public publicId="-//OASIS//DTD DocBook XML V4.2b1//EN"
+<public publicId="-//OASIS//DTD DocBook XML V4.2CR1//EN"
         uri="docbookx.dtd"/>
 
 <!-- ...................................................................... -->
 <!-- DocBook modules ...................................................... -->
 
-<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2b1//EN"
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.2CR1//EN"
         uri="calstblx.dtd"/>
 
 <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
         uri="soextblx.dtd"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2b1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.2CR1//EN"
         uri="dbpoolx.mod"/>
 
-<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b1//EN"
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
         uri="dbhierx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2b1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
         uri="dbgenent.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2b1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
         uri="dbnotnx.mod"/>
 
-<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2b1//EN"
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
         uri="dbcentx.mod"/>
 
 <!-- ...................................................................... -->
 <!-- ISO entity sets ...................................................... -->
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Diacritical Marks//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
         uri="ent/iso-dia.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Numeric and Special Graphic//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
         uri="ent/iso-num.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Publishing//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
         uri="ent/iso-pub.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES General Technical//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
         uri="ent/iso-tech.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Latin 1//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
         uri="ent/iso-lat1.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Latin 2//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
         uri="ent/iso-lat2.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Greek Letters//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
         uri="ent/iso-grk1.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Monotoniko Greek//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
         uri="ent/iso-grk2.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Greek Symbols//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
         uri="ent/iso-grk3.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Alternative Greek Symbols//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
         uri="ent/iso-grk4.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Arrow Relations//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
         uri="ent/iso-amsa.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Binary Operators//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
         uri="ent/iso-amsb.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Delimiters//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
         uri="ent/iso-amsc.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Negated Relations//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
         uri="ent/iso-amsn.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Ordinary//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
         uri="ent/iso-amso.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Relations//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
         uri="ent/iso-amsr.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Box and Line Drawing//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
         uri="ent/iso-box.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Russian Cyrillic//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
         uri="ent/iso-cyr1.ent"/>
 
-<public publicId="ISO 8879:1986//EN//XMLTITIES Non-Russian Cyrillic//EN//XML"
+<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
         uri="ent/iso-cyr2.ent"/>
 
-<!-- End of catalog data for DocBook XML V4.2b1 ............................. -->
+<!-- End of catalog data for DocBook XML V4.2CR1 ............................. -->
 <!-- ...................................................................... -->
 
 </catalog>

diff --git a/docbook/xml/docbook.cat b/docbook/xml/docbook.cat
index 934368c7c529dd437d22f561b8618d979546301c..20d496ecb8f21c092b4796fc53fea3d5404fdad3 100644 (file)
--- a/docbook/xml/docbook.cat
+++ b/docbook/xml/docbook.cat
@@ -1,5 +1,5 @@
   -- ...................................................................... --
-  -- Catalog data for DocBook XML V4.2b1 .................................... --
+  -- Catalog data for DocBook XML V4.2CR1 .................................... --
   -- 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.2b1. It is provided as
+  -- This is the catalog data file for DocBook XML V4.2CR1. 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,92 +19,92 @@
   -- ...................................................................... --
   -- DocBook driver file .................................................. --
 
-PUBLIC "-//OASIS//DTD DocBook XML V4.2b1//EN"
+PUBLIC "-//OASIS//DTD DocBook XML V4.2CR1//EN"
        "docbookx.dtd"
 
   -- ...................................................................... --
   -- DocBook modules ...................................................... --
 
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2b1//EN"
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2CR1//EN"
        "calstblx.dtd"
 
 PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
        "soextblx.dtd"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2b1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2CR1//EN"
        "dbpoolx.mod"
 
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2b1//EN"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2CR1//EN"
        "dbhierx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2b1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2CR1//EN"
        "dbgenent.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2b1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2CR1//EN"
        "dbnotnx.mod"
 
-PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2b1//EN"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2CR1//EN"
        "dbcentx.mod"
 
   -- ...................................................................... --
   -- ISO entity sets ...................................................... --
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Diacritical Marks//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
        "ent/iso-dia.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Numeric and Special Graphic//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
        "ent/iso-num.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Publishing//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML"
        "ent/iso-pub.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES General Technical//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML"
        "ent/iso-tech.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Latin 1//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
        "ent/iso-lat1.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Latin 2//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
        "ent/iso-lat2.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Greek Letters//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
        "ent/iso-grk1.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Monotoniko Greek//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
        "ent/iso-grk2.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Greek Symbols//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
        "ent/iso-grk3.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Alternative Greek Symbols//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
        "ent/iso-grk4.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Arrow Relations//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
        "ent/iso-amsa.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Binary Operators//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
        "ent/iso-amsb.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Delimiters//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
        "ent/iso-amsc.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Negated Relations//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
        "ent/iso-amsn.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Ordinary//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
        "ent/iso-amso.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Added Math Symbols: Relations//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
        "ent/iso-amsr.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Box and Line Drawing//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
        "ent/iso-box.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Russian Cyrillic//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
        "ent/iso-cyr1.ent"
 
-PUBLIC "ISO 8879:1986//EN//XMLTITIES Non-Russian Cyrillic//EN//XML"
+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
        "ent/iso-cyr2.ent"
 
-  -- End of catalog data for DocBook XML V4.2b1 ............................. --
+  -- End of catalog data for DocBook XML V4.2CR1 ............................. --
   -- ...................................................................... --