diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | doc/xslt.html | 2 | ||||
| -rw-r--r-- | doc/xsltproc.1 | 46 | ||||
| -rw-r--r-- | doc/xsltproc.xml | 60 | ||||
| -rw-r--r-- | doc/xsltproc2.html | 2 | ||||
| -rwxr-xr-x | python/tests/pyxsltproc.py | 2 | ||||
| -rw-r--r-- | xsltproc/xsltproc.c | 2 |
7 files changed, 71 insertions, 50 deletions
@@ -1,3 +1,10 @@ +Mon Aug 21 10:46:25 CEST 2006 Daniel Veillard <daniel@veillard.com> + + * doc/xslt.html python/tests/pyxsltproc.py xsltproc/xsltproc.c: + applied patch from Daniel Leidert to fix some typo + * xsltproc.xml xsltproc.1: applied another patch from Daniel Leidert + and regenerated + Wed Aug 16 17:39:04 CEST 2006 Daniel Veillard <daniel@veillard.com> * xsltproc/xsltproc.c: --xinclude should also force XInclude diff --git a/doc/xslt.html b/doc/xslt.html index c0d333b5..8a262420 100644 --- a/doc/xslt.html +++ b/doc/xslt.html @@ -1093,7 +1093,7 @@ Usage: xsltproc [options] stylesheet file [file ...] --nonet refuse to fetch DTDs or entities over network --warnnet warn against fetching over the network --catalogs : use the catalogs from $SGML_CATALOG_FILES - --xinclude : do XInclude processing on document intput + --xinclude : do XInclude processing on document input --profile or --norman : dump profiling informations orchis:~ -></pre> diff --git a/doc/xsltproc.1 b/doc/xsltproc.1 index 0b10849f..82c2357a 100644 --- a/doc/xsltproc.1 +++ b/doc/xsltproc.1 @@ -39,19 +39,6 @@ By default, output is to or \fB\-\-output\fR option. -.PP -More information can be found at -.TP 3 -\(bu -\fBlibxml\fR(3) -web page -\fI\%http://www.xmlsoft.org/\fR -.TP -\(bu -W3C -XSLT -page -\fI\%http://www.w3.org/TR/xslt\fR .SH "OPTIONS" .PP \fBxsltproc\fR @@ -166,7 +153,7 @@ Output profiling information detailing the amount of time spent in each part of Run the transformation 20 times. Used for timing tests. .TP \fB\-\-stringparam \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR -Pass a paramenter of name +Pass a parameter of name \fIPARAMNAME\fR and value \fIPARAMVALUE\fR @@ -197,22 +184,29 @@ Allow file write only within the subtree. .TP \fB\-\-xinclude\fR -Process the input document using the Xinclude specification. More details on this can be found in the Xinclude specification: +Process the input document using the XInclude specification. More details on this can be found in the XInclude specification: \fI\%http://www.w3.org/TR/xinclude/\fR .SH "ENVIRONMENT" .TP \fBSGML_CATALOG_FILES\fR -to be written ... +SGML +catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the +\fBSGML_CATALOG_FILES\fR +environment variable to a list of catalogs. An empty one should deactivate loading the default +\fI/etc/sgml/catalog\fR +catalog. .TP \fBXML_CATALOG_FILES\fR -Catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the +XML +catalog behavior can be changed by redirecting queries to the user's own set of catalogs. This can be done by setting the \fBXML_CATALOG_FILES\fR environment variable to a list of catalogs. An empty one should deactivate loading the default \fI/etc/xml/catalog\fR -default catalog. +catalog. .SH "DIAGNOSTICS" .PP -\fBxsltproc\fR's return codes provide information that can be used when calling it from scripts. +\fBxsltproc\fR +return codes provide information that can be used when calling it from scripts. .TP \fB0\fR No error (normal operation) @@ -248,6 +242,20 @@ Internal processing error Processing was stopped by a terminating message .SH "SEE ALSO" .PP +\fBlibxml\fR(3), \fBlibxslt\fR(3) +.PP +More information can be found at +.TP 3 +\(bu +\fBlibxml\fR(3) +web page +\fI\%http://www.xmlsoft.org/\fR +.TP +\(bu +W3C +XSLT +page +\fI\%http://www.w3.org/TR/xslt\fR .SH "AUTHOR" John Fleck <jfleck@inkstain.net>. diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml index ae292883..7e3922cb 100644 --- a/doc/xsltproc.xml +++ b/doc/xsltproc.xml @@ -133,22 +133,6 @@ You can specify a file for output using the <option>-o</option> or <option>--output</option> option. </para> - <para>More information can be found at - <itemizedlist> - <listitem> - <para><citerefentry> - <refentrytitle>libxml</refentrytitle> - <manvolnum>3</manvolnum> - </citerefentry> web page <ulink url="http://www.xmlsoft.org/"/> - </para> - </listitem> - <listitem> - <para> - W3C <acronym>XSLT</acronym> page <ulink url="http://www.w3.org/TR/xslt"/> - </para> - </listitem> - </itemizedlist> - </para> </refsect1> <refsect1 id="options"> @@ -349,7 +333,7 @@ </term> <listitem> <para> - Pass a paramenter of name <replaceable>PARAMNAME</replaceable> and + Pass a parameter of name <replaceable>PARAMNAME</replaceable> and value <replaceable>PARAMVALUE</replaceable> where <replaceable>PARAMVALUE</replaceable> is a string rather than a node identifier. <emphasis role="bold">Note:</emphasis> The string @@ -408,8 +392,8 @@ <term><option>--xinclude</option></term> <listitem> <para> - Process the input document using the Xinclude specification. More - details on this can be found in the Xinclude + Process the input document using the XInclude specification. More + details on this can be found in the XInclude specification: <ulink url="http://www.w3.org/TR/xinclude/"/> </para> </listitem> @@ -425,19 +409,23 @@ <varlistentry> <term><envar>SGML_CATALOG_FILES</envar></term> <listitem> - <para>to be written ...</para> + <para><acronym>SGML</acronym> catalog behavior can be changed by redirecting + queries to the user's own set of catalogs. This can be done by setting + the <envar>SGML_CATALOG_FILES</envar> environment variable to a list + of catalogs. An empty one should deactivate loading the + default <filename>/etc/sgml/catalog</filename> catalog. + </para> </listitem> </varlistentry> <varlistentry> <term><envar>XML_CATALOG_FILES</envar></term> <listitem> - <para> - Catalog behavior can be changed by redirecting queries to the user's - own set of catalogs. This can be done by setting + <para><acronym>XML</acronym> catalog behavior can be changed by redirecting + queries to the user's own set of catalogs. This can be done by setting the <envar>XML_CATALOG_FILES</envar> environment variable to a list of catalogs. An empty one should deactivate loading the - default <filename>/etc/xml/catalog</filename> default catalog. + default <filename>/etc/xml/catalog</filename> catalog. </para> </listitem> </varlistentry> @@ -448,7 +436,7 @@ <refsect1 id="diagnostics"> <title>DIAGNOSTICS</title> <para> - &xsltproc;'s return codes provide information that can be used when + &xsltproc; return codes provide information that can be used when calling it from scripts. </para> <variablelist> @@ -535,12 +523,30 @@ <refsect1 id="seealso"> <title>SEE ALSO</title> - <para> - <citerefentry> + <para><citerefentry> + <refentrytitle>libxml</refentrytitle> + <manvolnum>3</manvolnum> + </citerefentry>, <citerefentry> <refentrytitle>libxslt</refentrytitle> <manvolnum>3</manvolnum> </citerefentry> </para> + <para> + More information can be found at + <itemizedlist> + <listitem> + <para><citerefentry> + <refentrytitle>libxml</refentrytitle> + <manvolnum>3</manvolnum> + </citerefentry> web page <ulink url="http://www.xmlsoft.org/"/> + </para> + </listitem> + <listitem> + <para>W3C <acronym>XSLT</acronym> page <ulink url="http://www.w3.org/TR/xslt"/> + </para> + </listitem> + </itemizedlist> + </para> </refsect1> </refentry> diff --git a/doc/xsltproc2.html b/doc/xsltproc2.html index face60f7..51b0fcc6 100644 --- a/doc/xsltproc2.html +++ b/doc/xsltproc2.html @@ -30,6 +30,6 @@ Usage: xsltproc [options] stylesheet file [file ...] --nonet refuse to fetch DTDs or entities over network --warnnet warn against fetching over the network --catalogs : use the catalogs from $SGML_CATALOG_FILES - --xinclude : do XInclude processing on document intput + --xinclude : do XInclude processing on document input --profile or --norman : dump profiling informations orchis:~ -></pre><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html> diff --git a/python/tests/pyxsltproc.py b/python/tests/pyxsltproc.py index 85700971..81b9d9f5 100755 --- a/python/tests/pyxsltproc.py +++ b/python/tests/pyxsltproc.py @@ -122,7 +122,7 @@ def usage(name = 'pyxsltproc'): print "\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES" print "\t otherwise XML Catalogs starting from " print "\t file:///etc/xml/catalog are activated by default" - print "\t--xinclude : do XInclude processing on document intput" + print "\t--xinclude : do XInclude processing on document input" print "\t--profile or --norman : dump profiling informations " print "\nProject libxslt home page: http://xmlsoft.org/XSLT/" print "To report bugs and get help: http://xmlsoft.org/XSLT/bugs.html" diff --git a/xsltproc/xsltproc.c b/xsltproc/xsltproc.c index 7abee404..da80e037 100644 --- a/xsltproc/xsltproc.c +++ b/xsltproc/xsltproc.c @@ -511,7 +511,7 @@ static void usage(const char *name) { printf("\t file:///etc/xml/catalog are activated by default\n"); #endif #ifdef LIBXML_XINCLUDE_ENABLED - printf("\t--xinclude : do XInclude processing on document intput\n"); + printf("\t--xinclude : do XInclude processing on document input\n"); #endif printf("\t--load-trace : print trace of all external entites loaded\n"); printf("\t--profile or --norman : dump profiling informations \n"); |