Merge pull request #612 from ndw/master

Bring master branch in line with last call

src/main/xml/bibliography.xml

@@ -17,6 +17,20 @@ Alex Milowski, James Fuller, and Norman Walsh editors.
 W3C Working Draft 5 November 2013.
 </bibliomixed>
 
+<!-- N.B. THESE ARE POINTERS TO THE LC! -->
+<bibliomixed xml:id="xproc31"><abbrev>XProc 3.1</abbrev>
+<citetitle xlink:href="https://spec.xproc.org/lastcall-2024-08/head/xproc/">XProc 3.1:
+An XML Pipeline Language</citetitle>.
+Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors.
+</bibliomixed>
+
+<!-- N.B. THESE ARE POINTERS TO THE LC! -->
+<bibliomixed xml:id="steps31"><abbrev>Steps 3.1</abbrev>
+<citetitle xlink:href="https://spec.xproc.org/lastcall-2024-08/head/steps/">XProc 3.1: Standard
+Step Library</citetitle>.
+Norman Walsh, Achim Berndzen, Gerrit Imsieke and Erik Siegel, editors.
+</bibliomixed>
+
 <bibliomixed xml:id="xproc20"><abbrev>XProc 2.0</abbrev>
 <citetitle xlink:href="https://www.w3.org/TR/xproc20/">XProc 2.0:
 An XML Pipeline Language</citetitle>.

step-file/src/main/xml/specification.xml

@@ -6,13 +6,13 @@
                xmlns:xi="http://www.w3.org/2001/XInclude"
                xmlns:xlink="http://www.w3.org/1999/xlink"
                xml:id='step-file'
-               class="ed" role="step"
+               class="wd" role="step"
                version="5.0-extension w3c-xproc">
 <info>
-<title>XProc 3.0: file steps</title>
+<title>XProc 3.1: file steps</title>
 <!-- defaults to date formatted <pubdate>2014-12-18</pubdate> -->
 <copyright><year>2018</year><year>2019</year><year>2020</year>
-<holder>the Contributors to the XProc 3.0 Standard Step Library
+<holder>the Contributors to the XProc 3.1 Standard Step Library
 specifications</holder>
 </copyright>
 
@@ -39,7 +39,7 @@ specifications</holder>
 <abstract>
 <para>This specification describes the file related steps
 for
-<citetitle>XProc 3.0: An XML Pipeline Language</citetitle>.</para>
+<citetitle>XProc 3.1: An XML Pipeline Language</citetitle>.</para>
 </abstract>
 
 <legalnotice xml:id="sotd" role="status">
@@ -60,6 +60,11 @@ for
   (<link xlink:href="mailto:[email protected]?subject=subscribe">subscribe</link>,
   <link xlink:href="https://lists.w3.org/Archives/Public/xproc-dev/">archives</link>).
   </para>
+
+<note role="editorial">
+<para>This draft is a “last call” draft. This version is stable and will not be updated.
+</para>
+</note>
 </legalnotice>
 </info>
 
@@ -73,9 +78,8 @@ these steps may be found in
 </para>
 
 <para>Familarity with the
-general nature of <biblioref linkend="xproc30"/>
-steps is assumed; for background details, see
-<biblioref linkend="xproc30-steps"/>.</para>
+general nature of <biblioref linkend="xproc31"/>
+steps is assumed.</para>
 
 <para>Some filesystems and some operating systems support “special” files. These
 may be interfaces to underlying block or character devices, or represent file
@@ -922,8 +926,7 @@ failure causes the entire pipeline to fail.</para>
 <appendix xml:id="references">
 <title>References</title>
 <bibliolist>
-<bibliomixed xml:id="xproc30"/>
-<bibliomixed xml:id="xproc30-steps"/>
+<bibliomixed xml:id="xproc31"/>
 <bibliomixed xml:id="xpath31-functions"/>
 <bibliomixed xml:id="rfc3986" />
 </bibliolist>

step-ixml/src/main/examples/ambig-1.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml>

step-ixml/src/main/examples/ambig-2.xml

@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:ex="http://example.com/"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml parameters="map{'ex:select':2}">

step-ixml/src/main/examples/ambig-3.xml

@@ -1,6 +1,6 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
                 xmlns:ex="http://example.com/"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml parameters="map{'ex:select':'all'}">

step-ixml/src/main/examples/dates-1.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml>

step-ixml/src/main/examples/dates-2.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml>

step-ixml/src/main/examples/dates-3.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:output port="result"/>
 
 <p:ixml fail-on-error="false">

step-ixml/src/main/xml/specification.xml

