From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 19 May 2009 13:41:24 +0000 (+0000)
Subject: Updated
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6625f2a546aa473f9d18e8248c5d054607d09a58;p=docbook-dsssl

Updated
---

diff --git a/docbook/relaxng/docbook/spec/bibliography.xml b/docbook/relaxng/docbook/spec/bibliography.xml
index 00538c722..24ac54b1a 100644
--- a/docbook/relaxng/docbook/spec/bibliography.xml
+++ b/docbook/relaxng/docbook/spec/bibliography.xml
@@ -14,8 +14,8 @@
 Jean Paoli, C. M. Sperberg-McQueen, <foreignphrase>et. al.</foreignphrase>,
 editors.
 <citetitle><link xlink:href="http://www.w3.org/TR/REC-xml">Extensible Markup
-Language (XML) 1.0 (Fourth Edition)</link></citetitle>.
-World Wide Web Consortium, 16 August 2006.
+Language (XML) 1.0 (Fifth Edition)</link></citetitle>.
+World Wide Web Consortium. 26 November 2008.
 </bibliomixed>
 
 <bibliomixed xml:id="xlink11"><abbrev>XLink11</abbrev>Steven DeRose, Eve Maler,
@@ -44,7 +44,7 @@ Norman Walsh and Leonard Meullner.
 The Definitive Guide</link>.</citetitle>
 </bibliomixed>
 
-<bibliomixed xml:id="iso8879"><abbrev>SGML</abbrev>JTC 1, SC 34.
+<bibliomixed xml:id="iso8879"><abbrev>SGML</abbrev>ISO/IEC JTC 1, SC 34.
 <citetitle>ISO 8879:1986
 Information processing -- Text and office systems --
 Standard Generalized Markup Language (SGML)</citetitle>. 1986.
@@ -67,4 +67,16 @@ World Wide Web Consortium, 2000.
 Acedemia Sinica Computing Centre. 2001, 2001.
 </bibliomixed>
 
+<bibliomixed xml:id="iso19757-2"><abbrev>RELAX NG</abbrev>ISO/IEC JTC 1, SC 34.
+<citetitle>ISO 19757-2:2008(E)
+Information technology — Document Schema Definition Language (DSDL) —
+Part 2: Regular-grammare-based validation — RELAX NG</citetitle>. 2008.
+</bibliomixed>
+
+<bibliomixed xml:id="iso19757-3"><abbrev>Schematron</abbrev>ISO/IEC JTC 1, SC 34.
+<citetitle>ISO 19757-3:2006(E)
+Information technology — Document Schema Definition Languages (DSDL) —
+Part 3: Rule-based validation — Schematron</citetitle>. 2006.
+</bibliomixed>
+
 </bibliography>
diff --git a/docbook/relaxng/docbook/spec/docbook.xml b/docbook/relaxng/docbook/spec/docbook.xml
index 179d421c8..d3b6ecaa6 100644
--- a/docbook/relaxng/docbook/spec/docbook.xml
+++ b/docbook/relaxng/docbook/spec/docbook.xml
@@ -18,7 +18,7 @@ $Id$
 <!-- productVersion --> <productnumber>5.0</productnumber>
 <!-- artifactType       spec; what else? :-) -->
 <!-- stage -->          <releaseinfo role="stage">cs</releaseinfo>
-<!-- revision -->       <biblioid class="pubsnumber">01</biblioid>
+<!-- revision -->       <biblioid class="pubsnumber">02</biblioid>
 <!-- language           en; see /article/@xml:lang -->
 <!-- form               xml -->
 
@@ -36,10 +36,10 @@ $Id$
     <firstname>Norman</firstname>
     <surname>Walsh</surname>
   </personname>
+  <email>norman.walsh@marklogic.com</email>
   <affiliation>
-    <shortaffil>Sun</shortaffil>
-    <orgname>Sun Microsystems, Inc.</orgname>
-    <address><email>Norman.Walsh@Sun.COM</email></address>
+    <shortaffil>Mark Logic</shortaffil>
+    <orgname>Mark Logic Corporation</orgname>
   </affiliation>
 </othercredit>
 
