DocBook NG: The Bourbon Release

diff --git a/docbook/relaxng/Makefile b/docbook/relaxng/Makefile
index a648d2746bbd8986fab303b1daa4408470848eaf..49f88fdd3b5ff525465c17134841c8b04b253f2d 100644 (file)
--- a/docbook/relaxng/Makefile
+++ b/docbook/relaxng/Makefile
@@ -23,7 +23,7 @@ tests:
 html: docbook-rng.xml
        xsltproc tools/html.xsl $<
 
-docbook-rng.xml: docbook.rng tools/rngdocxml.xsl
+docbook-rng.xml: docbook.rng tools/rngdocxml.xsl tools/rngdocxml-multipass.xsl
        tools/makedoc $< $@
 
 #      xsltproc -output $@ tools/rngdocxml.xsl $<

diff --git a/docbook/relaxng/src/bibliography.rnc b/docbook/relaxng/src/bibliography.rnc
index d6ae641a20d556ab421e23dcffcef5b42d0d61d8..df5db2da0bff707e600fb86a8f6fb9242c0b4287 100644 (file)
--- a/docbook/relaxng/src/bibliography.rnc
+++ b/docbook/relaxng/src/bibliography.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/callouts.rnc b/docbook/relaxng/src/callouts.rnc
index 930b4b7d2db2990c03caa0faf2cbe41f2f2f9994..fba44e56f1a1e946e1ebbd47a8c2e8735e6edcaf 100644 (file)
--- a/docbook/relaxng/src/callouts.rnc
+++ b/docbook/relaxng/src/callouts.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/calstbl.rnc b/docbook/relaxng/src/calstbl.rnc
index d6d4023b409b0ea7d63f6a82ba201ce9272702ce..7308fd7196c29b887829bb8d016ddeb1ef1425fe 100644 (file)
--- a/docbook/relaxng/src/calstbl.rnc
+++ b/docbook/relaxng/src/calstbl.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/docbook.rnc b/docbook/relaxng/src/docbook.rnc
index cfc19659e6a858036012efe8db951697045bedb8..64c33ba5044ab62f0ba885e228a81eb12e7b54e5 100644 (file)
--- a/docbook/relaxng/src/docbook.rnc
+++ b/docbook/relaxng/src/docbook.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/ebnf.rnc b/docbook/relaxng/src/ebnf.rnc
index 43dc8a70d4fadc0b36c85dec80d7deda3df017bd..2fca4b4bae8a4f98a05296dd70575b0da2c032eb 100644 (file)
--- a/docbook/relaxng/src/ebnf.rnc
+++ b/docbook/relaxng/src/ebnf.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/glossary.rnc b/docbook/relaxng/src/glossary.rnc
index 642c06fbd95b7791d0b59d5126e51e0636329941..776bc543d87548b2b864b24e3f9b6750fe94f117 100644 (file)
--- a/docbook/relaxng/src/glossary.rnc
+++ b/docbook/relaxng/src/glossary.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/hier.rnc b/docbook/relaxng/src/hier.rnc
index f85044dc42257c3dc8cd8c734f9011788b1d9311..bed12118ab7c8610cbf25c0dc11c30a9254806ad 100644 (file)
--- a/docbook/relaxng/src/hier.rnc
+++ b/docbook/relaxng/src/hier.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/htmlform.rnc b/docbook/relaxng/src/htmlform.rnc
index cb73f5562c5cd2909ccf04c8fa5f9cbd9280b86a..2de915d1925fd1feb2388598707ab196097aaf85 100644 (file)
--- a/docbook/relaxng/src/htmlform.rnc
+++ b/docbook/relaxng/src/htmlform.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/htmltbl.rnc b/docbook/relaxng/src/htmltbl.rnc
index 69b493a29f3a56576d001d1f3a6e3fee7bce19c8..dcc10cbe29713bf5a2316390e52fd00b14b98727 100644 (file)
--- a/docbook/relaxng/src/htmltbl.rnc
+++ b/docbook/relaxng/src/htmltbl.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/index.rnc b/docbook/relaxng/src/index.rnc
index 5e1c56fd10ad08d0c5788b53875816f4d662ae0e..fb3bf7a0cd28fecb211f7c5ab32af3ef9b6c4394 100644 (file)
--- a/docbook/relaxng/src/index.rnc
+++ b/docbook/relaxng/src/index.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/mathml.rnc b/docbook/relaxng/src/mathml.rnc
index 044f07f46f0e4661ed4f53da4b0e3e988fd178aa..3af3d1103b0bf82323eb0cf2d9e18375abc808e4 100644 (file)
--- a/docbook/relaxng/src/mathml.rnc
+++ b/docbook/relaxng/src/mathml.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/msgset.rnc b/docbook/relaxng/src/msgset.rnc
index a27fb349d846734054f780b336c96d50d11fd676..bc51cf77b832928184c36ad9dcf532a3cf7250a4 100644 (file)
--- a/docbook/relaxng/src/msgset.rnc
+++ b/docbook/relaxng/src/msgset.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/pool.rnc b/docbook/relaxng/src/pool.rnc
index 634065e0dabb1e8c88a2a8a722c31ad8f671bbe5..ebd0b7523956f06eae1a5e7fe1b111e39ed22140 100644 (file)
--- a/docbook/relaxng/src/pool.rnc
+++ b/docbook/relaxng/src/pool.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/qandaset.rnc b/docbook/relaxng/src/qandaset.rnc
index 79738dd99c0c9c5b9ced3549090cf1f88cb641e1..88e78d6ed6ae0c04b1f18b6997d05d1aecf01f03 100644 (file)
--- a/docbook/relaxng/src/qandaset.rnc
+++ b/docbook/relaxng/src/qandaset.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/refentry.rnc b/docbook/relaxng/src/refentry.rnc
index d5dcba420dc0ba81b9d03d859d5a7c295ff79e33..4ea6162456ccdd495a694e4027b1bd1b405add3c 100644 (file)
--- a/docbook/relaxng/src/refentry.rnc
+++ b/docbook/relaxng/src/refentry.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/svg.rnc b/docbook/relaxng/src/svg.rnc
index 3194f93200611275c7f1c7b405b10e837a130a8d..9dfa8b6ddb85b3f74589b1206d981032a10248e3 100644 (file)
--- a/docbook/relaxng/src/svg.rnc
+++ b/docbook/relaxng/src/svg.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/tasks.rnc b/docbook/relaxng/src/tasks.rnc
index 55cafd13a593c4e543926e90457ac85a6853fd5d..9df52aed4e94cb35901179914e6fabae3897946c 100644 (file)
--- a/docbook/relaxng/src/tasks.rnc
+++ b/docbook/relaxng/src/tasks.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/src/toc.rnc b/docbook/relaxng/src/toc.rnc
index 08e0c37cd31ba17274612127bf993f441bd76636..60196260e5e5df805378814c41c9c2864ad1bf22 100644 (file)
--- a/docbook/relaxng/src/toc.rnc
+++ b/docbook/relaxng/src/toc.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/tests/customizations/dbastro.rnc b/docbook/relaxng/tests/customizations/dbastro.rnc
index 37c3f71fe3baec3f8ca9e1e1bf03a4b9a91be83b..c39a6cb73691ba4d3c853e78d55888739729771a 100644 (file)
--- a/docbook/relaxng/tests/customizations/dbastro.rnc
+++ b/docbook/relaxng/tests/customizations/dbastro.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/tests/customizations/dbsmall.rnc b/docbook/relaxng/tests/customizations/dbsmall.rnc
index 25ea3402b0ef73f577303993a32d68e5440fc4b2..b9cdff2bf27ccb214a5e39f125d67da2f95d653a 100644 (file)
--- a/docbook/relaxng/tests/customizations/dbsmall.rnc
+++ b/docbook/relaxng/tests/customizations/dbsmall.rnc
@@ -1,4 +1,4 @@
-# This file is part of DocBook NG: The "Absinthe" Release.
+# This file is part of DocBook NG: The "Bourbon" Release.
 
 # This schema is a "work-in-progress". It validates a DocBook-like grammar that
 # may, in some incarnation, form the basis for DocBook V.next. Or it may not.

