[xml/sgml-commit] r527 - in packages/libxslt: . trunk/debian trunk/doc trunk/libxslt

Mike Hommey glandium at costa.debian.org
Mon Feb 20 18:59:02 UTC 2006


Author: glandium
Date: 2006-02-20 18:58:17 +0000 (Mon, 20 Feb 2006)
New Revision: 527

Modified:
   packages/libxslt/
   packages/libxslt/trunk/debian/changelog
   packages/libxslt/trunk/debian/control
   packages/libxslt/trunk/doc/xsltproc.1
   packages/libxslt/trunk/doc/xsltproc.html
   packages/libxslt/trunk/doc/xsltproc.xml
   packages/libxslt/trunk/libxslt/preproc.c
Log:
 r988 at namakemono:  mh | 2006-02-20 18:42:11 +0100
 * debian/control: Removed python2.2-libxslt and build-dep on python2.2-dev
   and python2.2-libxml2. Closes: #351126.
 * doc/xsltproc.xml, doc/xsltproc.1: Applied patch from upstream cvs.  That
   improves the manual page by many ways, and Closes: #345496, #353557.
   Thanks Daniel Leidert.
 * doc/xsltproc.html: Manually updated with changes from the .xml file.
 * libxslt/preproc.c:
   + Fixed spurious free() when xsl:number/@lang is present.
   + Fixed spurious free() when xsl:number/@level has an invalid value.
   + Added a message about the fact that xsl:number/@lang is no implemented.
   Closes: #347542.



Property changes on: packages/libxslt
___________________________________________________________________
Name: svk:merge
   - 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:978
   + 85a06573-1206-0410-a182-ce9117885d71:/local/libxslt:284
a066b643-3b0a-0410-a6ba-ed4cca522822:/local/libxslt:988

Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/debian/changelog	2006-02-20 18:58:17 UTC (rev 527)
@@ -1,3 +1,19 @@
+libxslt (1.1.15-4) unstable; urgency=low
+
+  * debian/control: Removed python2.2-libxslt and build-dep on python2.2-dev
+    and python2.2-libxml2. Closes: #351126.
+  * doc/xsltproc.xml, doc/xsltproc.1: Applied patch from upstream cvs.  That
+    improves the manual page by many ways, and Closes: #345496, #353557.
+    Thanks Daniel Leidert.
+  * doc/xsltproc.html: Manually updated with changes from the .xml file.
+  * libxslt/preproc.c:
+    + Fixed spurious free() when xsl:number/@lang is present.
+    + Fixed spurious free() when xsl:number/@level has an invalid value.
+    + Added a message about the fact that xsl:number/@lang is no implemented.
+    Closes: #347542.
+
+ -- Mike Hommey <glandium at debian.org>  Mon, 20 Feb 2006 11:21:15 +0100
+
 libxslt (1.1.15-3) unstable; urgency=low
 
   * debian/control, debian/rules: Added a libxslt1-dbg package containing

Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/debian/control	2006-02-20 18:58:17 UTC (rev 527)
@@ -4,7 +4,7 @@
 Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>
 Standards-Version: 3.6.2.1
-Build-Depends: debhelper (>= 5.0.0), libxml2-dev (>= 2.6.17), python, python2.4-dev, python2.3-dev, python2.2-dev, python2.4-libxml2 (>= 2.6.17), python2.3-libxml2 (>= 2.6.17), python2.2-libxml2 (>= 2.6.17), zlib1g-dev | libz-dev, libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
+Build-Depends: debhelper (>= 5.0.0), libxml2-dev (>= 2.6.17), python, python2.4-dev, python2.3-dev, python2.4-libxml2 (>= 2.6.17), python2.3-libxml2 (>= 2.6.17), zlib1g-dev | libz-dev, libgcrypt11-dev, autotools-dev, binutils (>= 2.14.90.0.7)
 
 Package: libxslt1.1
 Section: libs
@@ -100,17 +100,3 @@
  .
  This package contains Python 2.3 binding for libxslt, needed to use
  libxslt in Python programs.
-
-Package: python2.2-libxslt1
-Section: python
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, python2.2-libxml2 (>= 2.6.17), python2.2
-Description:  Python 2.2 bindings for libxslt1
- XSLT is an XML language for defining transformations of XML files from
- XML to some other arbitrary format, such as XML, HTML, plain text, etc.
- using standard XSLT stylesheets. libxslt is a C library which
- implements XSLT.
- .
- This package contains Python 2.2 binding for libxslt, needed to use
- libxslt in Python programs.

Modified: packages/libxslt/trunk/doc/xsltproc.1
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.1	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/doc/xsltproc.1	2006-02-20 18:58:17 UTC (rev 527)
@@ -24,37 +24,40 @@
 .ad l
 .hy 0
 .HP 9
-\fBxsltproc\fR [\fB\-V\fR | \fB\-v\fR | \fB\-o\ \fIfile\fR\fR | \fB\-\-timing\fR | \fB\-\-repeat\fR | \fB\-\-debug\fR | \fB\-\-novalid\fR | \fB\-\-noout\fR | \fB\-\-maxdepth\ \fIval\fR\fR | \fB\-\-html\fR | \fB\-\-param\ \fIname\fR\ \fIvalue\fR\fR | \fB\-\-stringparam\ \fIname\fR\ \fIvalue\fR\fR | \fB\-\-nonet\fR | \fB\-\-path\ \fIpaths\fR\fR | \fB\-\-load\-trace\fR | \fB\-\-catalogs\fR | \fB\-\-xinclude\fR | \fB\-\-profile\fR | \fB\-\-dumpextensions\fR | \fB\-\-nowrite\fR | \fB\-\-nomkdir\fR | \fB\-\-writesubtree\fR | \fB\-\-nodtdattr\fR] [\fB\fIstylesheet\fR\fR] [\fIfile1\fR] [\fIfile2\fR] [\fI\&.\&.\&.\&.\fR]
+\fBxsltproc\fR [[\fB\fB\-V\fR\fR | \fB\fB\-\-version\fR\fR] [\fB\fB\-v\fR\fR | \fB\fB\-\-verbose\fR\fR] | \fB{\fB\fB\-o\fR\fR\ |\ \fB\fB\-\-output\fR\fR}\ \fIFILE\fR\fR | \fB\fB\-\-timing\fR\fR | \fB\fB\-\-repeat\fR\fR | \fB\fB\-\-debug\fR\fR | \fB\fB\-\-novalid\fR\fR | \fB\fB\-\-noout\fR\fR | \fB\fB\-\-maxdepth\ \fIVALUE\fR\fR\fR | \fB\fB\-\-html\fR\fR | \fB\fB\-\-param\ \fIPARAMNAME\fR\ \fIPARAMVALUE\fR\ \fR\fR | \fB\fB\-\-stringparam\ \fIPARAMNAME\fR\ \fIPARAMVALUE\fR\ \fR\fR | \fB\fB\-\-nonet\fR\fR | \fB\fB\-\-path\ "\fIPATHS\fR"\fR\fR | \fB\fB\-\-load\-trace\fR\fR | \fB\fB\-\-catalogs\fR\fR | \fB\fB\-\-xinclude\fR\fR [\fB\fB\-\-profile\fR\fR | \fB\fB\-\-norman\fR\fR] | \fB\fB\-\-dumpextensions\fR\fR | \fB\fB\-\-nowrite\fR\fR | \fB\fB\-\-nomkdir\fR\fR | \fB\fB\-\-writesubtree\ \fIPATH\fR\fR\fR | \fB\fB\-\-nodtdattr\fR\fR] [\fISTYLESHEET\fR] {\fIFILE\fR...}
 .ad
 .hy
 