@@ -6,13 +6,13 @@
                xmlns:xi="http://www.w3.org/2001/XInclude"
                xmlns:xlink="http://www.w3.org/1999/xlink"
                xml:id='step-ixml'
-               class="ed" role="step"
+               class="wd" role="step"
                version="5.0-extension w3c-xproc">
 <info>
-<title>XProc 3.0: Invisible XML</title>
+<title>XProc 3.1: Invisible XML</title>
 <!-- defaults to date formatted <pubdate>2014-12-18</pubdate> -->
 <copyright><year>2021</year>
-<holder>the Contributors to the XProc 3.0 Standard Step Library
+<holder>the Contributors to the XProc 3.1 Standard Step Library
 specifications</holder>
 </copyright>
 
@@ -30,7 +30,7 @@ specifications</holder>
 <abstract>
 <para>This specification describes the <code>p:ixml</code>
 step for
-<citetitle>XProc 3.0: An XML Pipeline Language</citetitle>.</para>
+<citetitle>XProc 3.1: An XML Pipeline Language</citetitle>.</para>
 </abstract>
 
 <legalnotice xml:id="sotd" role="status">
@@ -51,6 +51,11 @@ step for
   (<link xlink:href="mailto:[email protected]?subject=subscribe">subscribe</link>,
   <link xlink:href="https://lists.w3.org/Archives/Public/xproc-dev/">archives</link>).
   </para>
+
+<note role="editorial">
+<para>This draft is a “last call” draft. This version is stable and will not be updated.
+</para>
+</note>
 </legalnotice>
 </info>
 
@@ -62,11 +67,13 @@ A machine-readable description of this step may be found in
 <link xlink:href="steps.xpl">steps.xpl</link>.
 </para>
 
-<para>Familarity with the general nature of <biblioref linkend="xproc30"/>
-steps is assumed; for background details, see
-<biblioref linkend="xproc30-steps"/>.</para>
+<para>Familarity with the general nature of <biblioref linkend="xproc31"/>
+steps is assumed.</para>
 </section>
 
+<section xml:id="library">
+<title>Step library</title>
+
 <section xml:id="c.ixml">
 <title>p:ixml</title>
 
@@ -266,9 +273,10 @@ select a particular parse:
 </section>
 </section>
 
-<section>
+<simplesect>
 <title>Document properties</title>
 <para feature="exec-preserves-none">No document properties are preserved.</para>
+</simplesect>
 </section>
 </section>
 
@@ -304,8 +312,7 @@ failure causes the entire pipeline to fail.</para>
 <appendix xml:id="references">
 <title>References</title>
 <bibliolist>
-<bibliomixed xml:id="xproc30"/>
-<bibliomixed xml:id="xproc30-steps"/>
+<bibliomixed xml:id="xproc31"/>
 <bibliomixed xml:id="invisible-xml"/>
 </bibliolist>
 </appendix>

step-mail/src/main/xml/specification.xml

@@ -5,13 +5,13 @@
                xmlns:p="http://www.w3.org/ns/xproc"
                xmlns:xi="http://www.w3.org/2001/XInclude"
                xmlns:xlink="http://www.w3.org/1999/xlink"
-               xml:id="step-mail" class="ed"
+               xml:id="step-mail" class="wd"
                role="step" version="5.0-extension w3c-xproc">
   <info>
-    <title>XProc 3.0: mail steps</title>
+    <title>XProc 3.1: mail steps</title>
     <!-- defaults to date formatted <pubdate>2014-12-18</pubdate> -->
 <copyright><year>2018</year><year>2019</year><year>2020</year>
-<holder>the Contributors to the XProc 3.0 Standard Step Library
+<holder>the Contributors to the XProc 3.1 Standard Step Library
 specifications</holder>
 </copyright>
 
@@ -37,7 +37,7 @@ specifications</holder>
 
     <abstract>
       <para>This specification describes optional mail related steps for
-<citetitle>XProc 3.0: An XML Pipeline Language</citetitle>.</para>
+<citetitle>XProc 3.1: An XML Pipeline Language</citetitle>.</para>
     </abstract>
 
 <legalnotice xml:id="sotd" role="status">
@@ -58,6 +58,11 @@ specifications</holder>
   (<link xlink:href="mailto:[email protected]?subject=subscribe">subscribe</link>,
   <link xlink:href="https://lists.w3.org/Archives/Public/xproc-dev/">archives</link>).
   </para>
+
+<note role="editorial">
+<para>This draft is a “last call” draft. This version is stable and will not be updated.
+</para>
+</note>
 </legalnotice>
   </info>
 