@@ -49,18 +49,20 @@ $Id$
     <firstname>Norman</firstname>
     <surname>Walsh</surname>
   </personname>
+  <email>norman.walsh@marklogic.com</email>
   <affiliation>
-    <shortaffil>Sun</shortaffil>
-    <orgname>Sun Microsystems, Inc.</orgname>
-    <address><email>Norman.Walsh@Sun.COM</email></address>
+    <shortaffil>Mark Logic</shortaffil>
+    <orgname>Mark Logic Corporation</orgname>
   </affiliation>
 </editor>
 </authorgroup>
 
-<pubdate>2008-08-12</pubdate>
+<pubdate>2009-05-19</pubdate>
 
 <bibliomisc role="namespace">http://docbook.org/ns/docbook</bibliomisc>
 
+<bibliorelation type="replaces" condition="online"
+    xlink:href="http://docbook.org/specs/docbook-5.0-spec-cs-01.html"/>
 <bibliorelation type="replaces" condition="online"
     xlink:href="http://docbook.org/specs/docbook-5.0-spec-cd-04.html"/>
 <bibliorelation type="replaces" condition="online"
@@ -68,6 +70,8 @@ $Id$
 <bibliorelation type="replaces" condition="online"
     xlink:href="http://docbook.org/specs/docbook-5.0CR7-spec-wd-01.html"/>
 
+<bibliorelation type="replaces" condition="print"
+    xlink:href="http://docbook.org/specs/docbook-5.0-spec-cs-01.pdf"/>
 <bibliorelation type="replaces" condition="print"
     xlink:href="http://docbook.org/specs/docbook-5.0-spec-cd-04.pdf"/>
 <bibliorelation type="replaces" condition="print"
@@ -85,7 +89,7 @@ $Id$
 <copyright>
 <year>2001</year><year>2002</year><year>2003</year>
 <year>2004</year><year>2005</year><year>2006</year>
-<year>2007</year><year>2008</year>
+<year>2007</year><year>2008</year><year>2009</year>
 <holder>The Organization for the Advancement of Structured Information
 Standards [OASIS]. All Rights Reserved. </holder></copyright>
 
@@ -217,7 +221,8 @@ and software (though it is by no means limited to these applications).
 <para>The <link xlink:href="mailto:docbook-tc@oasis-open.org">DocBook
 Technical Committee</link> maintains the DocBook schema. Starting
 with V5.0, DocBook is normatively available as a <xref
-linkend="relaxng"/> Schema (with some additional Schematron assertions).
+linkend="iso19757-2"/> Schema (with some additional
+<xref linkend="iso19757-3"/> assertions).
 W3C XML Schema and Document Type
 Definition (DTD) versions are also available.
 </para>
@@ -256,9 +261,11 @@ document.</para>
 <title>Normative References</title>
 
 <bibliolist>
-<bibliomixed xml:id="relaxng"/>
 <bibliomixed xml:id="xml-rec"/>
 <bibliomixed xml:id="xlink11"/>
+<bibliomixed xml:id="xmlschema-2"/>
+<bibliomixed xml:id="iso19757-2"/>
+<bibliomixed xml:id="iso19757-3"/>
 <bibliomixed xml:id="rfc2119"/>
 <bibliomixed xml:id="rfc3023"/>
 <bibliomixed xml:id="bib.docbooktdg5"/>
@@ -271,8 +278,6 @@ document.</para>
 <bibliolist>
 <bibliomixed xml:id="iso8879"/>
 <bibliomixed xml:id="xmlschema-1"/>
-<bibliomixed xml:id="xmlschema-2"/>
-<bibliomixed xml:id="schematron2000"/>
 </bibliolist>
 </section>
 </section>
@@ -745,6 +750,36 @@ have valid DocBook V5.0 representations.
 </section>
 </section>
 
