--- xmlstarlet-1.0.1.orig/doc/xmlstarlet.txt	2003-11-05 06:46:55 +0300
+++ xmlstarlet-1.0.1/doc/xmlstarlet.txt	2007-12-10 14:39:34 +0300
@@ -10,9 +10,9 @@
 1. BASIC COMMAND LINE OPTIONS
 ====================================================
 
-xml
+xmlstarlet
 XMLStarlet Toolkit: Command line utilities for XML
-Usage: xml [<options>] <command> [<cmd-options>]
+Usage: xmlstarlet [<options>] <command> [<cmd-options>]
 where <command> is one of:
    ed    (or edit)      - Edit/Update XML document(s)
    sel   (or select)    - Select data or query XML document(s) (XPATH, etc)
@@ -32,7 +32,7 @@ where <command> is one of:
 Wherever file name mentioned in command help it is assumed
 that URL can be used instead as well.
 
-Type: xml <command> --help <ENTER> for command help
+Type: xmlstarlet <command> --help <ENTER> for command help
 
 XMLStarlet is a command line toolkit to query/edit/check/transform
 XML documents (for more information see http://xmlstar.sourceforge.net/)
@@ -42,9 +42,9 @@ XML documents (for more information see 
 2. Select/Query XML documents
 ====================================================
 
-xml sel --help
+xmlstarlet sel --help
 XMLStarlet Toolkit: Select from XML document(s)
-Usage: xml sel <global-options> {<template>} [ <xml-file> ... ]
+Usage: xmlstarlet sel <global-options> {<template>} [ <xml-file> ... ]
 where
   <global-options> - global options for selecting
   <xml-file> - input XML document file name/uri (stdin is used if missing)
@@ -88,7 +88,7 @@ There can be multiple --match, --copy-of
 in a single template. The effect of applying command line templates
 can be illustrated with the following XSLT analogue
 
-xml sel -t -c "xpath0" -m "xpath1" -m "xpath2" -v "xpath3" \
+xmlstarlet sel -t -c "xpath0" -m "xpath1" -m "xpath2" -v "xpath3" \
         -t -m "xpath4" -c "xpath5"
 
 is equivalent to applying the following XSLT
@@ -125,9 +125,9 @@ Current implementation uses libxslt from
 3. Editing XML documents
 ====================================================
 
-xml ed --help
+xmlstarlet ed --help
 XMLStarlet Toolkit: Edit XML document(s)
-Usage: xml ed <global-options> {<action>} [ <xml-file-or-uri> ... ]
+Usage: xmlstarlet ed <global-options> {<action>} [ <xml-file-or-uri> ... ]
 where
   <global-options>  - global options for editing
   <xml-file-or-uri> - input XML document file name/uri (stdin is used if missing)
@@ -160,9 +160,9 @@ XML documents (for more information see 
 4. Using XSLT to transform XML documents
 ====================================================
 
-xml tr --help
+xmlstarlet tr --help
 XMLStarlet Toolkit: Transform XML document(s) using XSLT
-Usage: xml tr [<options>] <xsl-file> {-p|-s <name>=<value>} [ <xml-file-or-uri> ... ]
+Usage: xmlstarlet tr [<options>] <xsl-file> {-p|-s <name>=<value>} [ <xml-file-or-uri> ... ]
 where
    <xsl-file>      - main XSLT stylesheet for transformation
    <xml-file>      - input XML document file name (stdin is used if missing)
@@ -193,9 +193,9 @@ Current implementation uses libxslt from
 5. Formatting XML documents
 ====================================================
 
-xml fo --help
+xmlstarlet fo --help
 XMLStarlet Toolkit: Format XML document
-Usage: xml fo [<options>] <xml-file>
+Usage: xmlstarlet fo [<options>] <xml-file>
 where <options> are
    -n or --noindent            - do not indent
    -t or --indent-tab          - indent output with tabulation
@@ -217,9 +217,9 @@ XML documents (for more information see 
 6. Validating XML documents
 ====================================================
 
-xml val --help
+xmlstarlet val --help
 XMLStarlet Toolkit: Validate XML document(s)
-Usage: xml val <options> [ <xml-file-or-uri> ... ]
+Usage: xmlstarlet val <options> [ <xml-file-or-uri> ... ]
 where <options>
    -w or --well-formed        - validate well-formedness only (default)
    -d or --dtd <dtd-file>     - validate against DTD
@@ -241,9 +241,9 @@ XML documents (for more information see 
 7. Displaying structure of XML documents
 ====================================================
 
-xml el --help
+xmlstarlet el --help
 XMLStarlet Toolkit: Display element structure of XML document
-Usage: xml el [<options>] <xml-file>
+Usage: xmlstarlet el [<options>] <xml-file>
 where
    <xml-file> - input XML document file name (stdin is used if missing)
    <options>:
@@ -260,9 +260,9 @@ XML documents (for more information see 
 8. Escape/Unescape special XML characters
 ====================================================
 
-xml esc --help
+xmlstarlet esc --help
 XMLStarlet Toolkit: Escape special XML characters
-Usage: xml esc [<options>] [<string>]
+Usage: xmlstarlet esc [<options>] [<string>]
 where <options> are
    --help      - print usage
    (TODO: more to be added in future)
@@ -277,9 +277,9 @@ XML documents (for more information see 
 9. List directory as XML
 ====================================================
 
-xml ls --help
+xmlstarlet ls --help
 XMLStarlet Toolkit: List directory as XML
-Usage: xml ls
+Usage: xmlstarlet ls
 Lists current directory in XML format.
 
 XMLStarlet is a command line toolkit to query/edit/check/transform
@@ -291,9 +291,9 @@ XML documents (for more information see 
 10. XML canonicalization
 ====================================================
 
-xml c14n --help
+xmlstarlet c14n --help
 XMLStarlet Toolkit: XML canonicalization
-Usage: xml c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>]
+Usage: xmlstarlet c14n <mode> <xml-file> [<xpath-file>] [<inclusive-ns-list>]
 where
   <xml-file>   - input XML document file name (stdin is used if '-')
   <xpath-file> - XML file containing XPath expression for
@@ -319,9 +319,9 @@ XML documents (for more information see 
 11. Convert XML into PYX format (based on ESIS - ISO 8879)
 ====================================================
 
-xml pyx --help
+xmlstarlet pyx --help
 XMLStarlet Toolkit: Convert XML into PYX format (based on ESIS - ISO 8879)
-Usage: xml pyx {<xml-file>}
+Usage: xmlstarlet pyx {<xml-file>}
 where
    <xml-file> - input XML document file name (stdin is used if missing)
 
@@ -511,7 +511,7 @@ examples/xsl/param1.xsl
 
 Command:
 # XML canonicalization
-xml c14n --with-comments ../examples/xml/structure.xml ; echo $?
+xmlstarlet c14n --with-comments ../examples/xml/structure.xml ; echo $?
 Result Output:
 <a1>
   <a11>
@@ -532,7 +532,7 @@ Result Output:
 
 Command:
 # XML exclusive canonicalization
-xml c14n --exc-with-comments ../examples/xml/c14n.xml ../examples/xml/c14n.xpath
+xmlstarlet c14n --exc-with-comments ../examples/xml/c14n.xml ../examples/xml/c14n.xpath
 Result Output:
 <n1:elem1 xmlns:n1="http://b.example">
 content
@@ -541,14 +541,14 @@ content
 
 Command:
 # Count elements matching XPath expression
-xml sel -t -v "count(/xml/table/rec/numField)" xml/table.xml
+xmlstarlet sel -t -v "count(/xml/table/rec/numField)" xml/table.xml
 Result Output:
 3
 
 
 Command:
 # Count all nodes in XML document
-xml sel -t -f -o " " -v "count(//node())" xml/table.xml xml/tab-obj.xml
+xmlstarlet sel -t -f -o " " -v "count(//node())" xml/table.xml xml/tab-obj.xml
 Result Output:
 xml/table.xml 32
 xml/tab-obj.xml 41
@@ -556,7 +556,7 @@ xml/tab-obj.xml 41
 
 Command:
 # Delete elements matching XPath expression
-xml ed -d /xml/table/rec[@id='2'] xml/table.xml
+xmlstarlet ed -d /xml/table/rec[@id='2'] xml/table.xml
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -575,8 +575,8 @@ Result Output:
 
 Command:
 # Generate HTML from given SGML docbook document
-xml tr --omit-decl --docbook /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl  sgml/docbook1.sgml | \
-    xml fo --html --indent-spaces 2
+xmlstarlet tr --omit-decl --docbook /usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl  sgml/docbook1.sgml | \
+    xmlstarlet fo --html --indent-spaces 2
 Result Output:
 <?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
@@ -596,7 +596,7 @@ Result Output:
           <h3 class="author">Mikhail Grushinskiy</h3>
         </div>
         <div>
-          <p class="copyright">Copyright © 2002 Mikhail Grushinskiy</p>
+          <p class="copyright">Copyright � 2002 Mikhail Grushinskiy</p>
         </div>
         <hr/>
       </div>
@@ -640,28 +640,28 @@ Result Output:
 
 Command:
 # Validate XML document against DTD
-xml val --dtd dtd/table.dtd xml/tab-obj.xml >/dev/null 2>&1; echo $?
+xmlstarlet val --dtd dtd/table.dtd xml/tab-obj.xml >/dev/null 2>&1; echo $?
 Result Output:
 1
 
 
 Command:
 # Validate XML document against DTD
-xml val --dtd dtd/table.dtd xml/table.xml >/dev/null 2>&1; echo $?
+xmlstarlet val --dtd dtd/table.dtd xml/table.xml >/dev/null 2>&1; echo $?
 Result Output:
 0
 
 
 Command:
 # Validate XML document against DTD
-xml val --dtd xml/foo.dtd xml/foo.xml 2>/dev/null
+xmlstarlet val --dtd xml/foo.dtd xml/foo.xml 2>/dev/null
 Result Output:
 xml/foo.xml - invalid
 
 
 Command:
 # Display element structure of XML document
-xml el ./xml/tab-obj.xml
+xmlstarlet el ./xml/tab-obj.xml
 Result Output:
 xml
 xml/table
@@ -681,7 +681,7 @@ xml/table/rec/stringField
 
 Command:
 # Display element structure of XML document (including attributes)
-xml el -a ./xml/tab-obj.xml
+xmlstarlet el -a ./xml/tab-obj.xml
 Result Output:
 xml
 xml/table
@@ -707,7 +707,7 @@ xml/table/rec/stringField
 
 Command:
 # Display element structure of XML document (including attribute values)
-xml el -v ./xml/tab-obj.xml
+xmlstarlet el -v ./xml/tab-obj.xml
 Result Output:
 xml
 xml/table
@@ -727,7 +727,7 @@ xml/table/rec/stringField
 
 Command:
 # Escape special XML characters
-cat xml/structure.xml | xml esc
+cat xml/structure.xml | xmlstarlet esc
 Result Output:
 &lt;a1&gt;
   &lt;a11&gt;
@@ -747,34 +747,34 @@ Result Output:
 
 Command:
 # Calculate EXSLT (XSLT extentions) XPath value
-echo "<x/>" | xml sel -t -v "math:abs(-1000)"
+echo "<x/>" | xmlstarlet sel -t -v "math:abs(-1000)"
 Result Output:
 1000
 
 
 Command:
 # Find XML files matching XPath expression (containing 'object' element)
-xml sel -t -m //object -f xml/table.xml xml/tab-obj.xml
+xmlstarlet sel -t -m //object -f xml/table.xml xml/tab-obj.xml
 Result Output:
 xml/tab-obj.xml
 
 
 Command:
-# Generate XML document using command line xml sel
-echo "<x/>" | xml sel -t -m / -e xml -e child -a data -o value
+# Generate XML document using command line xmlstarlet sel
+echo "<x/>" | xmlstarlet sel -t -m / -e xml -e child -a data -o value
 Result Output:
 <xml><child data="value"/></xml>
 
 
 Command:
 # Apply XSLT stylesheet to HTML input file
-xml tr --html xsl/hello1.xsl html/hello1.html
+xmlstarlet tr --html xsl/hello1.xsl html/hello1.html
 Result Output:
 Hello World!
 
 Command:
 # Use local-name() XSLT function in XPath expression
-xml sel -t -v "//*[local-name()='query']" xsql/jobserve.xsql
+xmlstarlet sel -t -v "//*[local-name()='query']" xsql/jobserve.xsql
 Result Output:
 
   SELECT substr(title,1,26) short_title, title, location, skills
@@ -786,14 +786,14 @@ Result Output:
 
 Command:
 # Select text value of an XML element mathing given XPath expression
-xml sel -t -m "/xml/table/rec[@id='2']" -v numField xml/table.xml
+xmlstarlet sel -t -m "/xml/table/rec[@id='2']" -v numField xml/table.xml
 Result Output:
 346
 
 
 Command:
 # Move element node
-echo '<x id="1"><a/><b/></x>' | xml ed -m "//b" "//a"
+echo '<x id="1"><a/><b/></x>' | xmlstarlet ed -m "//b" "//a"
 
 Result Output:
 <?xml version="1.0"?>
@@ -806,7 +806,7 @@ Result Output:
 
 Command:
 # Format XML document disabling indent
-cat xml/tab-obj.xml | xml fo --noindent 
+cat xml/tab-obj.xml | xmlstarlet fo --noindent 
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -833,7 +833,7 @@ Result Output:
 
 Command:
 # Predefine namespaces for XPath expressions
-xml sel -N xsql=urn:oracle-xsql -t -v /xsql:query xsql/jobserve.xsql
+xmlstarlet sel -N xsql=urn:oracle-xsql -t -v /xsql:query xsql/jobserve.xsql
 Result Output:
 
   SELECT substr(title,1,26) short_title, title, location, skills
@@ -845,7 +845,7 @@ Result Output:
 
 Command:
 # Recover malformed XML document
-xml fo -R xml/malformed.xml 2>/dev/null
+xmlstarlet fo -R xml/malformed.xml 2>/dev/null
 Result Output:
 <?xml version="1.0"?>
 <test_output>
@@ -856,7 +856,7 @@ Result Output:
 
 Command:
 # Rename attributes
-xml ed -r "//*/@id" -v ID xml/tab-obj.xml
+xmlstarlet ed -r "//*/@id" -v ID xml/tab-obj.xml
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -883,7 +883,7 @@ Result Output:
 
 Command:
 # Rename elements
-xml ed -r "/xml/table/rec" -v record xml/tab-obj.xml
+xmlstarlet ed -r "/xml/table/rec" -v record xml/tab-obj.xml
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -910,15 +910,15 @@ Result Output:
 
 Command:
 # Validate against XSD schema
-xml val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $?
+xmlstarlet val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $?
 Result Output:
 xml/tab-obj.xml
 1
 
 
 Command:
-# xsl:copy-of in xml sel command
-xml sel -B -t -m /xml/table/rec -c . -n xml/table.xml
+# xsl:copy-of in xmlstarlet sel command
+xmlstarlet sel -B -t -m /xml/table/rec -c . -n xml/table.xml
 Result Output:
 <rec id="1"><numField>123</numField><stringField>String Value</stringField></rec>
 <rec id="2"><numField>346</numField><stringField>Text Value</stringField></rec>
@@ -928,7 +928,7 @@ Result Output:
 
 Command:
 # Query XML document and produce sorted text table
-xml sel -T -t -m /xml/table/rec -s D:N:- "@id" -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml
+xmlstarlet sel -T -t -m /xml/table/rec -s D:N:- "@id" -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml
 Result Output:
 3|-23|stringValue
 2|346|Text Value
@@ -936,8 +936,8 @@ Result Output:
 
 
 Command:
-# Print structure of XML element using xml sel (advanced XPath expressions and xml sel command usage)
-xml sel -T -t -m '//*' \
+# Print structure of XML element using xmlstarlet sel (advanced XPath expressions and xmlstarlet sel command usage)
+xmlstarlet sel -T -t -m '//*' \
 -m 'ancestor-or-self::*' -v 'name()' -i 'not(position()=last())' -o . -b -b -n \
 xml/structure.xml
 Result Output:
@@ -954,14 +954,14 @@ a1.a13.a131
 
 Command:
 # Calculating running sum on XML document
-xml sel -t -v "sum(/xml/table/rec/numField)" xml/table.xml
+xmlstarlet sel -t -v "sum(/xml/table/rec/numField)" xml/table.xml
 Result Output:
 446
 
 
 Command:
 # Indent XML document with tabs
-cat xml/tab-obj.xml | xml fo --indent-tab 
+cat xml/tab-obj.xml | xmlstarlet fo --indent-tab 
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -988,7 +988,7 @@ Result Output:
 
 Command:
 # Generate plain text table from XML document
-xml sel -T -t -m /xml/table/rec -v "@id" -o "|" -v numField -o "|" -v stringField -n xml/table.xml
+xmlstarlet sel -T -t -m /xml/table/rec -v "@id" -o "|" -v numField -o "|" -v stringField -n xml/table.xml
 Result Output:
 1|123|String Value
 2|346|Text Value
@@ -997,7 +997,7 @@ Result Output:
 
 Command:
 # Generate plain text table from XML document
-xml sel -T -t -m /xml/table/rec -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml
+xmlstarlet sel -T -t -m /xml/table/rec -v "concat(@id,'|',numField,'|',stringField)" -n xml/table.xml
 Result Output:
 1|123|String Value
 2|346|Text Value
@@ -1006,7 +1006,7 @@ Result Output:
 
 Command:
 # Generate plain text table from XML document
-xml sel -T \
+xmlstarlet sel -T \
     -t -o "===================" -n \
        -m xml/table/rec -v "concat(@id,'|',numField,'|',stringField)" -n \
     -t -o "===================" -n xml/table.xml
@@ -1020,7 +1020,7 @@ Result Output:
 
 Command:
 # Select from XML document containing unicode characters
-xml sel -T -t -m "//test[@lang='fran&#231;ais']/@lang" -v . -n xml/unicode.xml
+xmlstarlet sel -T -t -m "//test[@lang='fran&#231;ais']/@lang" -v . -n xml/unicode.xml
 Result Output:
 français
 français
@@ -1029,7 +1029,7 @@ français
 
 Command:
 # Update value of an attribute
-xml ed -u '/xml/table/rec[@id=3]/@id' -v 5 xml/tab-obj.xml
+xmlstarlet ed -u '/xml/table/rec[@id=3]/@id' -v 5 xml/tab-obj.xml
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -1056,7 +1056,7 @@ Result Output:
 
 Command:
 # Update value of an element
-xml ed -u '/xml/table/rec[@id=1]/numField' -v 0 xml/tab-obj.xml
+xmlstarlet ed -u '/xml/table/rec[@id=1]/numField' -v 0 xml/tab-obj.xml
 Result Output:
 <?xml version="1.0"?>
 <xml>
@@ -1086,46 +1086,46 @@ Command:
 echo "==============================================="
 echo "Well-Formedness Validation Tests"
 echo "- 1 -------------------------------------------"
-xml val xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 2 -------------------------------------------"
-xml val -g xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -g xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 3 -------------------------------------------"
-xml val -b xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -b xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 4 -------------------------------------------"
-xml val -q xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $?
+xmlstarlet val -q xml/table.xml xml/tab-obj.xml 2>/dev/null; echo $?
 
 echo "==============================================="
 echo "DTD Validation Tests"
 echo "- 1 -------------------------------------------"
-xml val -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 2 -------------------------------------------"
-xml val -g -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -g -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 3 -------------------------------------------"
-xml val -b -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -b -d dtd/table.dtd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 4 -------------------------------------------"
-xml val -q -d dtd/table.dtd xml/table.xml 2>/dev/null; echo $?
+xmlstarlet val -q -d dtd/table.dtd xml/table.xml 2>/dev/null; echo $?
 
 echo "==============================================="
 echo "Schema Validation Tests"
 echo "- 1 -------------------------------------------"
-xml val -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 2 -------------------------------------------"
-xml val -g -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -g -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 3 -------------------------------------------"
-xml val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -b -s xsd/table.xsd xml/table.xml xml/tab-obj.xml xml/tab-bad.xml 2>/dev/null; echo $?
 echo "- 4 -------------------------------------------"
-xml val -q -s xsd/table.xsd xml/table.xml 2>/dev/null; echo $?
+xmlstarlet val -q -s xsd/table.xsd xml/table.xml 2>/dev/null; echo $?
 
 echo "==============================================="
 echo "RelaxNG Schema Validation Tests"
 echo "- 1 -------------------------------------------"
-xml val -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
 echo "- 2 -------------------------------------------"
-xml val -g -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -g -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
 echo "- 3 -------------------------------------------"
-xml val -b -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
+xmlstarlet val -b -r relaxng/address.rng relaxng/address.xml relaxng/address-bad.xml 2>/dev/null; echo $?
 echo "- 4 -------------------------------------------"
-xml val -q -r relaxng/address.rng relaxng/address.xml 2>/dev/null; echo $?
+xmlstarlet val -q -r relaxng/address.rng relaxng/address.xml 2>/dev/null; echo $?
 Result Output:
 ===============================================
 Well-Formedness Validation Tests
@@ -1193,7 +1193,7 @@ relaxng/address-bad.xml
 
 Command:
 # Include one XML document into another using XInclude
-xml tr --xinclude xsl/cat.xsl xml/document.xml
+xmlstarlet tr --xinclude xsl/cat.xsl xml/document.xml
 Result Output:
 <?xml version="1.0" encoding="utf-8"?>
 <document xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -1208,14 +1208,14 @@ Result Output:
 
 Command:
 # Passing parameters to XSLT stylesheet
-xml tr xsl/param1.xsl -p Count='count(/xml/table/rec)' -s Text="Count=" xml/table.xml
+xmlstarlet tr xsl/param1.xsl -p Count='count(/xml/table/rec)' -s Text="Count=" xml/table.xml
 Result Output:
 Count=3
 
 
 Command:
 # Applying XSLT stylesheet to XML document
-xml tr xsl/sum1.xsl xml/table.xml
+xmlstarlet tr xsl/sum1.xsl xml/table.xml
 Result Output:
 446