diff -uNr xmlstarlet-1.0.3-original/examples/xmlstarlet xmlstarlet-1.0.3/examples/xmlstarlet --- xmlstarlet-1.0.3-original/examples/xmlstarlet 2010-11-10 18:42:26.000000000 -0500 +++ xmlstarlet-1.0.3/examples/xmlstarlet 2010-12-17 12:09:15.644655135 -0500 @@ -1,4 +1,4 @@ #!/bin/sh -../src/xml ${@+"$@"} +../src/xmlstarlet ${@+"$@"} diff -uNr xmlstarlet-1.0.3-original/src/Makefile.am xmlstarlet-1.0.3/src/Makefile.am --- xmlstarlet-1.0.3-original/src/Makefile.am 2010-11-16 20:43:53.000000000 -0500 +++ xmlstarlet-1.0.3/src/Makefile.am 2010-12-17 12:08:55.760085370 -0500 @@ -1,3 +1,3 @@ -bin_PROGRAMS = xml +bin_PROGRAMS = xmlstarlet -xml_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c +xmlstarlet_SOURCES = xml.c xml_edit.c xml_ls.c xml_escape.c xml_pyx.c xml_depyx.c xml_select.c xml_trans.c xml_validate.c xml_format.c xml_elem.c xml_C14N.c trans.c binsert.c stack.c binsert.h stack.h trans.h escape.h strdup.h strdup.c diff -uNr xmlstarlet-1.0.3-original/src/xml.c xmlstarlet-1.0.3/src/xml.c --- xmlstarlet-1.0.3-original/src/xml.c 2010-11-10 18:42:26.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml.c 2010-12-17 12:08:55.760085370 -0500 @@ -49,7 +49,7 @@ */ static const char usage_str_1[] = "XMLStarlet Toolkit: Command line utilities for XML\n" -"Usage: xml [] []\n"; +"Usage: xmlstarlet [] []\n"; static const char usage_str_2[] = "where is one of:\n" @@ -74,7 +74,7 @@ " --help - show help\n" "Wherever file name mentioned in command help it is assumed\n" "that URL can be used instead as well.\n\n" -"Type: xml --help for command help\n\n"; +"Type: xmlstarlet --help for command help\n\n"; diff -uNr xmlstarlet-1.0.3-original/src/xml_C14N.c xmlstarlet-1.0.3/src/xml_C14N.c --- xmlstarlet-1.0.3-original/src/xml_C14N.c 2010-11-14 10:47:45.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_C14N.c 2010-12-17 12:08:55.761085249 -0500 @@ -34,7 +34,7 @@ static const char c14n_usage_str_1[] = "XMLStarlet Toolkit: XML canonicalization\n" -"Usage: xml c14n [] []\n" +"Usage: xmlstarlet c14n [] []\n" "where\n" " - input XML document file name (stdin is used if '-')\n" " - XML file containing XPath expression for\n" diff -uNr xmlstarlet-1.0.3-original/src/xml_depyx.c xmlstarlet-1.0.3/src/xml_depyx.c --- xmlstarlet-1.0.3-original/src/xml_depyx.c 2010-11-14 10:47:45.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_depyx.c 2010-12-17 12:08:55.762085127 -0500 @@ -38,7 +38,7 @@ static const char depyx_usage_str[] = "XMLStarlet Toolkit: Convert PYX into XML\n" -"Usage: xml p2x []\n" +"Usage: xmlstarlet p2x []\n" "where\n" " - input PYX document file name (stdin is used if missing)\n\n" "The PYX format is a line-oriented representation of\n" diff -uNr xmlstarlet-1.0.3-original/src/xml_edit.c xmlstarlet-1.0.3/src/xml_edit.c --- xmlstarlet-1.0.3-original/src/xml_edit.c 2010-11-14 11:18:43.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_edit.c 2010-12-17 12:08:55.762085127 -0500 @@ -109,7 +109,7 @@ */ static const char edit_usage_str_1[] = "XMLStarlet Toolkit: Edit XML document(s)\n" -"Usage: xml ed {} [ ... ]\n" +"Usage: xmlstarlet ed {} [ ... ]\n" "where\n" " - global options for editing\n" " - input XML document file name/uri (stdin otherwise)\n\n"; diff -uNr xmlstarlet-1.0.3-original/src/xml_elem.c xmlstarlet-1.0.3/src/xml_elem.c --- xmlstarlet-1.0.3-original/src/xml_elem.c 2010-11-10 18:42:26.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_elem.c 2010-12-17 12:08:55.763085005 -0500 @@ -67,7 +67,7 @@ static const char elem_usage_str[] = "XMLStarlet Toolkit: Display element structure of XML document\n" -"Usage: xml el [] \n" +"Usage: xmlstarlet el [] \n" "where\n" " - input XML document file name (stdin is used if missing)\n" " is one of:\n" diff -uNr xmlstarlet-1.0.3-original/src/xml_escape.c xmlstarlet-1.0.3/src/xml_escape.c --- xmlstarlet-1.0.3-original/src/xml_escape.c 2010-11-10 18:42:26.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_escape.c 2010-12-17 12:08:55.763085005 -0500 @@ -52,7 +52,7 @@ static const char escape_usage_str[] = "XMLStarlet Toolkit: %s special XML characters\n" -"Usage: xml %s [] []\n" +"Usage: xmlstarlet %s [] []\n" "where are\n" " --help - print usage\n" " (TODO: more to be added in future)\n" diff -uNr xmlstarlet-1.0.3-original/src/xml_format.c xmlstarlet-1.0.3/src/xml_format.c --- xmlstarlet-1.0.3-original/src/xml_format.c 2010-11-14 10:47:45.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_format.c 2010-12-17 12:08:55.764084881 -0500 @@ -73,7 +73,7 @@ */ static const char format_usage_str_1[] = "XMLStarlet Toolkit: Format XML document\n" -"Usage: xml fo [] \n" +"Usage: xmlstarlet fo [] \n" "where are\n" " -n or --noindent - do not indent\n" " -t or --indent-tab - indent output with tabulation\n" diff -uNr xmlstarlet-1.0.3-original/src/xml_ls.c xmlstarlet-1.0.3/src/xml_ls.c --- xmlstarlet-1.0.3-original/src/xml_ls.c 2010-11-14 10:47:45.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_ls.c 2010-12-17 12:08:55.764084881 -0500 @@ -44,7 +44,7 @@ static const char ls_usage_str[] = "XMLStarlet Toolkit: List directory as XML\n" -"Usage: xml ls\n" +"Usage: xmlstarlet ls\n" "Lists current directory in XML format.\n" "Time is shown per ISO 8601 spec.\n" "\n"; diff -uNr xmlstarlet-1.0.3-original/src/xml_pyx.c xmlstarlet-1.0.3/src/xml_pyx.c --- xmlstarlet-1.0.3-original/src/xml_pyx.c 2010-11-14 10:47:45.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_pyx.c 2010-12-17 12:08:55.765084757 -0500 @@ -23,7 +23,7 @@ */ static const char pyx_usage_str_1[] = "XMLStarlet Toolkit: Convert XML into PYX format (based on ESIS - ISO 8879)\n" -"Usage: xml pyx {}\n" +"Usage: xmlstarlet pyx {}\n" "where\n" " - input XML document file name (stdin is used if missing)\n\n"; diff -uNr xmlstarlet-1.0.3-original/src/xml_select.c xmlstarlet-1.0.3/src/xml_select.c --- xmlstarlet-1.0.3-original/src/xml_select.c 2010-11-13 11:56:13.000000000 -0500 +++ xmlstarlet-1.0.3/src/xml_select.c 2010-12-17 12:08:55.765084757 -0500 @@ -65,7 +65,7 @@ */ static const char select_usage_str_1[] = "XMLStarlet Toolkit: Select from XML document(s)\n" -"Usage: xml sel {