-.SH "INTRODUCTION"
+.SH "DESCRIPTION"
 
 .PP
- xsltproc is a command line tool for applying XSLT stylesheets to XML documents\&. It is part of libxslt, the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
+\fBxsltproc\fR is a command line tool for applying XSLT stylesheets to XML documents\&. It is part of libxslt, the XSLT C library for GNOME\&. While it was developed as part of the GNOME project, it can operate independently of the GNOME desktop\&.
 
 .PP
- xsltproc is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is \- \&.
+\fBxsltproc\fR is invoked from the command line with the name of the stylesheet to be used followed by the name of the file or files to which the stylesheet is to be applied\&. It will use the standard input if a filename provided is \- \&.
 
 .PP
-If a stylesheet is included in an XML document with a Stylesheet Processing Instruction, no stylesheet need be named at the command line\&. xsltproc will automatically detect the included stylesheet and use it\&.
+If a stylesheet is included in an XML document with a Stylesheet Processing Instruction, no stylesheet need be named at the command line\&. \fBxsltproc\fR will automatically detect the included stylesheet and use it\&.
 
 .PP
 By default, output is to stdout\&. You can specify a file for output using the \fB\-o\fR option\&.
 
-.SH "COMMAND LINE OPTIONS"
+.SH "OPTIONS"
 
+.PP
+\fBxsltproc\fR currently accepts the following options:
+
 .TP
 \fB\-V\fR or \fB\-\-version\fR
 Show the version of libxml and libxslt used\&.
 
 .TP
 \fB\-v\fR or \fB\-\-verbose\fR
-Output each step taken by xsltproc in processing the stylesheet and the document\&.
+Output each step taken by \fBxsltproc\fR in processing the stylesheet and the document\&.
 
 .TP
-\fB\-o\fR or \fB\-\-output\fR \fIfile\fR
-Direct output to the file named \fIfile\fR\&. For multiple outputs, also known as "chunking", \fB\-o\fR  \fBdirectory/\fR directs the output files to a specified directory\&. The directory must already exist\&.
+\fB\-o\fR or \fB\-\-output\fR \fIFILE\fR
+Direct output to the file named \fIFILE\fR\&. For multiple outputs, also known as "chunking", \fB\-o \fIDIRECTORY/\fR\fR directs the output files to a specified directory\&. The directory must already exist\&.
 
 .TP
 \fB\-\-timing\fR
@@ -77,7 +80,7 @@
 Do not output the result\&.
 
 .TP
-\fB\-\-maxdepth\fR \fIvalue\fR
+\fB\-\-maxdepth \fIVALUE\fR\fR
 Adjust the maximum depth of the template stack before libxslt concludes it is in an infinite loop\&. The default is 500\&.
 
 .TP
@@ -85,20 +88,20 @@
 The input document is an HTML file\&.
 
 .TP
-\fB\-\-param\fR \fIname\fR \fIvalue\fR
-Pass a parameter of name \fIname\fR and value \fIvalue\fR to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string rather than a node identifier, use \fB\-\-stringparam\fR instead\&.
+\fB\-\-param \fIPARAMNAME\fR \fIPARAMVALUE\fR\fR
+Pass a parameter of name \fIPARAMNAME\fR and value \fIPARAMVALUE\fR to the stylesheet\&. You may pass multiple name/value pairs up to a maximum of 32\&. If the value being passed is a string rather than a node identifier, use \fB\-\-stringparam\fR instead\&.
 
 .TP
-\fB\-\-stringparam\fR \fIname\fR \fIvalue\fR
-Pass a paramenter of name \fIname\fR and value \fIvalue\fR where \fIvalue\fR is a string rather than a node identifier\&. (Note: The string must be utf\-8\&.)
+\fB\-\-stringparam \fIPARAMNAME\fR \fIPARAMVALUE\fR\fR
+Pass a paramenter of name \fIPARAMNAME\fR and value \fIPARAMVALUE\fR where \fIPARAMVALUE\fR is a string rather than a node identifier\&. (Note: The string must be utf\-8\&.)
 
 .TP
 \fB\-\-nonet\fR
-Do not use the Internet to fetch DTD's, entities or documents\&.
+Do not use the Internet to fetch DTDs, entities or documents\&.
 
 .TP
-\fB\-\-path\fR \fIpaths\fR
-Use the list (separated by space or column) of filesystem paths specified by \fIpaths\fR to load DTDs, entities or documents\&.
+\fB\-\-path "\fIPATHS\fR"\fR
+Use the list (separated by space or colon) of filesystem paths specified by \fIpaths\fR to load DTDs, entities or documents\&.
 
 .TP
 \fB\-\-load\-trace\fR
@@ -106,11 +109,11 @@
 
 .TP
 \fB\-\-catalogs\fR
-Use the SGML catalog specified in \fBSGML_CATALOG_FILES\fR to resolve the location of external entities\&. By default, xsltproc looks for the catalog specified in \fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses \fI/etc/xml/catalog\fR\&.
+Use the SGML catalog specified in \fBSGML_CATALOG_FILES\fR to resolve the location of external entities\&. By default, \fBxsltproc\fR looks for the catalog specified in \fBXML_CATALOG_FILES\fR\&. If that is not specified, it uses \fI/etc/xml/catalog\fR\&.
 
 .TP
 \fB\-\-xinclude\fR
-Process the input document using the Xinclude specification\&. More details on this can be found in the Xinclude specification: http://www\&.w3\&.org/TR/xinclude/: \fIhttp://www.w3.org/TR/xinclude/\fR 
+Process the input document using the Xinclude specification\&. More details on this can be found in the Xinclude specification: \fIhttp://www.w3.org/TR/xinclude/\fR 
 
 .TP
 \fB\-\-profile\fR or \fB\-\-norman\fR
@@ -129,58 +132,76 @@
 Refuses to create directories\&.
 
 .TP
