diff --git a/ChangeLog b/ChangeLog
index b3e6e9782b58a72b256a3f305d5a653c9d5ba5c5_Q2hhbmdlTG9n..b03b04402e73885e0d36db1ead0fc66eb0dbc322_Q2hhbmdlTG9n 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 12 16:34:15 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* doc/xsltproc.1 doc/xsltproc.xml: more info about --output
+	  from Daniel Leidert c.f. #344654
+
 Tue Jun  6 17:16:33 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
 	* configure.in libxslt.spec.in doc//*: preparing release of 1.1.17
diff --git a/NEWS b/NEWS
index b3e6e9782b58a72b256a3f305d5a653c9d5ba5c5_TkVXUw==..b03b04402e73885e0d36db1ead0fc66eb0dbc322_TkVXUw== 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,14 @@
 to the CVS at 
 http://cvs.gnome.org/viewcvs/libxslt/
  code base.Those are the public releases made:
+1.1.17: Jun 6 2006:
+   - portability fixes: python detection
+   - bug fixes: some regression tests, attribute/namespaces output (Kasimier
+    Buchcik), problem in mixed xsl:value-of and xsl:text uses (Kasimier)
+   - improvements: internal refactoring (Kasimier Buchcik), use of the XPath
+    object cache in libxml2-2.6.25 (Kasimier)
+
+
 1.1.16: May 01 2006:
    - portability fixes: EXSLT date/time on Solaris and IRIX (Albert Chin),
       HP-UX  build (Albert Chin), 
diff --git a/doc/xsltproc.1 b/doc/xsltproc.1
index b3e6e9782b58a72b256a3f305d5a653c9d5ba5c5_ZG9jL3hzbHRwcm9jLjE=..b03b04402e73885e0d36db1ead0fc66eb0dbc322_ZG9jL3hzbHRwcm9jLjE= 100644
--- a/doc/xsltproc.1
+++ b/doc/xsltproc.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "XSLTPROC" "1" "2006\-03\-05" "libxslt" ""
+.TH "XSLTPROC" "1" "$Date$" "libxslt" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -117,7 +117,12 @@
 \fIFILE\fR. Using the option with a
 \fIDIRECTORY\fR
 directs the output files to the specified directory. This can be useful for multiple outputs (also known as "chunking") or manpage processing.
-\fBNote:\fR
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+\fBImportant\fR
 The given directory
 \fBmust\fR
 already exist.
@@ -121,6 +126,23 @@
 The given directory
 \fBmust\fR
 already exist.
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+\fBNote\fR
+Make sure that
+\fIFILE\fR
+and
+\fIDIRECTORY\fR
+follow the
+\(lqURI reference computation\(rq
+as described in RFC 2396 and laters. This means, that e.g.
+\fB\-o directory\fR
+will maybe not work, but
+\fB\-o directory/\fR
+will.
 .TP
 \fB\-\-param \fR\fB\fIPARAMNAME\fR\fR\fB \fR\fB\fIPARAMVALUE\fR\fR
 Pass a parameter of name
diff --git a/doc/xsltproc.xml b/doc/xsltproc.xml
index b3e6e9782b58a72b256a3f305d5a653c9d5ba5c5_ZG9jL3hzbHRwcm9jLnhtbA==..b03b04402e73885e0d36db1ead0fc66eb0dbc322_ZG9jL3hzbHRwcm9jLnhtbA== 100644
--- a/doc/xsltproc.xml
+++ b/doc/xsltproc.xml
@@ -26,7 +26,7 @@
 		</affiliation>
 	</author>
 	<!-- date should be the date of the latest change or the release version -->
-	<date>2006-03-05</date>
+	<date>$Date$</date>
 	<!-- still a bit buggy output, will talk to docbook-xsl upstream to fix this -->
 	<!-- <releaseinfo>This is release 0.4 of the xsltproc Manual.</releaseinfo> -->
 	<!-- <edition>0.4</edition> -->
@@ -280,7 +280,5 @@
 			the option with a <replaceable>DIRECTORY</replaceable> directs the
 			output files to the specified directory. This can be
 			useful for multiple outputs (also known as "chunking") or manpage
-			processing. <emphasis role="bold">Note:</emphasis> The given
-			directory <emphasis role="bold">must</emphasis>
-			already exist.
+			processing.
 		</para>
@@ -286,4 +284,18 @@
 		</para>
+		<important>
+			<para>
+				The given directory <emphasis role="bold">must</emphasis> already exist.
+			</para>
+		</important>
+		<note>
+			<para>
+				Make sure that <replaceable>FILE</replaceable>
+				and <replaceable>DIRECTORY</replaceable> follow the <quote>URI reference
+				computation</quote> as described in RFC 2396 and laters. This means, that
+				e.g. <option>-o directory</option> will maybe not work,
+				but <option>-o directory/</option> will.
+			</para>
+		</note>
 	</listitem>
 		</varlistentry>