Made some changes to the docsrc in order to streamline the doc

build a bit. Added a new authors.xml file, and changed the content
of the copyright.xml file into a real copyright content (the
license information is already in the legalnotice.xml and
warranty.xml files...)

diff --git a/xsl/docsrc/authors.xml b/xsl/docsrc/authors.xml
new file mode 100644 (file)
index 0000000..ee20325
--- /dev/null
+++ b/xsl/docsrc/authors.xml
@@ -0,0 +1,11 @@
+<authorgroup xmlns="http://docbook.org/ns/docbook"
+  version="5.0">
+  <author>
+    <personname>
+      <surname>Walsh</surname><firstname>Norman</firstname>
+    </personname>
+  </author>
+  <author>
+    <orgname>The DocBook Project</orgname>
+  </author>
+</authorgroup>

diff --git a/xsl/docsrc/copyright.xml b/xsl/docsrc/copyright.xml
index dff3ea7f215b8f2fc2344c137c131face3d6e390..31948ddceb880c42a0b01c350ecd0e4b19efdfcb 100644 (file)
--- a/xsl/docsrc/copyright.xml
+++ b/xsl/docsrc/copyright.xml
@@ -1,30 +1,19 @@
-<?xml version='1.0'?>
-<!DOCTYPE legalnotice
-  PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-  "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<legalnotice><title>Copyright</title>
-
-<para>Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation files
-(the <quote>Software</quote>), to deal in the Software without
-restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-</para>
-
-<para>The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.</para>
-
-<para>Except as contained in this notice, the names of individuals
-credited with contribution to this software shall not be used in
-advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the individuals
-in question.</para>
-
-<para>Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the version
-strings in any derived Software will be changed so that no possibility
-of confusion between the derived package and this Software will
-exist.</para>
-</legalnotice>
+<info xmlns="http://docbook.org/ns/docbook"
+  version="5.0">
+  <copyright>
+    <year>1999-2007</year>
+    <holder>Norman Walsh</holder>
+  </copyright>
+  <copyright>
+    <year>2003</year>
+    <holder>Jiří Kosek</holder>
+  </copyright>
+  <copyright>
+    <year>2004-2007</year>
+    <holder>Steve Ball</holder>
+  </copyright>
+  <copyright>
+    <year>2001-2007</year>
+    <holder>The DocBook Project</holder>
+  </copyright>
+</info>

diff --git a/xsl/docsrc/legalnotice.xml b/xsl/docsrc/legalnotice.xml
index d9f3ca8db9388285d4c29cd22f9a9bc342c38435..017a9ed97685fadcd67e03f24fde1bbb05cea2c3 100644 (file)
--- a/xsl/docsrc/legalnotice.xml
+++ b/xsl/docsrc/legalnotice.xml
@@ -1,4 +1,4 @@
-<legalnotice><title>Copyright Statement</title>
+<legalnotice id="copyright"><title>License</title>
 
 <para>Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files

diff --git a/xsl/docsrc/reference.dbk b/xsl/docsrc/reference.dbk
index 0352dc4fbc587f631df84add691c0e3390bed50a..5759526fab285d4d78d3c8dd9d8683ebd20b7168 100644 (file)
--- a/xsl/docsrc/reference.dbk
+++ b/xsl/docsrc/reference.dbk
@@ -1,252 +1,222 @@
-<book  xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-      xml:base="../docsrc/">
-  <bookinfo>
-    <title>DocBook XSL Stylesheet Reference Documentation</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-    <author><surname>Walsh</surname><firstname>Norman</firstname></author>
-    <copyright>
-    <year>1999-2007</year>
-    <holder>Norman Walsh</holder>
-    </copyright>
+<!-- * vim: set ft=docbk foldlevel=2: -->
+<set
+  xmlns="http://docbook.org/ns/docbook" version="5.0"
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:src="http://nwalsh.com/xmlns/litprog/fragment"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  xml:base="../docsrc/"
+  >
+  <title>DocBook XSL Stylesheets: Reference Documentation</title>
+  <info><releaseinfo role="meta">$Id$ </releaseinfo>
+    <xi:include href="./authors.xml"/>
+    <xi:include href="./copyright.xml" xpointer="xpointer(//*[local-name() = 'copyright'])"/>
     <xi:include href="./legalnotice.xml"/>
     <xi:include href="./warranty.xml"/>