-\fB\-\-writesubtree\fR \fIpath\fR
-Allow file write only within the \fIpath\fR subtree\&.
+\fB\-\-writesubtree \fIPATH\fR\fR
+Allow file write only within the \fIPATH\fR subtree\&.
 
 .TP
 \fB\-\-nodtdattr\fR
 Do not apply default attributes from the document's DTD\&.
 
-.SH "RETURN VALUES"
+.SH "ENVIRONMENT"
 
-.PP
-xsltproc's return codes provide information that can be used when calling it from scripts\&.
+.TP
+\fBSGML_CATALOG_FILES\fR
+\&.\&.\&.
 
-.PP
-0: normal
+.TP
+\fBXML_CATALOG_FILES\fR
+\&.\&.\&.
 
-.PP
-1: no argument
+.SH "DIAGNOSTICS"
 
 .PP
-2: too many parameters
+\fBxsltproc\fR's return codes provide information that can be used when calling it from scripts\&.
 
-.PP
-3: unknown option
+.TP
+\fB0\fR
+normal
 
-.PP
-4: failed to parse the stylesheet
+.TP
+\fB1\fR
+no argument
 
-.PP
-5: error in the stylesheet
+.TP
+\fB2\fR
+too many parameters
 
-.PP
-6: error in one of the documents
+.TP
+\fB3\fR
+unknown option
 
-.PP
-7: unsupported xsl:output method
+.TP
+\fB4\fR
+failed to parse the stylesheet
 
-.PP
-8: string parameter contains both quote and double\-quotes
+.TP
+\fB5\fR
+error in the stylesheet
 
-.PP
-9: internal processing error
+.TP
+\fB6\fR
+error in one of the documents
 
-.PP
-10: processing was stopped by a terminating message
+.TP
+\fB7\fR
+unsupported xsl:output method
 
-.SH "MORE INFORMATION"
+.TP
+\fB8\fR
+string parameter contains both quote and double\-quotes
 
-.PP
-libxml web page:http://www\&.xmlsoft\&.org/: \fIhttp://www.xmlsoft.org/\fR
+.TP
+\fB9\fR
+internal processing error
 
+.TP
+\fB10\fR
+processing was stopped by a terminating message
+
+.SH "SEE ALSO"
+
 .PP
-W3C XSLT page:http://www\&.w3\&.org/TR/xslt: \fIhttp://www.w3.org/TR/xslt\fR
+More information can be found at the libxml web pages at \fIhttp://www.xmlsoft.org/\fR and the W3C XSLT pages at \fIhttp://www.w3.org/TR/xslt\fR\&.
 
 .SH AUTHOR
 John Fleck.

Modified: packages/libxslt/trunk/doc/xsltproc.html
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.html	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/doc/xsltproc.html	2006-02-20 18:58:17 UTC (rev 527)
@@ -1,101 +1,95 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xsltproc</title><meta name="generator" content="DocBook XSL Stylesheets V1.61.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="id2685813"></a><div class="titlepage"><div></div><div></div></div><div class="refnamediv"><h2>Name</h2><p>xsltproc &#8212; command line xslt processor</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><tt class="command">xsltproc</tt>  [[-V] |  [-v] |  [-o <i class="replaceable"><tt>file</tt></i>] |  [--timing] |  [--repeat] |  [--debug] |  [--novalid] |  [--noout] |  [--maxdepth <i class="replaceable"><tt>val</tt></i>] |  [--html] |  [--param <i class="replaceable"><tt>name</tt></i> <i class="replaceable"><tt>value</tt></i>] |  [--stringparam <i class="replaceable"><tt>name</tt></i> <i class="replaceable"><tt>value</tt></i>] |  [--nonet] |  [--path <i class="replaceable"><tt>paths</tt></i>] |  [--load-trace] |  [--catalogs] |  [--xinclude] |  [--profile] |  [--dumpextensions] |  [--nowrite] |  [--nomkdir] |  [--writesubtree] |  [--nodtdattr]] [<tt class="option"><i class="replaceable"><tt>stylesheet</tt></i></tt>] [<i class="replaceable"><tt>file1</tt></i>] [<i class="replaceable"><tt>file2</tt></i>] [<i class="replaceable"><tt>....</tt></i>]</p></div></div><div class="refsect1" lang="en"><a name="introduction"></a><h2>Introduction</h2><p>
-      <span class="application">xsltproc</span> is a command line tool for applying
-      <span class="acronym">XSLT</span> stylesheets to <span class="acronym">XML</span>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>xsltproc</title><meta name="generator" content="DocBook XSL Stylesheets V1.68.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="id2450197"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>xsltproc &#8212; command line xslt processor</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">xsltproc</code>  [[ <code class="option">-V</code>  |   <code class="option">--version</code> ] [ <code class="option">-v</code>  |   <code class="option">--verbose</code> ] |  [
+           { <code class="option">-o</code>  |   <code class="option">--output</code> }
+          <em class="replaceable"><code>FILE</code></em>
+        ] |   <code class="option">--timing</code>  |   <code class="option">--repeat</code>  |   <code class="option">--debug</code>  |   <code class="option">--novalid</code>  |   <code class="option">--noout</code>  |   <code class="option">--maxdepth <em class="replaceable"><code>VALUE</code></em></code>  |   <code class="option">--html</code>  |   <code class="option">--param
+         <em class="replaceable"><code>PARAMNAME</code></em>
+         <em class="replaceable"><code>PARAMVALUE</code></em>
+        </code>  |   <code class="option">--stringparam
+         <em class="replaceable"><code>PARAMNAME</code></em>
+         <em class="replaceable"><code>PARAMVALUE</code></em>
+        </code>  |   <code class="option">--nonet</code>  |   <code class="option">--path "<em class="replaceable"><code>PATHS</code></em>"</code>  |   <code class="option">--load-trace</code>  |   <code class="option">--catalogs</code>  |   <code class="option">--xinclude</code>  [ <code class="option">--profile</code>  |   <code class="option">--norman</code> ] |   <code class="option">--dumpextensions</code>  |   <code class="option">--nowrite</code>  |   <code class="option">--nomkdir</code>  |   <code class="option">--writesubtree <em class="replaceable"><code>PATH</code></em></code>  |   <code class="option">--nodtdattr</code> ] [<em class="replaceable"><code>STYLESHEET</code></em>] {<em class="replaceable"><code>FILE</code></em>...}</p></div></div><div class="refsect1" lang="en"><a name="introduction"></a><h2>DESCRIPTION</h2><p><span><strong class="command">xsltproc</strong></span> is a command line tool for applying <span class="acronym">XSLT</span>
+      stylesheets to <span class="acronym">XML</span>
       documents. It is part of <span class="application">libxslt</span>, the XSLT C
       library for GNOME. While it was developed as part of the GNOME project, it
       can operate independently of the GNOME desktop.