diff --git a/docbook/relaxng/tests/ng-tests/bibliolist.001.xml b/docbook/relaxng/tests/ng-tests/bibliolist.001.xml
index 8cdbc7a5d8b5690ae22075db95be89b1ffecc1e9..64bb6fd37820e52e2a600bb15b6167f70f4cff36 100644 (file)
--- a/docbook/relaxng/tests/ng-tests/bibliolist.001.xml
+++ b/docbook/relaxng/tests/ng-tests/bibliolist.001.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<article xmlns="http://docbook.org/docbook-ng/absinthe" version="absinthe">
+<article xmlns="http://docbook.org/docbook-ng" version="bourbon">
 <info><title>Unit Test: bibliolist.001</title>
 
 <releaseinfo role="CVS">$Id$</releaseinfo>

diff --git a/docbook/relaxng/tools/augment.xsl b/docbook/relaxng/tools/augment.xsl
index 510a581c4b8332a9b088a7a32004f1c1f6430f31..5a5e22abff46a3e3683879039532ae3385344471 100644 (file)
--- a/docbook/relaxng/tools/augment.xsl
+++ b/docbook/relaxng/tools/augment.xsl
@@ -4,7 +4,7 @@
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:ctrl="http://nwalsh.com/xmlns/schema-control/"
                xmlns:s="http://www.ascc.net/xml/schematron"