-  </bookinfo>
-
-  <preface id="about">
-    <xi:include href="./reference.xml" xpointer="xpointer(/book/preface/node()[not(self::itemizedlist)])"/>
-    <itemizedlist>
-      <title>User documentation</title>
-      <listitem>
-        <para><xi:include
-        href="./html/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./fo/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./manpages/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./roundtrip/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./slides-html/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./slides-fo/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./website/docparam.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./pi/pi.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <itemizedlist>
-      <title>Developer documentation</title>
-      <listitem>
-        <para><xi:include
-        href="../lib/lib.xml"
-        xpointer="xpointer(/book/bookinfo/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./common/common.refsect1.xml"
-        xpointer="xpointer(/reference/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./refentry/refentry.refsect1.xml"
-        xpointer="xpointer(/reference/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./utility/utility.refsect1.xml"
-        xpointer="xpointer(/reference/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./fo/table.refsect1.xml"
-        xpointer="xpointer(/reference/title/node())"/></para>
-      </listitem>
-      <listitem>
-        <para><xi:include
-        href="./template/titlepage.refsect1.xml"
-        xpointer="xpointer(/reference/title/node())"/></para>
-      </listitem>
-    </itemizedlist>
-  </preface>
-
-  <part id="html">
-    <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="htmlintro">
-      <xi:include href="./html/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="fo">
-    <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="fointro">
-      <xi:include href="./fo/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="man">
-    <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="manintro">
-      <xi:include href="./manpages/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="roundtrip">
-    <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="roundtripintro">
-      <xi:include href="./roundtrip/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="slides-html">
-    <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="slideshtmlintro">
-      <xi:include href="./slides-html/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="slides-fo">
-    <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="slidesfointro">
-      <xi:include href="./slides-fo/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="website">
-    <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="websiteintro">
-      <xi:include href="./website/docparam.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="pi">
-    <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="piintro">
-      <xi:include href="./pi/pi.xml"
-                  xpointer="xpointer(/book/bookinfo/abstract/node())" />
-    </partintro>
-    <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="lib">
-    <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/bookinfo/title)" />
-    <partintro id="libintro">
-      <xi:include href="../lib/lib.xml"
-                  xpointer="xpointer(/book/preface/node())" />
-    </partintro>
-    <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/reference)" />
-  </part>
-
-  <part id="common">
-    <xi:include href="./common/common.refsect1.xml" xpointer="xpointer(/reference/title)" />
+    <abstract xml:id="about">
+      <title>About this document</title>
+      <para>This is generated reference documentation for the DocBook
+        XSL stylesheets, primarily documentation on the parameters you
+        can adjust to control the behavior of the stylesheets.
+        <note>
+          <para>This is purely reference documentation&#xa0;– not how-to
+            documentation. For a thorough step-by-step how-to guide to
+            publishing content using the DocBook XSL stylesheets, see
+            Bob Stayton’s <link 
+              xlink:href="http://www.sagehill.net/book-description.html"
+              >DocBook XSL: The Complete Guide</link>, available online
+            at <link
+              xlink:href="http://www.sagehill.net/docbookxsl/index.html"
+              >http://www.sagehill.net/docbookxsl/index.html</link>
+          </para>
+        </note>
+        This document is divided into two sets of references:
+        the first set provides user documentation; the second,
+        developer documentation.</para>
+    </abstract>
+  </info>
+  <book xml:id="user"><title>DocBook XSL Stylesheets: User Reference</title>
+    <info>
+      <abstract>
+        <para>This is generated reference documentation for all
+          user-configurable parameters in the DocBook XSL
+          stylesheets.
+          <note>
+            <para>This is purely reference documentation&#xa0;– not how-to
+              documentation. For a thorough step-by-step how-to guide to
+              publishing content using the DocBook XSL stylesheets, see
+              Bob Stayton’s <link 
+                xlink:href="http://www.sagehill.net/book-description.html"
+                >DocBook XSL: The Complete Guide</link>, available online
+              at <link
+                xlink:href="http://www.sagehill.net/docbookxsl/index.html"
+                >http://www.sagehill.net/docbookxsl/index.html</link>
+            </para>
+          </note>
+        </para>
+      </abstract>
+    </info>
+    <part xml:id="html">
+      <?dbhtml dir="html"?>
+      <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="htmlintro">
+        <xi:include href="./html/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./html/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="fo">
+      <?dbhtml dir="fo"?>
+      <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="fointro">
+        <xi:include href="./fo/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./fo/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="manpages">
+      <?dbhtml dir="manpages"?>
+      <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="manintro">
+        <xi:include href="./manpages/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./manpages/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="roundtrip">
+      <?dbhtml dir="roundtrip"?>
+      <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="roundtripintro">
+        <xi:include href="./roundtrip/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./roundtrip/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="slides-html">
+      <?dbhtml dir="slides-html"?>
+      <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="slideshtmlintro">
+        <xi:include href="./slides-html/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./slides-html/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="slides-fo">
+      <?dbhtml dir="slides-fo"?>
+      <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="slidesfointro">
+        <xi:include href="./slides-fo/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./slides-fo/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="website">
+      <?dbhtml dir="website"?>
+      <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="websiteintro">
+        <xi:include href="./website/docparam.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./website/docparam.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+  </book>
+  <book xml:id="developer"><title>DocBook XSL Stylesheets: Developer Reference</title>
+    <info>
+      <abstract>
+        <para>This is technical reference documentation for
+          developers using the DocBook XSL Stylesheets. It is not
+          intended to be user documentation, but is instead
+          provided for developers writing customization layers for
+          the stylesheets.</para>
+      </abstract>
+    </info>
+    <part xml:id="pi">
+      <?dbhtml dir="pi"?>
+      <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro xml:id="piintro">
+        <xi:include href="./pi/pi.xml"
+          xpointer="xpointer(/book/bookinfo/abstract/node())" />
+      </partintro>
+      <xi:include href="./pi/pi.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="lib">
+      <?dbhtml dir="lib"?>
+      <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/bookinfo/title)" />
+      <partintro id="libintro">
+        <xi:include href="../lib/lib.xml"
+          xpointer="xpointer(/book/preface/node())" />
+      </partintro>
+      <xi:include href="../lib/lib.xml" xpointer="xpointer(/book/reference)" />
+    </part>
+    <part xml:id="common">
+      <?dbhtml dir="common"?>
+      <xi:include href="./common/common.refsect1.xml" xpointer="xpointer(/reference/title)" />
 
       <xi:include href="./common/common.refsect1.xml"