+<section xml:id="s.identifying">
+<title>Identifying DocBook Documents and Schemas</title>
+
+<para>Historically, when DocBook was defined by a DTD, DocBook
+documents could be identified by the presence of standard public
+and/or system identifiers in the document type declaration. RELAX NG,
+the normative schema language for DocBook V5.0, does not provide
+any equivalent mechanism.</para>
+
+<para>For systems that can make use of public identifiers, e.g., systems
+where the informative DTD is being used, the following
+public identifier can be used for DocBook V5.0:
+“<literal>-//OASIS//DTD DocBook V5.0//EN//XML</literal>”.</para>
+</section>
+
+<section xml:id="s.conformance">
+<title>Conformance</title>
+
+<para>This specification normatively defines DocBook V5.0 with a RELAX NG
+grammar and a set of Schematron assertions. A conformant DocBook V5.0 document
+<glossterm>must</glossterm> be valid according to both the grammar and the
+assertions.</para>
+
+<para>The reference documentation describes additional constraints and
+processing expectations. A conformant DocBook V5.0 document
+<glossterm>should</glossterm> respect those constraints and anticipate
+those processing expectations.</para>
+
+</section>
+
 <section xml:id="s.relnotes">
 <title>Release Notes</title>
 
@@ -943,7 +978,7 @@ this specification and are gratefully acknowledged:</para>
 <listitem><para>Larry Rowland, Hewlett-Packard</para></listitem>
 <listitem><para>Michael Smith, Individual</para></listitem>
 <listitem><para>Robert Stayton, Individual (Secretary)</para></listitem>
-<listitem><para>Norman Walsh, Sun Microsystems (Chair, Editor)</para></listitem>
+<listitem><para>Norman Walsh, Mark Logic Corporation (Chair, Editor)</para></listitem>
 </itemizedlist>
 </appendix>
 