@@ -68,11 +73,13 @@ specifications</holder>
 A machine-readable description of these steps may be found in
 <link xlink:href="steps.xpl">steps.xpl</link>. </para>
 
-<para>Familarity with the general nature of <biblioref
-linkend="xproc30"/> steps is assumed; for background details, see
-<biblioref linkend="xproc30-steps"/>.</para>
+<para>Familarity with the general nature of
+<biblioref linkend="xproc31"/> steps is assumed.</para>
 </section>
 
+<section xml:id="library">
+<title>Step library</title>
+
 <section xml:id="c.send-mail">
 <title>p:send-mail</title>
 
@@ -184,6 +191,7 @@ document and supply the body as a second document.</para>
   <title>Document properties</title>
   <para feature="send-mail-preserves-none">No document properties are preserved.</para>
 </simplesect>
+</section>
 </section>
 
   <section xmlns="http://docbook.org/ns/docbook" xml:id="errors">
@@ -212,8 +220,7 @@ document and supply the body as a second document.</para>
     <title>References</title>
     <bibliolist>
       <bibliomixed xml:id="id-draft-klyne"/>
-      <bibliomixed xml:id="xproc30"/>
-      <bibliomixed xml:id="xproc30-steps"/>
+      <bibliomixed xml:id="xproc31"/>
     </bibliolist>
   </appendix>
 

step-os/src/main/examples/exec-as1.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

step-os/src/main/examples/exec-as2.xml

@@ -1,5 +1,5 @@
 <p:declare-step xmlns:p="http://www.w3.org/ns/xproc"
-                version="3.0">
+                version="3.1">
 <p:input port="source"/>
 <p:output port="result"/>
 

step-os/src/main/xml/specification.xml

@@ -6,13 +6,13 @@
                xmlns:xi="http://www.w3.org/2001/XInclude"
                xmlns:xlink="http://www.w3.org/1999/xlink"
                xml:id='step-os'
-               class="ed" role="step"
+               class="wd" role="step"
                version="5.0-extension w3c-xproc">
 <info>
-<title>XProc 3.0: operating system steps</title>
+<title>XProc 3.1: operating system steps</title>
 <!-- defaults to date formatted <pubdate>2014-12-18</pubdate> -->
 <copyright><year>2018</year><year>2019</year><year>2020</year>
-<holder>the Contributors to the XProc 3.0 Standard Step Library
+<holder>the Contributors to the XProc 3.1 Standard Step Library
 specifications</holder>
 </copyright>
 
@@ -40,7 +40,7 @@ specifications</holder>
 <para>This specification describes the <code>p:os-exec</code> and
 <code>p:os-info</code> steps
 for
-<citetitle>XProc 3.0: An XML Pipeline Language</citetitle>.</para>
+<citetitle>XProc 3.1: An XML Pipeline Language</citetitle>.</para>
 </abstract>
 
 <legalnotice xml:id="sotd" role="status">
@@ -61,6 +61,11 @@ for
   (<link xlink:href="mailto:[email protected]?subject=subscribe">subscribe</link>,
   <link xlink:href="https://lists.w3.org/Archives/Public/xproc-dev/">archives</link>).
   </para>
+
+<note role="editorial">
+<para>This draft is a “last call” draft. This version is stable and will not be updated.
+</para>
+</note>
 </legalnotice>
 </info>
 
@@ -76,9 +81,8 @@ these steps may be found in
 </para>
 
 <para>Familarity with the
-general nature of <biblioref linkend="xproc30"/>
-steps is assumed; for background details, see
-<biblioref linkend="xproc30-steps"/>.</para>
+general nature of <biblioref linkend="xproc31"/>
+steps is assumed.</para>
 </section>
 
 <section xml:id="library">
@@ -232,7 +236,7 @@ The <option>serialization</option> option is used to control the serialization
   “<literal>serialization</literal>” document property, the effective value of 
   the serialization options is the union of the two maps, where the entries in 
   the “<literal>serialization</literal>” document property take precedence.
-  Serialization is described in <biblioref linkend="xproc30"/>.</para>
+  Serialization is described in <biblioref linkend="xproc31"/>.</para>
 
 <para>If there is content on standard output, it is read and processed as described
 in <tag>p:load</tag> with <option>result-content-type</option> taken as
@@ -300,8 +304,7 @@ failure causes the entire pipeline to fail.</para>
 <appendix xml:id="references">
 <title>References</title>
 <bibliolist>
-<bibliomixed xml:id="xproc30"/>
-<bibliomixed xml:id="xproc30-steps"/>
+<bibliomixed xml:id="xproc31"/>
 </bibliolist>
 </appendix>