Version 5.0b3 released

diff --git a/docbook/relaxng/docbook/Makefile b/docbook/relaxng/docbook/Makefile
index d1a072d5ca55a2a4aebfcad44036f7076ad8a579..01546d30cf26abdf6906c6960b4e18fb89211acf 100644 (file)
--- a/docbook/relaxng/docbook/Makefile
+++ b/docbook/relaxng/docbook/Makefile
@@ -13,7 +13,7 @@ PERL=perl
 MV ?= mv
 
 CLASS=wd
-VERSION=5.0b2
+VERSION=5.0b3
 SPECNAME=$(CLASS)-docbook-docbook-$(VERSION)
 
 TOOLS=../tools

diff --git a/docbook/relaxng/docbook/dbforms/dbforms.rnc b/docbook/relaxng/docbook/dbforms/dbforms.rnc
index b05f8ac990fa3b0b7e62443b2ece60c01f668244..80df7f9a93154c2ffc2c884b1f398cf18cdb8c9d 100644 (file)
--- a/docbook/relaxng/docbook/dbforms/dbforms.rnc
+++ b/docbook/relaxng/docbook/dbforms/dbforms.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/dbforms/htmlform.rnc b/docbook/relaxng/docbook/dbforms/htmlform.rnc
index 6097f2a702f70549ed26e3869be28f0b05f60647..ad9fc092b50de7781f8c7499337cc0e71954bbda 100644 (file)
--- a/docbook/relaxng/docbook/dbforms/htmlform.rnc
+++ b/docbook/relaxng/docbook/dbforms/htmlform.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/defguide/defguide.rnc b/docbook/relaxng/docbook/defguide/defguide.rnc
index d94261cc34f13192f26637e995079d17e4ab113d..86cbe754166170f0d81163271f79368762998ae9 100644 (file)
--- a/docbook/relaxng/docbook/defguide/defguide.rnc
+++ b/docbook/relaxng/docbook/defguide/defguide.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/docbook/docbook.rnc b/docbook/relaxng/docbook/docbook/docbook.rnc
index 9cc24d423c7a2d80a99c7485d55da374b2e9e062..dfc3f01dd9a715b4ad5c128f8135398673bd76f6 100644 (file)
--- a/docbook/relaxng/docbook/docbook/docbook.rnc
+++ b/docbook/relaxng/docbook/docbook/docbook.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/docbookxi/docbookxi.rnc b/docbook/relaxng/docbook/docbookxi/docbookxi.rnc
index d959b2f4b399eb350a5e7408dbeb388b1b53f88d..21fca8658476d9000abe16d011f40db35301fe03 100644 (file)
--- a/docbook/relaxng/docbook/docbookxi/docbookxi.rnc
+++ b/docbook/relaxng/docbook/docbookxi/docbookxi.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/docbookxi/xinclude.rnc b/docbook/relaxng/docbook/docbookxi/xinclude.rnc
index e910816a1ffa884aaaf0cf259b8bb1bda4c04c24..b5cf9173d2f6e6a2969e7dbea2d231b1006957be 100644 (file)
--- a/docbook/relaxng/docbook/docbookxi/xinclude.rnc
+++ b/docbook/relaxng/docbook/docbookxi/xinclude.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/spec/docbook.xml b/docbook/relaxng/docbook/spec/docbook.xml
index ad2f6282152eec86bfeb4cc543290e263d408004..635b93a4fbc239123333a2633a4a5f02cc6de7a9 100644 (file)
--- a/docbook/relaxng/docbook/spec/docbook.xml
+++ b/docbook/relaxng/docbook/spec/docbook.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE article [
 <!ENTITY name "wd-docbook-docbook">
-<!ENTITY version "5.0b2">
+<!ENTITY version "5.0b3">
 <!ENTITY standard "Working Draft">
 <!ENTITY tracker "http://sourceforge.net/tracker">
 <!ENTITY RFE "&tracker;/index.php?func=detail&amp;group_id=21935&amp;atid=384107&amp;">
@@ -154,6 +154,44 @@ DocBook is also available from the mirror on
 <link xlink:href="http://docbook.org/"/>.
 </para>
 
+<section xml:id="s.50b3">
+<title>Changes in DocBook V5.0b3</title>
+
+<para>This release contains several small improvements over V5.0b2.</para>
+
+<orderedlist>
+<listitem xml:id="rfe.1358844">
+<para>Fixed <link xlink:href="&RFE;aid=1358844">RFE 1358844</link>:
+allow multiple <tag>imageobject</tag>s inside an
+<tag>imageobjectco</tag>. Updated reference documentation.
+</para>
+</listitem>
+
+<listitem xml:id="attribute.defaults">
+<para>Restored default values to the
+<tag class="attribute">type</tag> attribute on <tag>simplelist</tag>
+and the <tag class="attribute">choice</tag> and
+<tag class="attribute">rep</tag> attributes on
+<tag>methodparam</tag>,
+<tag>arg</tag>, and
+<tag>group</tag>. Fixed a bug in <tag>paramdef</tag> where
+<tag class="attvalue">plain</tag> was accidentally allowed as a
+<tag class="attribute">choice</tag>. These defaults are reflected in the
+generated XML DTD as well.</para>
+</listitem>
+
+<listitem xml:id="blockquote">
+<para>Reduced the content model of <tag>blockquote</tag> which seemed
+way too broad.</para>
+</listitem>
+
+<listitem xml:id="docs.b3">
+<para>Improved reference documentation for attributes on many elements.
+</para>
+</listitem>
+</orderedlist>
+
+</section>
 <section xml:id="s.50b2">
 <title>Changes in DocBook V5.0b2</title>
 

diff --git a/docbook/relaxng/docbook/src/annotations.rnc b/docbook/relaxng/docbook/src/annotations.rnc
index 7b1d24970bd0de95688712898ac85e353d17999b..07a78a7971170f38715787a2821e0e2e030620ba 100644 (file)
--- a/docbook/relaxng/docbook/src/annotations.rnc
+++ b/docbook/relaxng/docbook/src/annotations.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/bibliography.rnc b/docbook/relaxng/docbook/src/bibliography.rnc
index 2bded7bf0004114c7bc142a6a3fc51e5ac06f5f3..c32d0e2d7945dd62e270a9ad2cc4a58a20b3e54e 100644 (file)
--- a/docbook/relaxng/docbook/src/bibliography.rnc
+++ b/docbook/relaxng/docbook/src/bibliography.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/callouts.rnc b/docbook/relaxng/docbook/src/callouts.rnc
index b1f6e47fb08726e502f5c5734bf6faceb7153ca6..cf6864f4c88a509c8d83261fbd33637d1b450ae1 100644 (file)
--- a/docbook/relaxng/docbook/src/callouts.rnc
+++ b/docbook/relaxng/docbook/src/callouts.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/calstbl.rnc b/docbook/relaxng/docbook/src/calstbl.rnc
index 87c29a1a298eb55d4fb25b165175243922d9d870..e35d735cfc66a8e0010e3ddc7e89823ea5dbc574 100644 (file)
--- a/docbook/relaxng/docbook/src/calstbl.rnc
+++ b/docbook/relaxng/docbook/src/calstbl.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/docbook.rnc b/docbook/relaxng/docbook/src/docbook.rnc
index f7c158e62922b21bb0e5f765d99245b3120365d2..40c66cb00cc011dba8a5ddd71eb6bccbeb40bad3 100644 (file)
--- a/docbook/relaxng/docbook/src/docbook.rnc
+++ b/docbook/relaxng/docbook/src/docbook.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/ebnf.rnc b/docbook/relaxng/docbook/src/ebnf.rnc
index ec7916328f945532370bd2a2b37ea3633c29bb1d..e2499cdbb9b1139a21ed0818d45b4155db27aab9 100644 (file)
--- a/docbook/relaxng/docbook/src/ebnf.rnc
+++ b/docbook/relaxng/docbook/src/ebnf.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/glossary.rnc b/docbook/relaxng/docbook/src/glossary.rnc
index 482653c6cf897135491be73ea6a7f0e10ad2b160..346810233b10f6a5a0ebdce02822462c620b8747 100644 (file)
--- a/docbook/relaxng/docbook/src/glossary.rnc
+++ b/docbook/relaxng/docbook/src/glossary.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/hier.rnc b/docbook/relaxng/docbook/src/hier.rnc
index cece6f65c19ad19ee5c0e9a3451469c632f2ff96..ef30e6b84895243f100528004dc815f6ba2e8f85 100644 (file)
--- a/docbook/relaxng/docbook/src/hier.rnc
+++ b/docbook/relaxng/docbook/src/hier.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/htmltbl.rnc b/docbook/relaxng/docbook/src/htmltbl.rnc
index 40729f4ade4f192dd02bcd8d642995e868cbac8f..91f29646e6cc0b9ad2af4ec39e15406a2f6bbcc7 100644 (file)
--- a/docbook/relaxng/docbook/src/htmltbl.rnc
+++ b/docbook/relaxng/docbook/src/htmltbl.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/index.rnc b/docbook/relaxng/docbook/src/index.rnc
index fa2a16cb5d5415c75ca1110f0225ec1f601e3285..82a25b2d323d754c294750a40a553929aa8df4f9 100644 (file)
--- a/docbook/relaxng/docbook/src/index.rnc
+++ b/docbook/relaxng/docbook/src/index.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/math.rnc b/docbook/relaxng/docbook/src/math.rnc
index 363e5ee78ee6e69f6f85630776d60e0bf7bb27d1..3e2b11dc85ee550d8ec9b40407e40b90d24210c2 100644 (file)
--- a/docbook/relaxng/docbook/src/math.rnc
+++ b/docbook/relaxng/docbook/src/math.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/mathml.rnc b/docbook/relaxng/docbook/src/mathml.rnc
index 4c72d15127b2c8da46133b2adaa26f8325924d2b..d0f17b4e1ac138c5bc6fb4f5722d67c6f16f862d 100644 (file)
--- a/docbook/relaxng/docbook/src/mathml.rnc
+++ b/docbook/relaxng/docbook/src/mathml.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/msgset.rnc b/docbook/relaxng/docbook/src/msgset.rnc
index 5cad287adc69c4af3630b454b3a5cfca23ee090d..4fbb5026d7b8d18d12c43a8374799395ce50bbd4 100644 (file)
--- a/docbook/relaxng/docbook/src/msgset.rnc
+++ b/docbook/relaxng/docbook/src/msgset.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/pool.rnc b/docbook/relaxng/docbook/src/pool.rnc
index 8cea3a13464af8b8094c53588c3289e1864a708d..ac94543c71413ea998cc1bace09ca60255622385 100644 (file)
--- a/docbook/relaxng/docbook/src/pool.rnc
+++ b/docbook/relaxng/docbook/src/pool.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/qandaset.rnc b/docbook/relaxng/docbook/src/qandaset.rnc
index 65ef05f055ac53cc6fd9fc8f5abbe0fcad104f87..258aea5482f8b08b9e092429cc3fce8358a9956d 100644 (file)
--- a/docbook/relaxng/docbook/src/qandaset.rnc
+++ b/docbook/relaxng/docbook/src/qandaset.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/refentry.rnc b/docbook/relaxng/docbook/src/refentry.rnc
index b5ae63136b30b0d6a26719b3b1bb6c1e0b18f04c..29d4f589180921444637a46ba103b1c6ab1a02cb 100644 (file)
--- a/docbook/relaxng/docbook/src/refentry.rnc
+++ b/docbook/relaxng/docbook/src/refentry.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/refsect1.rnc b/docbook/relaxng/docbook/src/refsect1.rnc
index aa8b12c2c0da5898fd11535f21d587cd1c2c2b8d..1b24cd3742ee909f0c95aac2ece81cafa7ef0c00 100644 (file)
--- a/docbook/relaxng/docbook/src/refsect1.rnc
+++ b/docbook/relaxng/docbook/src/refsect1.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/sect1.rnc b/docbook/relaxng/docbook/src/sect1.rnc
index 5d34debfb030fa41e270369dca0e887e8fe91597..a054bdefea7fcf589b735b3e5d2e81561ffaed99 100644 (file)
--- a/docbook/relaxng/docbook/src/sect1.rnc
+++ b/docbook/relaxng/docbook/src/sect1.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/svg.rnc b/docbook/relaxng/docbook/src/svg.rnc
index 1ff8dbb91b04565dd395abfc201db5790f188845..7c5c9f60b31b0e98616343556a0d559dc97e6b71 100644 (file)
--- a/docbook/relaxng/docbook/src/svg.rnc
+++ b/docbook/relaxng/docbook/src/svg.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/tasks.rnc b/docbook/relaxng/docbook/src/tasks.rnc
index 9a276300ccabaf935788a77d9d7b231cba5224ef..fb4881e24b31926f71783f579c3ca623313c7e51 100644 (file)
--- a/docbook/relaxng/docbook/src/tasks.rnc
+++ b/docbook/relaxng/docbook/src/tasks.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/toc.rnc b/docbook/relaxng/docbook/src/toc.rnc
index e8fa1a61009833e191b53353ec976543524f8ffa..342ce666dc0aaa45b733f0c9d0f1fd26d32c02af 100644 (file)
--- a/docbook/relaxng/docbook/src/toc.rnc
+++ b/docbook/relaxng/docbook/src/toc.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/docbook/src/xlink.rnc b/docbook/relaxng/docbook/src/xlink.rnc
index 7494d835b806c1668bc175d0896873355d56cc54..ace232bb85ae733986dd91f8572cafce6aeac74a 100644 (file)
--- a/docbook/relaxng/docbook/src/xlink.rnc
+++ b/docbook/relaxng/docbook/src/xlink.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 1992-2005 HaL Computer Systems, Inc.,
 # O'Reilly & Associates, Inc., ArborText, Inc., Fujitsu Software

diff --git a/docbook/relaxng/tools/augment.xsl b/docbook/relaxng/tools/augment.xsl
index cbc8899a0fcbc42510e30ff68d722de0f56f2bcf..a06c9d3946f40af6acfd7c0445e80b08255f0bed 100644 (file)
--- a/docbook/relaxng/tools/augment.xsl
+++ b/docbook/relaxng/tools/augment.xsl
@@ -52,7 +52,7 @@
 
       <xsl:text>&#10;</xsl:text>
       <xsl:text>&#10;</xsl:text>
-      <xsl:comment> DocBook V5.0b2</xsl:comment>
+      <xsl:comment> DocBook V5.0b3</xsl:comment>
       <xsl:text>&#10;</xsl:text>
       <xsl:comment> See http://docbook.org/ns/docbook </xsl:comment>
       <xsl:text>&#10;</xsl:text>

diff --git a/docbook/relaxng/tools/db4-upgrade.xsl b/docbook/relaxng/tools/db4-upgrade.xsl
index 0a1c9a9ba6ecfd54de11d656dd14da7d5c3da648..9e49fc1fada3eccfa68b9df465ff1d59de1d5229 100644 (file)
--- a/docbook/relaxng/tools/db4-upgrade.xsl
+++ b/docbook/relaxng/tools/db4-upgrade.xsl
@@ -8,7 +8,7 @@
 
 <!--
 # ======================================================================
-# This file is part of DocBook V5.0b2
+# This file is part of DocBook V5.0b3
 #
 # Copyright 2005 Norman Walsh, Sun Microsystems, Inc., and the
 # Organization for the Advancement of Structured Information