From 35deee3aeec116b3b2e266d1e18164b3512831f8 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Thu, 25 Jul 2019 12:51:49 -0400
Subject: [PATCH] Fix #110

---
 step-json/src/main/xml/specification.xml   |  6 ++--
 step-json/src/main/xml/steps/join-json.xml | 26 ------------------
 step-json/src/main/xml/steps/json-join.xml | 32 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 29 deletions(-)
 delete mode 100644 step-json/src/main/xml/steps/join-json.xml
 create mode 100644 step-json/src/main/xml/steps/json-join.xml

diff --git a/step-json/src/main/xml/specification.xml b/step-json/src/main/xml/specification.xml
index 42590675..69f8c7e9 100644
--- a/step-json/src/main/xml/specification.xml
+++ b/step-json/src/main/xml/specification.xml
@@ -30,7 +30,7 @@
 </authorgroup>
 
 <abstract>
-<para>This specification describes the <code>p:join-json</code> step
+<para>This specification describes the <code>p:json-join</code> step
 for
 <citetitle>XProc 3.0: An XML Pipeline Language</citetitle>.</para>
 </abstract>
@@ -51,7 +51,7 @@ An XML Pipeline Language</link> published by the W3C.</para>
 <title>Introduction</title>
 
 <para>This specification describes the
-<code>p:join-json</code> XProc step.
+<code>p:json-join</code> XProc step.
 A machine-readable description of
 these steps may be found in
 <link xlink:href="steps.xpl">steps.xpl</link>.
@@ -63,7 +63,7 @@ steps is assumed; for background details, see
 <biblioref linkend="xproc30-steps"/>.</para>
 </section>
 
-<xi:include href="steps/join-json.xml"/>
+<xi:include href="steps/json-join.xml"/>
 
 <section xmlns="http://docbook.org/ns/docbook" xml:id="errors">
 <title>Step Errors</title>
diff --git a/step-json/src/main/xml/steps/join-json.xml b/step-json/src/main/xml/steps/join-json.xml
deleted file mode 100644
index 0e7fe744..00000000
--- a/step-json/src/main/xml/steps/join-json.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:e="http://www.w3.org/1999/XSL/Spec/ElementSyntax"
-         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="c.join-json"
-         version="5.0-extension w3c-xproc">
-<title>p:json-join</title>
-
-<para>The <code>p:json-join</code> step joins a sequence of JSON documents into a single JSON document (an array).
-If the sequence on port <code>source</code> is empty, the empty sequence is returned on port <code>result</code>.</para>
-
-<p:declare-step type="p:join-json">
-  <p:input port="source" sequence="true" content-types="json"> </p:input>
-  <p:output port="result" content-types="application/json"/>
-  <p:option name="flatten-arrays" as="xs:boolean" select="false()"/>
-</p:declare-step>
-
-<para>If option <code>flatten-arrays</code> is <literal>false</literal>, a member in the array is created for each document in
-the sequence appearing on port<code>source</code>. Therefore the produced array with have the same number of
-members as the number of documents appearing on port <code>source</code>. However if <code>flatten-arrays</code> is
-<literal>true</literal>, for each member of an array appearing at the top level of a JSON document 
-on port <code>source</code> a new member in the resulting array will be created.</para>
-
-</section>
diff --git a/step-json/src/main/xml/steps/json-join.xml b/step-json/src/main/xml/steps/json-join.xml
new file mode 100644
index 00000000..8a24698b
--- /dev/null
+++ b/step-json/src/main/xml/steps/json-join.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:e="http://www.w3.org/1999/XSL/Spec/ElementSyntax"
+         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="c.json-join"
+         version="5.0-extension w3c-xproc">
+<title>p:json-join</title>
+
+<para>The <code>p:json-join</code> step joins a sequence of JSON
+documents into a single JSON document (an array). If the sequence on
+port <code>source</code> is empty, the empty sequence is returned on
+port <code>result</code>.</para>
+
+<p:declare-step type="p:json-join">
+  <p:input port="source" sequence="true" content-types="json"> </p:input>
+  <p:output port="result" content-types="application/json"/>
+  <p:option name="flatten-arrays" as="xs:boolean" select="false()"/>
+</p:declare-step>
+
+<para>If option <code>flatten-arrays</code> is
+<literal>false</literal>, a member in the array is created for each
+document in the sequence appearing on port<code>source</code>.
+Therefore the produced array with have the same number of members as
+the number of documents appearing on port <code>source</code>. However
+if <code>flatten-arrays</code> is <literal>true</literal>, for each
+member of an array appearing at the top level of a JSON document on
+port <code>source</code> a new member in the resulting array will be
+created.</para>
+
+</section>