From aa67236fc342f205ad4f0309bbb3b7b2500402bb Mon Sep 17 00:00:00 2001 From: Daniel Birket Date: Mon, 23 Aug 2021 21:20:17 -0400 Subject: [PATCH] xml: marchersimon requested changes --- pages/common/xml-edit.md | 14 +++++++------- pages/common/xml-elements.md | 8 ++++---- pages/common/xml-list.md | 2 +- pages/common/xml-select.md | 6 +++--- pages/common/xml-transform.md | 2 +- pages/common/xml-validate.md | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pages/common/xml-edit.md b/pages/common/xml-edit.md index af75eb5545..fd760c291b 100644 --- a/pages/common/xml-edit.md +++ b/pages/common/xml-edit.md @@ -5,23 +5,23 @@ - Delete elements matching an XPATH from an XML document: -`xml edit --delete {{"XPATH1"}} {{path/to/input.xml|URI}}` +`xml edit --delete "{{XPATH1}}" {{path/to/input.xml|URI}}` - Move an element node of an XML document from XPATH1 to XPATH2: -`xml edit --move {{"XPATH1"}} {{"XPATH2"}} {{path/to/input.xml|URI}}` +`xml edit --move "{{XPATH1}}" "{{XPATH2}}" {{path/to/input.xml|URI}}` - Rename all attributes named "id" to "ID": -`xml edit --rename {{"//*/@id"}} -v {{"ID"}} {{path/to/input.xml|URI}}` +`xml edit --rename "{{//*/@id}}" -v "{{ID}}" {{path/to/input.xml|URI}}` -- Rename XML elements of "table" named "rec" to "record": +- Rename the XML elements of "table" named "rec" to "record": -`xml edit --rename {{"/xml/table/rec"}} -v {{"record"}} {{path/to/input.xml|URI}}` +`xml edit --rename "{{/xml/table/rec}}" -v "{{record}}" {{path/to/input.xml|URI}}` -- Update the value of XML table record ID=3 to 5: +- Update the XML table record with "id=3" to the value "id=5": -`xml edit --update {{"xml/table/rec[@id=3]/@id"}} -v {{5}} {{path/to/input.xml|URI}}` +`xml edit --update "{{xml/table/rec[@id=3]/@id}}" -v {{5}} {{path/to/input.xml|URI}}` - Display help for the `edit` subcommand: diff --git a/pages/common/xml-elements.md b/pages/common/xml-elements.md index 254a3f08cb..c0a09a8efb 100644 --- a/pages/common/xml-elements.md +++ b/pages/common/xml-elements.md @@ -1,19 +1,19 @@ # xml elements -> Extract elements and display structure of an XML document. +> Extract elements and display the structure of an XML document. > More information: . - Extract elements from an XML document (producing XPATH expressions): -`xml elements {{path/to/input.xml|URI}} > {{path/to/elements}}` +`xml elements {{path/to/input.xml|URI}} > {{path/to/elements.xpath}}` - Extract elements and their attributes from an XML document: -`xml elements -a {{path/to/input.xml|URI}} > {{path/to/elements}}` +`xml elements -a {{path/to/input.xml|URI}} > {{path/to/elements.xpath}}` - Extract elements and their attributes and values from an XML document: -`xml elements -v {{path/to/input.xml|URI}} > {{path/to/elements}}` +`xml elements -v {{path/to/input.xml|URI}} > {{path/to/elements.xpath}}` - Print sorted unique elements from an XML document to see its structure: diff --git a/pages/common/xml-list.md b/pages/common/xml-list.md index 25367c9ce4..38548d20e7 100644 --- a/pages/common/xml-list.md +++ b/pages/common/xml-list.md @@ -1,6 +1,6 @@ # xml list -> List a directory's contents (like 'ls') in XML format. +> List a directory's contents (like `ls`) in XML format. > More information: . - Write the current directory's listing to an XML document: diff --git a/pages/common/xml-select.md b/pages/common/xml-select.md index 39a1c80e64..6b6c58376a 100644 --- a/pages/common/xml-select.md +++ b/pages/common/xml-select.md @@ -6,17 +6,17 @@ - Select all elements matching "XPATH1" and print the value of the element "XPATH2": -`xml select --template --match {{"XPATH1"}} --value-of {{"XPATH2"}} {{path/to/input.xml|URI}}` +`xml select --template --match "{{XPATH1}}" --value-of "{{XPATH2}}" {{path/to/input.xml|URI}}` - Match "XPATH1" and print the value of "XPATH2" as text with new-lines: -`xml select --text --template --match {{"XPATH1"}} --value-of {{"XPATH2"}} --nl {{path/to/input.xml|URI}}` +`xml select --text --template --match "{{XPATH1}}" --value-of "{{XPATH2}}" --nl {{path/to/input.xml|URI}}` - Count the elements of "XPATH1": `xml select --template --value-of "count({{XPATH1}})" {{path/to/input.xml|URI}}` -- Count all nodes in XML document(s): +- Count all nodes in one or more XML documents: `xml select --text --template --inp-name --output " " --value-of "count(node())" --nl {{path/to/input1.xml|URI}} {{path/to/input2.xml|URI}}` diff --git a/pages/common/xml-transform.md b/pages/common/xml-transform.md index 003ea9cdc5..cf8ec5fd6a 100644 --- a/pages/common/xml-transform.md +++ b/pages/common/xml-transform.md @@ -5,7 +5,7 @@ - Transform an XML document using an XSL stylesheet, passing one XPATH parameter and one literal string parameter: -`xml transform {{path/to/stylesheet.xsl}} -p {{"Count='count(/xml/table/rec)'"}} -s {{Text="Count="}} {{path/to/input.xml|URI}}` +`xml transform {{path/to/stylesheet.xsl}} -p "{{Count='count(/xml/table/rec)'}}" -s {{Text="Count="}} {{path/to/input.xml|URI}}` - Display help for the `transform` subcommand: diff --git a/pages/common/xml-validate.md b/pages/common/xml-validate.md index 6d68fcb6e7..8e3938433f 100644 --- a/pages/common/xml-validate.md +++ b/pages/common/xml-validate.md @@ -3,19 +3,19 @@ > Validate XML documents. > More information: . -- Validate XML document(s) for well-formedness only: +- Validate one or more XML documents for well-formedness only: `xml validate {{path/to/input1.xml|URI}} {{input2.xml ...}}` -- Validate XML document(s) against a Document Type Definition (DTD): +- Validate one or more XML documents against a Document Type Definition (DTD): `xml validate --dtd {{path/to/schema.dtd}} {{path/to/input1.xml|URI}} {{input2.xml ...}}` -- Validate XML document(s) against an XML Schema Definition (XSD): +- Validate one or more XML documents against an XML Schema Definition (XSD): `xml validate --xsd {{path/to/schema.xsd}} {{path/to/input1.xml|URI}} {{input2.xml ...}}` -- Validate XML document(s) against a Relax NG schema (RNG): +- Validate one or more XML documents against a Relax NG schema (RNG): `xml validate --relaxng {{path/to/schema.rng}} {{path/to/input1.xml|URI}} {{input2.xml ...}}`