Remove the CR2s

diff --git a/docbook/simple/freshmeat.xsl b/docbook/simple/freshmeat.xsl
index 52b90ef4bb89a3c0069e1e3c532a11008f773328..0f07c4ea27373a050e6d7589c877ebfa0d87717e 100644 (file)
--- a/docbook/simple/freshmeat.xsl
+++ b/docbook/simple/freshmeat.xsl
@@ -30,7 +30,8 @@
   <fm:Changelog-URL>http://docbook.org/xml/simple/{VERSION}/ChangeLog</fm:Changelog-URL>
   <fm:CVS-URL>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/docbook/docbook/xml/simple/</fm:CVS-URL>
   <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook/</fm:Mailing-List-URL>
-  <fm:Changes>Simplified DocBook V1.1CR2 fixes a few bugs present in 1.1CR1.
+  <fm:Changes>Simplified DocBook V1.1 is an official release. It contains
+no technical changes from V1.1CR2.
   </fm:Changes>  
 </fm:project>
 

diff --git a/docbook/simple/sdbcent.mod b/docbook/simple/sdbcent.mod
index 9b8fb4c8167306de308211cc27d38686b1f7e3cf..1d2125f00c0ab06734502f47be15cb45a1b8f9b5 100644 (file)
--- a/docbook/simple/sdbcent.mod
+++ b/docbook/simple/sdbcent.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook Character Entity Module V1.1CR2 ...................... -->
+<!-- Simplified DocBook Character Entity Module V1.1 ...................... -->
 <!-- File sinclist.mod .................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -63,5 +63,5 @@
 "http://www.w3.org/2003/entities/iso8879/isopub.ent">
 %ISOpub;
 
-<!-- End of Simplified DocBook Character Entity Module V1.1CR2 ............... -->
+<!-- End of Simplified DocBook Character Entity Module V1.1 ............... -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sdbhier.mod b/docbook/simple/sdbhier.mod
index 369d44e86e0ada41f8a99a16c9666fdd0e5c1f0e..42d102d9d857b5cc3b69c6138b31c79503c7b13c 100644 (file)
--- a/docbook/simple/sdbhier.mod
+++ b/docbook/simple/sdbhier.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook Hierarchy V1.1CR2 .................................... -->
+<!-- Simplified DocBook Hierarchy V1.1 .................................... -->
 <!-- File sdbhier.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -85,5 +85,5 @@
 
 ]]>
 
-<!-- End of Simplified DocBook Hierarchy V1.1CR2 ............................. -->
+<!-- End of Simplified DocBook Hierarchy V1.1 ............................. -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sdbpool.mod b/docbook/simple/sdbpool.mod
index c90f38633d1a6368e4001e751adfc3c23df00669..5a73667d3660d7b534b529be69e8a9a8dcb31d05 100644 (file)
--- a/docbook/simple/sdbpool.mod
+++ b/docbook/simple/sdbpool.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook Information Pool V1.1CR2 ............................. -->
+<!-- Simplified DocBook Information Pool V1.1 ............................. -->
 <!-- File sdbpool.mod ..................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -211,5 +211,5 @@
 
 <!ENTITY % programlisting.content "%para.char.mix; | lineannotation">
 
-<!-- End of Simplified DocBook Information Pool V1.1CR2 ...................... -->
+<!-- End of Simplified DocBook Information Pool V1.1 ...................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sdocbook-custom.dtd b/docbook/simple/sdocbook-custom.dtd
index f23da83831a7c7f0fcee2e5a835da8a0b613f79b..9b5f5965f8150b25bc9bb9bb2c4ebc3f9dbb0e70 100644 (file)
--- a/docbook/simple/sdocbook-custom.dtd
+++ b/docbook/simple/sdocbook-custom.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook DTD V1.1CR2 .......................................... -->
+<!-- Simplified DocBook DTD V1.1 .......................................... -->
 <!-- File sdocbook-custom.dtd ............................................. -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -30,16 +30,16 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V1.1CR2 of the Simplified DocBook XML DTD.
+<!-- This is the driver file for V1.1 of the Simplified DocBook XML DTD.
      Please use the following formal public identifier to identify it:
 
-     "-//OASIS//DTD Simplified DocBook XML V1.1CR2//EN"
+     "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
 
      For example:
 
      <!DOCTYPE article
-               PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1CR2//EN"
-      "http://www.oasis-open.org/docbook/xml/simple/1.1CR2/sdocbook.dtd"
+               PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"
      [...]>
 -->
 
@@ -447,5 +447,5 @@
                | %other.char.class;)*
                >
 
-<!-- End of Simplified DocBook DTD V1.1CR2 ................................... -->
+<!-- End of Simplified DocBook DTD V1.1 ................................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sdocbookref-custom.dtd b/docbook/simple/sdocbookref-custom.dtd
index d3a2a8f6647a5e5e0c7c09d778c89ba1ca303119..af055489e74cdc6e4357eea04776ce01db081417 100644 (file)
--- a/docbook/simple/sdocbookref-custom.dtd
+++ b/docbook/simple/sdocbookref-custom.dtd
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook RefEntry DTD V1.1CR2 ................................. -->
+<!-- Simplified DocBook RefEntry DTD V1.1 ................................. -->
 <!-- File sdocbookref-custom.dtd .......................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -30,17 +30,17 @@
 
 <!-- ...................................................................... -->
 
-<!-- This is the driver file for V1.1CR2 of the Simplified DocBook
+<!-- This is the driver file for V1.1 of the Simplified DocBook
      RefEntry XML DTD. Please use the following formal public identifier
      to identify it:
 
-     "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1CR2//EN"
+     "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
 
      For example:
 
      <!DOCTYPE article
-               PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1CR2//EN"
-      "http://www.oasis-open.org/docbook/xml/simple/1.1CR2/sdocbookref.dtd"
+               PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN"
+      "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"
      [...]>
 -->
 
@@ -56,5 +56,5 @@
 <!ENTITY % sdocbook-custom.dtd SYSTEM "sdocbook-custom.dtd">
 %sdocbook-custom.dtd;
 
-<!-- End of Simplified DocBook RefEntry DTD V1.1CR2 .......................... -->
+<!-- End of Simplified DocBook RefEntry DTD V1.1 .......................... -->
 <!-- ...................................................................... -->

diff --git a/docbook/simple/sinclist.mod b/docbook/simple/sinclist.mod
index 72197261ac413f5861d21cae5d7f8e3b89f63529..a7fe659758879b7138fc0da7d283c9900c8cd27d 100644 (file)
--- a/docbook/simple/sinclist.mod
+++ b/docbook/simple/sinclist.mod
@@ -1,5 +1,5 @@
 <!-- ...................................................................... -->
-<!-- Simplified DocBook Include Module V1.1CR2 ............................... -->
+<!-- Simplified DocBook Include Module V1.1 ............................... -->
 <!-- File sinclist.mod .................................................... -->
 
 <!-- Copyright 1992-2002 HaL Computer Systems, Inc.,
@@ -319,5 +319,5 @@
 <!ENTITY % uri.module "IGNORE">
 <!ENTITY % allow.html.tables "INCLUDE">
 
-<!-- End of Simplified DocBook Include Module V1.1CR2 ........................ -->
+<!-- End of Simplified DocBook Include Module V1.1 ........................ -->
 <!-- ...................................................................... -->