-   </p><p>
-      <span class="application">xsltproc</span> is invoked from the command line with
+   </p><p><span><strong class="command">xsltproc</strong></span> is invoked from the command line with
       the name of the stylesheet to be used followed by the name of the file or
       files to which the stylesheet is to be applied. It will use the standard
       input if a filename provided is - .
     </p><p>
       If a stylesheet is included in an <span class="acronym">XML</span> document with a
       Stylesheet Processing Instruction, no stylesheet need be named at the
-      command line. <span class="application">xsltproc</span> will automatically
+      command line. <span><strong class="command">xsltproc</strong></span> will automatically
       detect the included stylesheet and use it.
     </p><p>
       By default, output is to stdout. You can specify a file for output using
-      the <tt class="option">-o</tt> option.
-    </p></div><div class="refsect1" lang="en"><a name="options"></a><h2>Command Line Options</h2><div class="variablelist"><dl><dt><span class="term"><tt class="option">-V</tt> or <tt class="option">--version</tt></span></dt><dd>Show the version of
-      <span class="application">libxml</span> and <span class="application">libxslt</span> used.
-    </dd><dt><span class="term">
-      <tt class="option">-v</tt> or <tt class="option">--verbose</tt></span></dt><dd>Output each step taken
-      by <span class="application">xsltproc</span> in processing the stylesheet and the document.
-    </dd><dt><span class="term">
-      <tt class="option">-o</tt> or <tt class="option">--output</tt> <i class="replaceable"><tt>file</tt></i></span></dt><dd>Direct output to the file named
-      <i class="replaceable"><tt>file</tt></i>. For multiple outputs, also known as
-      "chunking", <tt class="option">-o</tt> <tt class="option">directory/</tt> directs the
-      output files to a specified directory. The directory must already exist.
-    </dd><dt><span class="term">
-      <tt class="option">--timing</tt></span></dt><dd>Display the time used for parsing the
+      the <code class="option">-o</code> option.
+    </p></div><div class="refsect1" lang="en"><a name="options"></a><h2>OPTIONS</h2><p><span><strong class="command">xsltproc</strong></span> currently accepts the following options:</p><div class="variablelist"><dl><dt><span class="term"><code class="option">-V</code> or <code class="option">--version</code></span></dt><dd>Show the version of <span class="application">libxml</span>
+	    and <span class="application">libxslt</span> used.</dd><dt><span class="term">
+      <code class="option">-v</code> or <code class="option">--verbose</code></span></dt><dd>Output each step taken by <span><strong class="command">xsltproc</strong></span> in processing the
+	    stylesheet and the document.</dd><dt><span class="term">
+      <code class="option">-o</code> or <code class="option">--output</code> <em class="replaceable"><code>FILE</code></em></span></dt><dd>Direct output to the file named
+      <em class="replaceable"><code>FILE</code></em>. For multiple outputs, also known as
+      "chunking", <code class="option">-o <em class="replaceable"><code>DIRECTORY/</code></em></code>
+      directs the output files to a specified directory. The directory must
+      already exist.</dd><dt><span class="term">
+      <code class="option">--timing</code></span></dt><dd>Display the time used for parsing the
       stylesheet, parsing the document and applying the stylesheet and saving
       the result. Displayed in milliseconds.
     </dd><dt><span class="term">
-      <tt class="option">--repeat</tt></span></dt><dd>Run the transformation 20 times. Used for
+      <code class="option">--repeat</code></span></dt><dd>Run the transformation 20 times. Used for
       timing tests.
     </dd><dt><span class="term">
-      <tt class="option">--debug</tt></span></dt><dd>Output an <span class="acronym">XML</span> tree of the
+      <code class="option">--debug</code></span></dt><dd>Output an <span class="acronym">XML</span> tree of the
       transformed document for debugging purposes.
     </dd><dt><span class="term">
-      <tt class="option">--novalid</tt></span></dt><dd>Skip loading the document's <span class="acronym">DTD</span>.
+      <code class="option">--novalid</code></span></dt><dd>Skip loading the document's <span class="acronym">DTD</span>.</dd><dt><span class="term">
+      <code class="option">--noout</code></span></dt><dd>Do not output the result.</dd><dt><span class="term">
+      <code class="option">--maxdepth <em class="replaceable"><code>VALUE</code></em></code></span></dt><dd>Adjust the
+      maximum depth of the template stack before <span class="application">libxslt</span>
+      concludes it is in an infinite loop. The default is 500.
     </dd><dt><span class="term">
-      <tt class="option">--noout</tt></span></dt><dd>Do not output the result.
-    </dd><dt><span class="term">
-      <tt class="option">--maxdepth</tt> <i class="replaceable"><tt>value</tt></i></span></dt><dd>Adjust the
-      maximum depth of the template stack before
-      <span class="application">libxslt</span> concludes it is in an infinite
-      loop. The default is 500.
-    </dd><dt><span class="term">
-      <tt class="option">--html</tt></span></dt><dd>The input document is an <span class="acronym">HTML</span>
-      file.
-    </dd><dt><span class="term">
-      <tt class="option">--param</tt> <i class="replaceable"><tt>name</tt></i> <i class="replaceable"><tt>value</tt></i></span></dt><dd>Pass a parameter of name
-      <i class="replaceable"><tt>name</tt></i> and value
-      <i class="replaceable"><tt>value</tt></i> to the stylesheet. You may pass multiple
-      name/value pairs up to a maximum of 32. If the value being passed is a
-	    string rather than a node identifier, use
-	    <tt class="option">--stringparam</tt> instead.
-	  </dd><dt><span class="term">
-	  <tt class="option">--stringparam</tt> <i class="replaceable"><tt>name</tt></i> <i class="replaceable"><tt>value</tt></i></span></dt><dd>Pass a paramenter of name <i class="replaceable"><tt>name</tt></i> and
-	    value <i class="replaceable"><tt>value</tt></i> where
-	    <i class="replaceable"><tt>value</tt></i> is a string rather than a node
+      <code class="option">--html</code></span></dt><dd>The input document is an <span class="acronym">HTML</span>
+      file.</dd><dt><span class="term">
+      <code class="option">--param <em class="replaceable"><code>PARAMNAME</code></em> <em class="replaceable"><code>PARAMVALUE</code></em></code></span></dt><dd>Pass a parameter of name <em class="replaceable"><code>PARAMNAME</code></em> and
+	    value <em class="replaceable"><code>PARAMVALUE</code></em> to the stylesheet. You may pass
+	    multiple name/value pairs up to a maximum of 32. If the value being passed
+	    is a string rather than a node identifier, use <code class="option">--stringparam</code>
+	    instead.</dd><dt><span class="term">
+	  <code class="option">--stringparam <em class="replaceable"><code>PARAMNAME</code></em> <em class="replaceable"><code>PARAMVALUE</code></em></code></span></dt><dd>Pass a paramenter of name <em class="replaceable"><code>PARAMNAME</code></em> and
+	    value <em class="replaceable"><code>PARAMVALUE</code></em>
+	    where <em class="replaceable"><code>PARAMVALUE</code></em> is a string rather than a node
 	    identifier. (Note: The string must be utf-8.) </dd><dt><span class="term">