-                  xpointer="xpointer(/reference/partintro)" />
+        xpointer="xpointer(/reference/partintro)" />
 
-    <reference id="commontemplates">
-      <title>Templates</title>
-      <xi:include
+      <reference xml:id="commontemplates">
+        <title>Templates</title>
+        <xi:include
           href="./common/common.refsect1.xml"
           xpointer="xpointer(/reference/refentry)" />
-    </reference>
-  </part>
-
-  <part id="refentry-meta">
-    <xi:include href="./refentry/refentry.refsect1.xml" xpointer="xpointer(/reference/title)" />
+      </reference>
+    </part>
+    <part xml:id="refentry">
+      <?dbhtml dir="refentry"?>
+      <xi:include href="./refentry/refentry.refsect1.xml" xpointer="xpointer(/reference/title)" />
 
       <xi:include href="./refentry/refentry.refsect1.xml"
-                  xpointer="xpointer(/reference/partintro)" />
+        xpointer="xpointer(/reference/partintro)" />
 
-    <reference id="refmetatemplates">
-      <title>Templates</title>
-      <xi:include
+      <reference xml:id="refmetatemplates">
+        <title>Templates</title>
+        <xi:include
           href="./refentry/refentry.refsect1.xml"
           xpointer="xpointer(/reference/refentry)" />