diff --git a/docbook/relaxng/docbook/spec/html.xsl b/docbook/relaxng/docbook/spec/html.xsl
index fd68c1683..ad17de562 100644
--- a/docbook/relaxng/docbook/spec/html.xsl
+++ b/docbook/relaxng/docbook/spec/html.xsl
@@ -145,11 +145,8 @@ div.toc p b {
 	    <xsl:text>s</xsl:text>
 	  </xsl:if>
 	</dt>
-	<xsl:for-each select="db:othercredit[@otherclass = 'chair']">
-	  <dd>
-	    <xsl:apply-templates select="db:personname"/>
-	  </dd>
-	</xsl:for-each>
+	<xsl:apply-templates select="db:othercredit[@otherclass = 'chair']"
+			     mode="spec.titlepage"/>
 
 	<xsl:variable name="editors" select="db:authorgroup/db:editor|db:editor"/>
 	<dt>
@@ -158,11 +155,7 @@ div.toc p b {
 	    <xsl:text>s</xsl:text>
 	  </xsl:if>
 	</dt>
-	<xsl:for-each select="$editors">
-	  <dd>
-	    <xsl:apply-templates select="db:personname"/>
-	  </dd>
-	</xsl:for-each>
+	<xsl:apply-templates select="$editors" mode="spec.titlepage"/>
 
 	<xsl:variable name="replaces" select="db:bibliorelation[@type='replaces']"/>
 	<xsl:variable name="supersedes" select="db:bibliorelation[@othertype='supersedes']"/>
@@ -227,6 +220,30 @@ div.toc p b {
   </div>
 </xsl:template>
 
+<xsl:template match="db:editor|db:editor|db:othercredit" mode="spec.titlepage">
+  <dd>
+    <xsl:apply-templates select="db:personname" mode="spec.titlepage"/>
+    <xsl:if test="db:affiliation/db:orgname">
+      <xsl:text>, </xsl:text>
+      <span class="affiliation">
+	<xsl:apply-templates select="db:affiliation/db:orgname"/>
+      </span>
+    </xsl:if>
+    <xsl:if test="db:email">
+      <xsl:text> </xsl:text>
+      <xsl:apply-templates select="db:email"/>
+    </xsl:if>
+  </dd>
+</xsl:template>
+
+<xsl:template match="db:personname" mode="spec.titlepage">
+  <span class="personname">
+    <xsl:apply-templates select="db:firstname"/>
+    <xsl:text> </xsl:text>
+    <xsl:apply-templates select="db:surname"/>
+  </span>
+</xsl:template>
+
 <xsl:template match="db:abstract|db:legalnotice">
   <xsl:apply-templates/>
 </xsl:template>
@@ -249,163 +266,3 @@ div.toc p b {
 </xsl:template>
 
 </xsl:stylesheet>
-
-<!--
-<div class="notices">
-<h2>Notices</h2>
-<p>Copyright &copy; OASIS&reg; 2008. All Rights Reserved.</p>
-
-<p>All capitalized terms in the following text have the meanings
-assigned to them in the OASIS Intellectual Property Rights Policy (the
-&quot;OASIS IPR Policy&quot;). The full Policy may be found at the
-OASIS website.</p>
-
-<p>This document and translations of it may be copied and furnished to
-others, and derivative works that comment on or otherwise explain it
-or assist in its implementation may be prepared, copied, published,
-and distributed, in whole or in part, without restriction of any kind,
-provided that the above copyright notice and this section are included
-on all such copies and derivative works. However, this document itself
-may not be modified in any way, including by removing the copyright
-notice or references to OASIS, except as needed for the purpose of
-developing any document or deliverable produced by an OASIS Technical
-Committee (in which case the rules applicable to copyrights, as set
-forth in the OASIS IPR Policy, must be followed) or as required to
-translate it into languages other than English. </p>
-
-<p>The limited permissions granted above are perpetual and will not be
-revoked by OASIS or its successors or assigns. </p>
-
-<p>This document and the information contained herein is provided on
-an &quot;AS IS&quot; basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
-THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY
-IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR
-PURPOSE. </p>
-
-<p>OASIS requests that any OASIS Party or any other party that
-believes it has patent claims that would necessarily be infringed by
-implementations of this OASIS Committee Specification or OASIS
-Standard, to notify OASIS TC Administrator and provide an indication
-of its willingness to grant patent licenses to such patent claims in a
-manner consistent with the IPR Mode of the OASIS Technical Committee
-that produced this specification.</p>
-
-<p>OASIS invites any party to contact the OASIS TC Administrator if it
-is aware of a claim of ownership of any patent claims that would
-necessarily be infringed by implementations of this specification by a
-patent holder that is not willing to provide a license to such patent
-claims in a manner consistent with the IPR Mode of the OASIS Technical
-Committee that produced this specification. OASIS may include such
-claims on its website, but disclaims any obligation to do so.</p>
-
-<p>OASIS takes no position regarding the validity or scope of any
-intellectual property or other rights that might be claimed to pertain
-to the implementation or use of the technology described in this
-document or the extent to which any license under such rights might or
-might not be available; neither does it represent that it has made any
-effort to identify any such rights. Information on OASIS' procedures
-with respect to rights in any document or deliverable produced by an
-OASIS Technical Committee can be found on the OASIS website. Copies of
-claims of rights made available for publication and any assurances of
-licenses to be made available, or the result of an attempt made to
-obtain a general license or permission for the use of such proprietary
-rights by implementers or users of this OASIS Committee Specification
-or OASIS Standard, can be obtained from the OASIS TC Administrator.
-OASIS makes no representation that any information or list of
-intellectual property rights will at any time be complete, or that any
-claims in such list are, in fact, Essential Claims.</p>
-
-<p>The names "OASIS", [insert specific trademarked names,
-abbreviations, etc. here] are trademarks of <a
-href="http://www.oasis-open.org">OASIS</a>, the owner and developer of
-this specification, and should be used only to refer to the
-organization and its official outputs. OASIS welcomes reference to,
-and implementation and use of, specifications, while reserving the
-right to enforce its marks against misleading uses. Please see <a
-href="http://www.oasis-open.org/who/trademark.php">http://www.oasis-open.org/who/trademark.php</a>
-for above guidance.</p>
-</div>
-</div>
-
-<p class="heading1">Table of Contents</p>
-<p>[build table of contents here. Should list at least 3 levels (sections numbered x.x.x) which are hyperlinked to the actual section.] </p>
-<p class="titlepageinfodescription">1.0 <a href="#A1">Introduction</a></p>
-<p class="titlepageinfodescription">1.1 <a href="#A1-1"> Terminology</a></p>
-<p class="titlepageinfodescription">1.2 <a href="#A1-2">Normative References</a></p>
-
-<p class="titlepageinfodescription">1.3 <a href="#A1-3">Non-Normative References</a></p>
-<p class="titlepageinfodescription">2.0 <a href="#A2">[Section title]</a></p>
-<p class="titlepageinfodescription">#.0 <a href="#A9">Conformance</a></p>
-<p class="titlepageinfodescription">A. <a href="#AA">Acknowledgements</a></p>
-<p class="titlepageinfodescription">B. <a href="#AB">[Non-normative text] </a></p>
-<p class="titlepageinfodescription">C. <a href="#AC">Revision History</a> </p>
-
-<div>
-<p class="heading1"><a name="A1" id="A1"></a>1. Introduction</p>
-<p>[All text is normative unless otherwise labeled.] </p>
-<div>
-<p class="heading2"><a name="A1-1" id="A1-1"></a>1.1 Terminology</p>
-<p> The key words &ldquo;MUST&rdquo;, &ldquo;MUST NOT&rdquo;, &ldquo;REQUIRED&rdquo;, &ldquo;SHALL&rdquo;, &ldquo;SHALL NOT&rdquo;, &ldquo;SHOULD&rdquo;, &ldquo;SHOULD NOT&rdquo;, &ldquo;RECOMMENDED&rdquo;, &ldquo;MAY&rdquo;, and &ldquo;OPTIONAL&rdquo;  are to be interpreted as described in [<a href="#rfc2119" >RFC2119</a>].</p>
-
-</div>
-<div>
-<p class="heading2"> <a name="A1-2" id="A1-2"></a>1.2 Normative References</p>
-<p class="refterm"><a name="rfc2119" id="rfc2119"> [RFC2119]</a> </p>
-<p class="ref">S. Bradner, <em>Key words for use in RFCs to Indicate Requirement Levels</em>, <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>, IETF RFC 2119, March 1997.</p>
-<p class="refterm"><a name="insert" id="insert"> [Reference]</a> </p>
-
-<p class="ref">[Full reference citation]</p></div>
-<div>
-<p class="heading2"> <a name="A1-3" id="A1-3"></a>1.3 Non-Normative References</p>
-<p class="refterm"><a name="insert2" id="insert2"> [Reference]</a> </p>
-<p class="ref">[Full reference citation]</p></div>
-</div>
-<div>
-<p class="heading1"><a name="A2" id="A2"></a>2. Section Title</p>
-<p>[body of standard goes here] </p></div>
-
-<div>
-<p class="heading1"><a name="A9" id="A9"></a>#. Conformance</p>
-<p>[conformance clauses/statements go here] </p></div>
-<div>
-<p class="appendixheading1"><a name="AA" id="AA"></a>Appendix A. Acknowledgements</p>
-<p>The following individuals have participated in the creation of this specification and are gratefully acknowledged:</p>
-<span class="titlepageinfo">Participants:</span>
-<p>[list of acknowledgements as determined by Technical Committee chair(s)]</p></div>
-<div>
-<p class="appendixheading1"><a name="AB" id="AB"></a>Appendix B. Non-Normative Text </p>
-
-<p>[any additional appendices go here]</p>
-<p>&nbsp;</p></div>
-<div>
-<p class="appendixheading1"><a name="AC" id="AC"></a>Appendix C. Revision History </p>
-<p>[optional; should NOT be included in OASIS Standards]</p>
-<table width="600" border="1">
-  <tr>
-    <th scope="col">Revision</th>
-    <th scope="col">Date</th>
-
-    <th scope="col">Editor</th>
-    <th scope="col">Changes Made </th>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</div>
-
-</body>
-</html>
--->