-               xmlns:db="http://docbook.org/docbook-ng/absinthe"
+               xmlns:db="http://docbook.org/docbook-ng"
                 exclude-result-prefixes="exsl ctrl rng s db"
                 version="1.0">
 
@@ -40,14 +40,14 @@
 
       <!-- Make sure the ns is specified -->
       <xsl:attribute name="ns">
-       <xsl:value-of select="'http://docbook.org/docbook-ng/absinthe'"/>
+       <xsl:value-of select="'http://docbook.org/docbook-ng'"/>
       </xsl:attribute>
 
       <xsl:copy-of select="@*"/>
 
       <xsl:text>&#10;</xsl:text>
       <xsl:text>&#10;</xsl:text>
-      <xsl:comment> DocBook NG: The "Absinthe" Release </xsl:comment>
+      <xsl:comment> DocBook NG: The "Bourbon" Release </xsl:comment>
       <xsl:text>&#10;</xsl:text>
       <xsl:comment> See http://docbook.org/docbook-ng/ </xsl:comment>
       <xsl:text>&#10;</xsl:text>

diff --git a/docbook/relaxng/tools/db4-upgrade.xsl b/docbook/relaxng/tools/db4-upgrade.xsl
index 8d7dde30bd850b663fdb6a33b14912801ae833bb..53f38eb116f2612e6f99a7816d5f027532f574f7 100644 (file)
--- a/docbook/relaxng/tools/db4-upgrade.xsl
+++ b/docbook/relaxng/tools/db4-upgrade.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:exsl="http://exslt.org/common"
-               xmlns:db = "http://docbook.org/docbook-ng/absinthe"
+               xmlns:db = "http://docbook.org/docbook-ng"
                 exclude-result-prefixes="exsl db"
                 version="1.0">
 
@@ -663,9 +663,9 @@
   <xsl:choose>
     <xsl:when test="namespace-uri(.) = ''">
       <xsl:element name="{local-name(.)}"
-                  namespace="http://docbook.org/docbook-ng/absinthe">
+                  namespace="http://docbook.org/docbook-ng">
        <xsl:if test="not(parent::*)">
-         <xsl:attribute name="version">absinthe</xsl:attribute>
+         <xsl:attribute name="version">bourbon</xsl:attribute>
        </xsl:if>
        <xsl:copy-of select="@*"/>
        <xsl:apply-templates mode="addNS"/>
@@ -674,7 +674,7 @@
     <xsl:otherwise>
       <xsl:copy>
        <xsl:if test="not(parent::*)">
-         <xsl:attribute name="version">absinthe</xsl:attribute>
+         <xsl:attribute name="version">bourbon</xsl:attribute>
        </xsl:if>
        <xsl:copy-of select="@*"/>
        <xsl:apply-templates mode="addNS"/>

diff --git a/docbook/relaxng/tools/html.xsl b/docbook/relaxng/tools/html.xsl
index af00f7c2c290d26e3d7267d3bcfff41e4a50bc9d..9f2f29e4a2d8a318e2c6ec6586147f0f7227cef8 100644 (file)
--- a/docbook/relaxng/tools/html.xsl
+++ b/docbook/relaxng/tools/html.xsl
@@ -15,7 +15,7 @@
   <xsl:param name="title" select="'anonymous'"/>
   <xsl:param name="base.dir" select="'html/'"/>
   <xsl:param name="stylesheet" select="'html.css'"/>
-  <xsl:param name="ng-release" select="'Absinthe'"/>
+  <xsl:param name="ng-release" select="'Bourbon'"/>
 
   <xsl:output method="html"/>