Merge pull request #138 from miljanuscumlic/minor-corrections

Added json-ignore-whitespace-text-nodes serialize option and some minor corrections
eXist-db · Nov 4, 2017 · f277e58 · f277e58
2 parents 041203f + 13ae720
commit f277e58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/data/indexing.xml b/data/indexing.xml
@@ -20,7 +20,7 @@
                 types of indexes:</para>
             <note>
                 <para>Properly configured indexes have a huge impact on database performance! Some
-                    expressions might run a hundred times faster with an index. This is particular
+                    expressions might run a hundred times faster with an index. This particulary
                     applies to the range index: without a range index, eXist has to do a full scan
                     over the context nodes to look up an element value, which severly limits 
                     performance and scalability.</para>
@@ -202,7 +202,7 @@
 </markup>
                     </programlisting>
                 </example>
-                <para>All configuration documents documents have an <sgmltag>index</sgmltag>
+                <para>All configuration documents have an <sgmltag>index</sgmltag>
                     element directly below the root element, which encloses the index configuration.
                     Only <emphasis>one</emphasis>
                     <sgmltag>index</sgmltag> element is permitted in a document. Apart from the
@@ -257,7 +257,7 @@
                     any query running on the database instance, no matter how the query is called.</para>
                 </step>
                 <step>
-                    <para>Click <guimenuitem>Refresh</guimenuitem> and switch to the <guimenuitem>Indexes</guimenuitem>
+                    <para>Click <guimenuitem>Refresh</guimenuitem> and switch to the <guimenuitem>Index Usage</guimenuitem>
                     tab.</para>
                 </step>
             </procedure>

diff --git a/data/xquery.xml b/data/xquery.xml
@@ -183,7 +183,7 @@ return
                             <synopsis language="xquery">try { 'a' + 7 } catch * { concat($err:code, ": ", $err:description) }</synopsis>
                             returns the full error (excerpted here):
                             <synopsis>err:XPTY0004: It is a type error if...</synopsis>
-                            For more information, see the article on the eXist-db blog, <ulink url="http://atomic.exist-db.org/HowTo/XQuery3/Try-CatchExpression">Higher-Order Functions in XQuery 3.0</ulink> and the <ulink url="http://www.w3.org/TR/xquery-30/#id-try-catch">specification</ulink>.</para>
+                            For more information, see the article on the eXist-db blog, <ulink url="http://atomic.exist-db.org/HowTo/XQuery3/Try-CatchExpression">Try-Catch Expression</ulink> and the <ulink url="http://www.w3.org/TR/xquery-30/#id-try-catch">specification</ulink>.</para>
                     </listitem>
                     <listitem>
                         <para>The new String Concatenation expression: A convenient alternative to
@@ -816,6 +816,14 @@ return $w</synopsis>
                                 add-exist-id to "element" will only show the node id of the
                                 top-level element, "all" will show the ids of all elements.</para>
                         </listitem>
+                    </varlistentry>
+					<varlistentry>
+                        <term>
+                            <option>json-ignore-whitespace-text-nodes= yes | no</option>
+                        </term>
+                        <listitem>
+                            <para>to discard white-space text nodes when serializing XML/XDM to JSON.</para>
+                        </listitem>
                     </varlistentry>
                 </variablelist>
                 <para>The general options include the following:</para>
@@ -902,7 +910,7 @@ return $w</synopsis>
                 </variablelist>
                 <para>For example, to disable XInclude expansion, and indent the output, you can use
                     the following syntax:</para>
-                <synopsis>declare option exist:serialize "expand-xincludes=no";</synopsis>
+                <synopsis>declare option exist:serialize "expand-xincludes=no indent=yes";</synopsis>
                 <para>For the output method parameter, eXist-db currently recognizes three methods:
                         <option>xml</option>, <option>xhtml</option> and <option>text</option>. Note
                     that unlike the xml method, the xhtml setting uses only the short form for