-      <tt class="option">--nonet</tt></span></dt><dd>Do not use the Internet to fetch DTD's,
-      entities or documents.
-    </dd><dt><span class="term"> <tt class="option">--path</tt> <i class="replaceable"><tt>paths</tt></i></span></dt><dd>
-	    Use the list (separated by space or column) of filesystem paths 
-	specified by <i class="replaceable"><tt>paths</tt></i> to load
-        <span class="acronym">DTDs</span>, entities or documents.
-	  </dd><dt><span class="term"><tt class="option">--load-trace</tt></span></dt><dd>
+      <code class="option">--nonet</code></span></dt><dd>Do not use the Internet to fetch <span class="acronym">DTD</span>s,
+      entities or documents.</dd><dt><span class="term"><code class="option">--path "<em class="replaceable"><code>PATHS</code></em>"</code></span></dt><dd>
+	    Use the list (separated by space or colon) of filesystem paths 
+	specified by <em class="replaceable"><code>paths</code></em> to
+	load <span class="acronym">DTDs</span>, entities or documents.
+	  </dd><dt><span class="term"><code class="option">--load-trace</code></span></dt><dd>
 	    Display to stderr all the documents loaded during the processing.
 	  </dd><dt><span class="term">
-      <tt class="option">--catalogs</tt></span></dt><dd>Use the <span class="acronym">SGML</span> catalog specified in
-      <tt class="envar">SGML_CATALOG_FILES</tt> to resolve the location of
-	    external entities. By default, <span class="application">xsltproc</span>
-	    looks for the catalog specified in
-      <tt class="envar">XML_CATALOG_FILES</tt>. If that is not specified, it uses
-      <tt class="filename">/etc/xml/catalog</tt>.
+      <code class="option">--catalogs</code></span></dt><dd>Use the <span class="acronym">SGML</span> catalog specified
+	    in <code class="envar">SGML_CATALOG_FILES</code> to resolve the location of
+	    external entities. By default, <span><strong class="command">xsltproc</strong></span>
+	    looks for the catalog specified in <code class="envar">XML_CATALOG_FILES</code>.
+	    If that is not specified, it uses <code class="filename">/etc/xml/catalog</code>.
     </dd><dt><span class="term">
-      <tt class="option">--xinclude</tt></span></dt><dd>Process the input document using the
+      <code class="option">--xinclude</code></span></dt><dd>Process the input document using the
       Xinclude specification. More details on this can be found in the Xinclude
       specification: <a href="http://www.w3.org/TR/xinclude/" target="_top">http://www.w3.org/TR/xinclude/</a>
     </dd><dt><span class="term">
-      <tt class="option">--profile</tt> or <tt class="option">--norman</tt></span></dt><dd>Output profiling
+      <code class="option">--profile</code> or <code class="option">--norman</code></span></dt><dd>Output profiling
       information detailing the amount of time spent in each part of the
-      stylesheet. This is useful in optimizing stylesheet performance.
-    </dd><dt><span class="term">
-      <tt class="option">--dumpextensions</tt></span></dt><dd>Dumps the list of all registered extensions on stdout.
-    </dd><dt><span class="term">
-      <tt class="option">--nowrite</tt></span></dt><dd>Refuses to write to any file or resource.
-    </dd><dt><span class="term">
-      <tt class="option">--nomkdir</tt></span></dt><dd>Refuses to create directories.
-    </dd><dt><span class="term">
-      <tt class="option">--writesubtree</tt> <i class="replaceable"><tt>path</tt></i></span></dt><dd>Allow file write only within the
-	  <i class="replaceable"><tt>path</tt></i> subtree.
-    </dd><dt><span class="term">
-	  <tt class="option">--nodtdattr</tt>
-	</span></dt><dd>Do not apply default attributes from the document's
-	  <span class="acronym">DTD</span>.
-	  </dd></dl></div></div><div class="refsect1" lang="en"><a name="return"></a><h2>Return values</h2><p><span class="application">xsltproc</span>'s return codes provide information
-    that can be used when calling it from scripts.</p><p>0: normal</p><p>1: no argument</p><p>2: too many parameters</p><p>3: unknown option</p><p>4: failed to parse the stylesheet</p><p>5: error in the stylesheet</p><p>6: error in one of the documents</p><p>7: unsupported xsl:output method</p><p>8: string parameter contains both quote and double-quotes</p><p>9: internal processing error</p><p>10: processing was stopped by a terminating message</p></div><div class="refsect1" lang="en"><a name="moreinfo"></a><h2>More Information</h2><p><span class="application">libxml web page: </span><a href="http://www.xmlsoft.org/" target="_top">http://www.xmlsoft.org/</a></p><p>W3C <span class="acronym">XSLT page: </span><a href="http://www.w3.org/TR/xslt" target="_top">http://www.w3.org/TR/xslt</a></p></div></div></body></html>
+      stylesheet. This is useful in optimizing stylesheet
+      performance.</dd><dt><span class="term">
+      <code class="option">--dumpextensions</code></span></dt><dd>Dumps the list of all registered extensions on stdout.</dd><dt><span class="term">
+      <code class="option">--nowrite</code></span></dt><dd>Refuses to write to any file or resource.</dd><dt><span class="term">
+      <code class="option">--nomkdir</code></span></dt><dd>Refuses to create directories.</dd><dt><span class="term">
+      <code class="option">--writesubtree <em class="replaceable"><code>PATH</code></em></code></span></dt><dd>Allow file write only within
+	  the <em class="replaceable"><code>PATH</code></em> subtree.</dd><dt><span class="term">
+	  <code class="option">--nodtdattr</code>
+	</span></dt><dd>Do not apply default attributes from the
+	  document's <span class="acronym">DTD</span>.</dd></dl></div></div><div class="refsect1" lang="en"><a name="envar"></a><h2>ENVIRONMENT</h2><div class="variablelist"><dl><dt><span class="term"><code class="envar">SGML_CATALOG_FILES</code></span></dt><dd><p>...</p></dd><dt><span class="term"><code class="envar">XML_CATALOG_FILES</code></span></dt><dd><p>...</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="return"></a><h2>DIAGNOSTICS</h2><p><span><strong class="command">xsltproc</strong></span>'s return codes provide information
+    that can be used when calling it from scripts.</p><div class="variablelist"><dl><dt><span class="term"><span class="errorcode">0</span></span></dt><dd><p>normal</p></dd><dt><span class="term"><span class="errorcode">1</span></span></dt><dd><p>no argument</p></dd><dt><span class="term"><span class="errorcode">2</span></span></dt><dd><p>too many parameters</p></dd><dt><span class="term"><span class="errorcode">3</span></span></dt><dd><p>unknown option</p></dd><dt><span class="term"><span class="errorcode">4</span></span></dt><dd><p>failed to parse the stylesheet</p></dd><dt><span class="term"><span class="errorcode">5</span></span></dt><dd><p>error in the stylesheet</p></dd><dt><span class="term"><span class="errorcode">6</span></span></dt><dd><p>error in one of the documents</p></dd><dt><span class="term"><span class="errorcode">7</span></span></dt><dd><p>unsupported xsl:output method</p></dd><dt><span class="term"><span class="errorcode">8</span></span></dt><dd><p>string parameter contains both quote and double-quotes</p></dd><dt><span class="term"><span class="errorcode">9</span></span></dt><dd><p>internal processing error</p></dd><dt><span class="term"><span class="errorcode">10</span></span></dt><dd><p>processing was stopped by a terminating message</p></dd></dl></div></div><div class="refsect1" lang="en"><a name="moreinfo"></a><h2>SEE ALSO</h2><p>More information can be found at the <span class="application">libxml</span> web pages
+    at <a href="http://www.xmlsoft.org/" target="_top">http://www.xmlsoft.org/</a> and the W3C <span class="acronym">XSLT</span>
+    pages at <a href="http://www.w3.org/TR/xslt" target="_top">http://www.w3.org/TR/xslt</a>.</p></div></div></body></html>

Modified: packages/libxslt/trunk/doc/xsltproc.xml
===================================================================
--- packages/libxslt/trunk/doc/xsltproc.xml	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/doc/xsltproc.xml	2006-02-20 18:58:17 UTC (rev 527)
@@ -3,6 +3,8 @@
    href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+    
+    <!ENTITY xsltproc "<command>xsltproc</command>">
 ]>
 
 <refentry>
@@ -33,51 +35,68 @@
   <refsynopsisdiv>
     <cmdsynopsis>
       <command>xsltproc</command>
-      <group>
-	<arg>-V</arg>
-	<arg>-v</arg>
-	<arg>-o <replaceable>file</replaceable></arg>
-	<arg>--timing</arg>
-	<arg>--repeat</arg>
-	<arg>--debug</arg>
-	<arg>--novalid</arg>
-	<arg>--noout</arg>
-	<arg>--maxdepth <replaceable>val</replaceable></arg>
-	<arg>--html</arg>
-	<arg>--param <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
-	<arg>--stringparam <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
-	<arg>--nonet</arg>
-	<arg>--path <replaceable>paths</replaceable></arg>
-	<arg>--load-trace</arg>
-	<arg>--catalogs</arg>
-	<arg>--xinclude</arg>
-	<arg>--profile</arg>
-	<arg>--dumpextensions</arg>
-	<arg>--nowrite</arg>
-	<arg>--nomkdir</arg>
-	<arg>--writesubtree</arg>
-	<arg>--nodtdattr</arg>
+      <group choice='opt'>
+        <group choice='opt'>
+          <arg choice='plain'><option>-V</option></arg>
+          <arg choice='plain'><option>--version</option></arg>
+        </group>
+        <group choice='opt'>
+          <arg choice='plain'><option>-v</option></arg>
+          <arg choice='plain'><option>--verbose</option></arg>
+        </group>
+        <arg choice="opt">
+          <group choice='req'>
+            <arg choice='plain'><option>-o</option></arg>
+            <arg choice='plain'><option>--output</option></arg>
+          </group>
+          <replaceable class="option">FILE</replaceable>
+        </arg>
+        <arg choice='plain'><option>--timing</option></arg>
+        <arg choice='plain'><option>--repeat</option></arg>
+        <arg choice='plain'><option>--debug</option></arg>
+        <arg choice='plain'><option>--novalid</option></arg>
+        <arg choice='plain'><option>--noout</option></arg>
+        <arg choice='plain'><option>--maxdepth <replaceable class="option">VALUE</replaceable></option></arg>
+        <arg choice='plain'><option>--html</option></arg>
+        <arg choice='plain'><option>--param
+         <replaceable class="option">PARAMNAME</replaceable>
+         <replaceable class="option">PARAMVALUE</replaceable>
+        </option></arg>
+        <arg choice='plain'><option>--stringparam
+         <replaceable class="option">PARAMNAME</replaceable>
+         <replaceable class="option">PARAMVALUE</replaceable>
+        </option></arg>
+        <arg choice='plain'><option>--nonet</option></arg>
+        <arg choice='plain'><option>--path "<replaceable class="option">PATHS</replaceable>"</option></arg>
+        <arg choice='plain'><option>--load-trace</option></arg>
+        <arg choice='plain'><option>--catalogs</option></arg>
+        <arg choice='plain'><option>--xinclude</option></arg>
+        <group choice='opt'>
+          <arg choice='plain'><option>--profile</option></arg>
+          <arg choice='plain'><option>--norman</option></arg>
+        </group>
+        <arg choice='plain'><option>--dumpextensions</option></arg>
+        <arg choice='plain'><option>--nowrite</option></arg>
+        <arg choice='plain'><option>--nomkdir</option></arg>
+        <arg choice='plain'><option>--writesubtree <replaceable>PATH</replaceable></option></arg>
+        <arg choice='plain'><option>--nodtdattr</option></arg>
       </group>
-      <arg><option><replaceable>stylesheet</replaceable></option></arg>
-      <arg><replaceable>file1</replaceable></arg>
-      <arg><replaceable>file2</replaceable></arg>
-      <arg><replaceable>....</replaceable></arg>
+      <arg choice="opt"><replaceable>STYLESHEET</replaceable></arg>
+      <arg choice="req" rep="repeat"><replaceable>FILE</replaceable></arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
 
   <refsect1 id="introduction">
-    <title>Introduction</title>
-    <para>
-      <application>xsltproc</application> is a command line tool for applying
-      <acronym>XSLT</acronym> stylesheets to <acronym>XML</acronym>
+    <title>DESCRIPTION</title>
+    <para>&xsltproc; is a command line tool for applying <acronym>XSLT</acronym>
+      stylesheets to <acronym>XML</acronym>
       documents. It is part of <application>libxslt</application>, the XSLT C
       library for GNOME. While it was developed as part of the GNOME project, it
       can operate independently of the GNOME desktop.
    </para>
 
-    <para>
-      <application>xsltproc</application> is invoked from the command line with
+    <para>&xsltproc; is invoked from the command line with
       the name of the stylesheet to be used followed by the name of the file or
       files to which the stylesheet is to be applied. It will use the standard
       input if a filename provided is - .
@@ -86,7 +105,7 @@
     <para>
       If a stylesheet is included in an <acronym>XML</acronym> document with a
       Stylesheet Processing Instruction, no stylesheet need be named at the
-      command line. <application>xsltproc</application> will automatically
+      command line. &xsltproc; will automatically
       detect the included stylesheet and use it.
     </para>
 
@@ -97,15 +116,14 @@
   </refsect1>
 
   <refsect1 id="options">
-    <title>Command Line Options</title>
-    
+    <title>OPTIONS</title>
+    <para>&xsltproc; currently accepts the following options:</para>
     <variablelist>
       <varlistentry>
 	<term><option>-V</option> or <option>--version</option></term>
 	<listitem>
-	  <simpara>Show the version of
-      <application>libxml</application> and <application>libxslt</application> used.
-    </simpara>
+	  <simpara>Show the version of <application>libxml</application>
+	    and <application>libxslt</application> used.</simpara>
 	</listitem>
       </varlistentry>
 
@@ -114,22 +132,21 @@
 	<term>
       <option>-v</option> or <option>--verbose</option></term>
 	<listitem>
-	  <simpara>Output each step taken
-      by <application>xsltproc</application> in processing the stylesheet and the document.
-    </simpara>
+	  <simpara>Output each step taken by &xsltproc; in processing the
+	    stylesheet and the document.</simpara>
 	</listitem>
       </varlistentry>
 
     
       <varlistentry>
 	<term>
-      <option>-o</option> or <option>--output</option> <replaceable>file</replaceable></term>
+      <option>-o</option> or <option>--output</option> <replaceable>FILE</replaceable></term>
 	<listitem>
 	  <simpara>Direct output to the file named
-      <replaceable>file</replaceable>. For multiple outputs, also known as
-      "chunking", <option>-o</option> <option>directory/</option> directs the
-      output files to a specified directory. The directory must already exist.
-    </simpara>
+      <replaceable>FILE</replaceable>. For multiple outputs, also known as
+      "chunking", <option>-o <replaceable>DIRECTORY/</replaceable></option>
+      directs the output files to a specified directory. The directory must
+      already exist.</simpara>
 	</listitem>
       </varlistentry>
 
@@ -172,8 +189,7 @@
 	<term>
       <option>--novalid</option></term>
 	<listitem>
-	  <simpara>Skip loading the document's <acronym>DTD</acronym>.
-    </simpara>
+	  <simpara>Skip loading the document's <acronym>DTD</acronym>.</simpara>
 	</listitem>
       </varlistentry>
 
@@ -182,20 +198,18 @@
 	<term>
       <option>--noout</option></term>
 	<listitem>
-	  <simpara>Do not output the result.
-    </simpara>
+	  <simpara>Do not output the result.</simpara>
 	</listitem>
       </varlistentry>
 
     
       <varlistentry>
 	<term>
-      <option>--maxdepth</option> <replaceable>value</replaceable></term>
+      <option>--maxdepth <replaceable>VALUE</replaceable></option></term>
 	<listitem>
 	  <simpara>Adjust the
-      maximum depth of the template stack before
-      <application>libxslt</application> concludes it is in an infinite
-      loop. The default is 500.
+      maximum depth of the template stack before <application>libxslt</application>
+      concludes it is in an infinite loop. The default is 500.
     </simpara>
 	</listitem>
       </varlistentry>
@@ -206,32 +220,29 @@
       <option>--html</option></term>
 	<listitem>
 	  <simpara>The input document is an <acronym>HTML</acronym>
-      file.
-    </simpara>
+      file.</simpara>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>
-      <option>--param</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
+      <option>--param <replaceable>PARAMNAME</replaceable> <replaceable>PARAMVALUE</replaceable></option></term>
 	<listitem>
-	  <simpara>Pass a parameter of name
-      <replaceable>name</replaceable> and value
-      <replaceable>value</replaceable> to the stylesheet. You may pass multiple
-      name/value pairs up to a maximum of 32. If the value being passed is a
-	    string rather than a node identifier, use
-	    <option>--stringparam</option> instead.
-	  </simpara>
+	  <simpara>Pass a parameter of name <replaceable>PARAMNAME</replaceable> and
+	    value <replaceable>PARAMVALUE</replaceable> to the stylesheet. You may pass
+	    multiple name/value pairs up to a maximum of 32. If the value being passed
+	    is a string rather than a node identifier, use <option>--stringparam</option>
+	    instead.</simpara>
       	</listitem>
       </varlistentry>
 
       <varlistentry>
 	<term>
-	  <option>--stringparam</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
+	  <option>--stringparam <replaceable>PARAMNAME</replaceable> <replaceable>PARAMVALUE</replaceable></option></term>
 	<listitem>
-	  <simpara>Pass a paramenter of name <replaceable>name</replaceable> and
-	    value <replaceable>value</replaceable> where
-	    <replaceable>value</replaceable> is a string rather than a node
+	  <simpara>Pass a paramenter of name <replaceable>PARAMNAME</replaceable> and
+	    value <replaceable>PARAMVALUE</replaceable>
+	    where <replaceable>PARAMVALUE</replaceable> is a string rather than a node
 	    identifier. (Note: The string must be utf-8.) </simpara>
 	</listitem>
       </varlistentry>
@@ -240,19 +251,18 @@
 	<term>
       <option>--nonet</option></term>
 	<listitem>
-	  <simpara>Do not use the Internet to fetch DTD's,
-      entities or documents.
-    </simpara>
+	  <simpara>Do not use the Internet to fetch <acronym>DTD</acronym>s,
+      entities or documents.</simpara>
 	</listitem>
       </varlistentry>
     
       <varlistentry>
-	<term> <option>--path</option> <replaceable>paths</replaceable></term>
+	<term><option>--path "<replaceable>PATHS</replaceable>"</option></term>
 	<listitem>
 	  <simpara>
-	    Use the list (separated by space or column) of filesystem paths 
-	specified by <replaceable>paths</replaceable> to load
-        <acronym>DTDs</acronym>, entities or documents.
+	    Use the list (separated by space or colon) of filesystem paths 
+	specified by <replaceable>paths</replaceable> to
+	load <acronym>DTDs</acronym>, entities or documents.
 	  </simpara>
 	</listitem>
       </varlistentry>
@@ -270,12 +280,11 @@
 	<term>
       <option>--catalogs</option></term>
 	<listitem>
-	  <simpara>Use the <acronym>SGML</acronym> catalog specified in
-      <envar>SGML_CATALOG_FILES</envar> to resolve the location of
-	    external entities. By default, <application>xsltproc</application>
-	    looks for the catalog specified in
-      <envar>XML_CATALOG_FILES</envar>. If that is not specified, it uses
-      <filename>/etc/xml/catalog</filename>.
+	  <simpara>Use the <acronym>SGML</acronym> catalog specified
+	    in <envar>SGML_CATALOG_FILES</envar> to resolve the location of
+	    external entities. By default, &xsltproc;
+	    looks for the catalog specified in <envar>XML_CATALOG_FILES</envar>.
+	    If that is not specified, it uses <filename>/etc/xml/catalog</filename>.
     </simpara>
 	</listitem>
       </varlistentry>
@@ -287,8 +296,7 @@
 	<listitem>
 	  <simpara>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/">http://www.w3.org/TR/xinclude/</ulink>
+      specification: <ulink url="http://www.w3.org/TR/xinclude/"/>
     </simpara>
 	</listitem>
       </varlistentry>
@@ -300,8 +308,8 @@
 	<listitem>
 	  <simpara>Output profiling
       information detailing the amount of time spent in each part of the
-      stylesheet. This is useful in optimizing stylesheet performance.
-    </simpara>
+      stylesheet. This is useful in optimizing stylesheet
+      performance.</simpara>
 	</listitem>
       </varlistentry>
 
@@ -309,8 +317,7 @@
 	<term>
       <option>--dumpextensions</option></term>
 	<listitem>
-	  <simpara>Dumps the list of all registered extensions on stdout.
-    </simpara>
+	  <simpara>Dumps the list of all registered extensions on stdout.</simpara>
 	</listitem>
       </varlistentry>
 
@@ -318,8 +325,7 @@
 	<term>
       <option>--nowrite</option></term>
 	<listitem>
-	  <simpara>Refuses to write to any file or resource.
-    </simpara>
+	  <simpara>Refuses to write to any file or resource.</simpara>
 	</listitem>
       </varlistentry>
     
@@ -327,18 +333,16 @@
 	<term>
       <option>--nomkdir</option></term>
 	<listitem>
-	  <simpara>Refuses to create directories.
-    </simpara>
+	  <simpara>Refuses to create directories.</simpara>
 	</listitem>
       </varlistentry>
     
       <varlistentry>
 	<term>
-      <option>--writesubtree</option> <replaceable>path</replaceable></term>
+      <option>--writesubtree <replaceable>PATH</replaceable></option></term>
 	<listitem>
-	  <simpara>Allow file write only within the
-	  <replaceable>path</replaceable> subtree.
-    </simpara>
+	  <simpara>Allow file write only within
+	  the <replaceable>PATH</replaceable> subtree.</simpara>
 	</listitem>
       </varlistentry>
       <varlistentry>
@@ -346,42 +350,110 @@
 	  <option>--nodtdattr</option>
 	</term>
 	<listitem>
-	  <simpara>Do not apply default attributes from the document's
-	  <acronym>DTD</acronym>.
-	  </simpara>
+	  <simpara>Do not apply default attributes from the
+	  document's <acronym>DTD</acronym>.</simpara>
 	</listitem>
       </varlistentry>
     
     </variablelist>
   </refsect1>
 
+  <refsect1 id="envar">
+    <title>ENVIRONMENT</title>
+    <variablelist>
+      <varlistentry>
+        <term><envar>SGML_CATALOG_FILES</envar></term>
+        <listitem>
+           <para>...</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><envar>XML_CATALOG_FILES</envar></term>
+        <listitem>
+           <para>...</para>
+        </listitem>
+      </varlistentry>    
+    </variablelist>
+  </refsect1>
+
   <refsect1 id="return">
-    <title>Return values</title>
-    <para><application>xsltproc</application>'s return codes provide information
+    <title>DIAGNOSTICS</title>
+    <para>&xsltproc;'s return codes provide information
     that can be used when calling it from scripts.</para>
-
-    <para>0: normal</para>
-    <para>1: no argument</para>
-    <para>2: too many parameters</para>
-    <para>3: unknown option</para>
-    <para>4: failed to parse the stylesheet</para>
-    <para>5: error in the stylesheet</para>
-    <para>6: error in one of the documents</para>
-    <para>7: unsupported xsl:output method</para>
-    <para>8: string parameter contains both quote and double-quotes</para>
-    <para>9: internal processing error</para>
-    <para>10: processing was stopped by a terminating message</para>
+    <variablelist>
+      <varlistentry>
+        <term><errorcode>0</errorcode></term>
+        <listitem>
+           <para>normal</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>1</errorcode></term>
+        <listitem>
+           <para>no argument</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>2</errorcode></term>
+        <listitem>
+           <para>too many parameters</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>3</errorcode></term>
+        <listitem>
+           <para>unknown option</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>4</errorcode></term>
+        <listitem>
+           <para>failed to parse the stylesheet</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>5</errorcode></term>
+        <listitem>
+           <para>error in the stylesheet</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>6</errorcode></term>
+        <listitem>
+           <para>error in one of the documents</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>7</errorcode></term>
+        <listitem>
+           <para>unsupported xsl:output method</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>8</errorcode></term>
+        <listitem>
+           <para>string parameter contains both quote and double-quotes</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>9</errorcode></term>
+        <listitem>
+           <para>internal processing error</para>
+        </listitem>
+      </varlistentry>    
+      <varlistentry>
+        <term><errorcode>10</errorcode></term>
+        <listitem>
+           <para>processing was stopped by a terminating message</para>
+        </listitem>
+      </varlistentry>    
+    </variablelist>
   </refsect1>
 
-
-
   <refsect1 id="moreinfo">
-    <title>More Information</title>
-    
-	  <para><application>libxml web page: </application><ulink url="http://www.xmlsoft.org/">http://www.xmlsoft.org/</ulink></para>
-	
-	  <para>W3C <acronym>XSLT page: </acronym><ulink url="http://www.w3.org/TR/xslt">http://www.w3.org/TR/xslt</ulink></para>
-	
-  
+    <title>SEE ALSO</title>
+    <para>More information can be found at the <application>libxml</application> web pages
+    at <ulink url="http://www.xmlsoft.org/"/> and the W3C <acronym>XSLT</acronym>
+    pages at <ulink url="http://www.w3.org/TR/xslt"/>.</para>
   </refsect1>
 </refentry>

Modified: packages/libxslt/trunk/libxslt/preproc.c
===================================================================
--- packages/libxslt/trunk/libxslt/preproc.c	2006-02-20 18:55:51 UTC (rev 526)
+++ packages/libxslt/trunk/libxslt/preproc.c	2006-02-20 18:58:17 UTC (rev 527)
@@ -868,14 +868,14 @@
 	    xsltTransformError(NULL, style, cur,
 			 "xsl:number : invalid value %s for level\n", prop);
 	    if (style != NULL) style->warnings++;
-	    xmlFree((void *)(prop));
 	}
     }
     
     prop = xsltGetCNsProp(style, cur, (const xmlChar *)"lang", XSLT_NAMESPACE);
     if (prop != NULL) {
+	    xsltTransformError(NULL, style, cur,
+		 "xsl:number : lang attribute not implemented\n");
 	XSLT_TODO; /* xsl:number lang attribute */
-	xmlFree((void *)prop);
     }
     
     prop = xsltGetCNsProp(style, cur, (const xmlChar *)"letter-value", XSLT_NAMESPACE);




More information about the debian-xml-sgml-commit mailing list