-    </reference>
-  </part>
-
-  <part id="utility">
-    <xi:include href="./utility/utility.refsect1.xml" xpointer="xpointer(/reference/title)" />
+      </reference>
+    </part>
+    <part xml:id="utility">
+      <?dbhtml dir="utility"?>
+      <xi:include href="./utility/utility.refsect1.xml" xpointer="xpointer(/reference/title)" />
 
       <xi:include href="./utility/utility.refsect1.xml"
-                  xpointer="xpointer(/reference/partintro)" />
+        xpointer="xpointer(/reference/partintro)" />
 
-    <reference id="utilitytemplates">
-      <title>Templates</title>
-      <xi:include
+      <reference xml:id="utilitytemplates">
+        <title>Templates</title>
+        <xi:include
           href="./utility/utility.refsect1.xml"
           xpointer="xpointer(/reference/refentry)" />
-    </reference>
-  </part>
-
-  <part id="fo-table">
-    <xi:include href="./fo/table.refsect1.xml" xpointer="xpointer(/reference/title)" />
+      </reference>
+    </part>
+    <part xml:id="fo-table">
+      <?dbhtml dir="fo"?>
+      <xi:include href="./fo/table.refsect1.xml" xpointer="xpointer(/reference/title)" />
 
       <xi:include href="./fo/table.refsect1.xml"
-                  xpointer="xpointer(/reference/partintro)" />
+        xpointer="xpointer(/reference/partintro)" />
 
-    <reference id="fotabletemplates">
-      <title>Templates</title>
-      <xi:include
+      <reference xml:id="fotabletemplates">
+        <title>Templates</title>
+        <xi:include
           href="./fo/table.refsect1.xml"
           xpointer="xpointer(/reference/refentry)" />
-    </reference>
-  </part>
-
-  <part id="titlepage">
-    <xi:include href="./template/titlepage.refsect1.xml" xpointer="xpointer(/reference/title)" />
+      </reference>
+    </part>
+    <part xml:id="template">
+      <?dbhtml dir="template"?>
+      <xi:include href="./template/titlepage.refsect1.xml" xpointer="xpointer(/reference/title)" />
 
       <xi:include href="./template/titlepage.refsect1.xml"
-                  xpointer="xpointer(/reference/partintro)" />
+        xpointer="xpointer(/reference/partintro)" />
 
-    <reference id="titlepagetemplates">
-      <title>Templates</title>
-      <xi:include
+      <reference xml:id="titlepagetemplates">
+        <title>Templates</title>
+        <xi:include
           href="./template/titlepage.refsect1.xml"
           xpointer="xpointer(/reference/refentry)" />
-    </reference>
-  </part>
-
-</book>
-
+      </reference>
+    </part>
+  </book>
+</set>

diff --git a/xsl/docsrc/warranty.xml b/xsl/docsrc/warranty.xml
index eca4aa27040fe1c0b2365a7c9ff3c16905d8cba1..99d230f2adcb9a01e42d71687fbbdaa9ec5ca832 100644 (file)
--- a/xsl/docsrc/warranty.xml
+++ b/xsl/docsrc/warranty.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE legalnotice
   PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
   "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<legalnotice><title>Warranty</title>
+<legalnotice id="warranty"><title>Warranty</title>
 <para>THE SOFTWARE IS PROVIDED <quote>AS IS</quote>,
 WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT
 LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR