7 files changed, 65 insertions, 6 deletions
diff --git a/src/documentation/content/xdocs/0.95/compiling.xml b/src/documentation/content/xdocs/0.95/compiling.xml
index 57761429f..98a6dfb6d 100644
--- a/src/documentation/content/xdocs/0.95/compiling.xml
+++ b/src/documentation/content/xdocs/0.95/compiling.xml
@@ -66,7 +66,7 @@
       <section id="env-ant">
         <title>Apache Ant</title>
         <p>
-          <a href="ext:ant">Apache Ant</a> must be installed in order to
+          <a href="ext:ant">Apache Ant</a> (Version 1.7 or later) must be installed in order to
           build FOP. Following best practices we don't include Ant with FOP anymore. You can find the
           <a href="ext:ant/manual/">instructions to install Ant in the Ant manual</a> on the web.
         </p>
diff --git a/src/documentation/content/xdocs/0.95/output.xml b/src/documentation/content/xdocs/0.95/output.xml
index 628df1248..fbf277b90 100644
--- a/src/documentation/content/xdocs/0.95/output.xml
+++ b/src/documentation/content/xdocs/0.95/output.xml
@@ -703,6 +703,24 @@ out = proc.getOutputStream();]]></source>
   <note>RTF output is currently unmaintained and lacks many features compared to other output
     formats. Using other editable formats like Open Document Format, instead of producing XSL-FO
     then RTF through FOP, might give better results.</note>
+  <p>
+    These are some known restrictions compared to other supported output formats (not a complete list):
+  </p>
+  <ul>
+    <li>
+      Not supported/implemented:
+      <ul>
+        <li>break-before/after (supported by the RTF library but not tied into the RTFHandler)</li>
+        <li>fo:page-number-citation-last</li>
+        <li>keeps (supported by the RTF library but not tied into the RTFHandler)</li>
+        <li>region-start/end (RTF limitation)</li>
+        <li>multiple columns</li>
+      </ul>
+    </li>
+    <li>Only a single page-master is supported</li>
+    <li>Not all variations of fo:leader are supported (RTF limitation)</li>
+    <li>percentages are not supported everywhere</li>
+  </ul>
 </section>
 <section id="xml">
   <title>XML (Area Tree XML)</title>
@@ -735,6 +753,16 @@ out = proc.getOutputStream();]]></source>
     It is possible to directly print the document from the command line.
     This is done with the same code that renders to the Java2D/AWT renderer.
   </p>
+  <section id="print-issues">
+    <title>Known issues</title>
+    <p>
+      If you run into the problem that the printed output is incomplete on Windows:
+      this often happens to users printing to a PCL printer.
+      There seems to be an incompatibility between Java and certain PCL printer drivers
+      on Windows. Since most network-enabled laser printers support PostScript, try
+      switching to the PostScript printer driver for that printer model.
+    </p>
+  </section>
 </section>
 <section id="bitmap">
   <title>Bitmap (TIFF/PNG)</title>
diff --git a/src/documentation/content/xdocs/knownissues.xml b/src/documentation/content/xdocs/knownissues.xml
index caf96ceaa..ea39b2974 100644
--- a/src/documentation/content/xdocs/knownissues.xml
+++ b/src/documentation/content/xdocs/knownissues.xml
@@ -66,6 +66,7 @@
   <section>
     <title>Other known issues</title>
     <p>This section lists other known issues.</p>
+    <!-- See <root>/known-issues.xml for the source document of this section! -->
     <xi:include href="cocoon://knownissues-raw-static.xml#xpointer(/document/body/*)"/>
   </section>
 </section>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index b0a3214e7..5ebdef322 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -96,10 +96,11 @@
   <!--
   BEGIN Version 0.95 documentation tab
   -->
-  <trunk label="FOP 0.95beta" href="0.95/" tab="stableversion">
+  <trunk label="FOP 0.95" href="0.95/" tab="stableversion">
     <about label="About" href="index.html"/>
-    <release label="Release Notes" href="releaseNotes_0.95beta.html"/>
-    <changes label="Changes" href="changes_0.95beta.html"/>
+    <release label="Release Notes" href="releaseNotes_0.95.html"/>
+    <changes label="Changes (0.95)" href="changes_0.95.html"/>
+    <changes-beta label="Changes (0.95beta)" href="changes_0.95beta.html"/>
     <knownissues label="Known Issues" href="knownissues_overview.html"/>
     <upgrading label="Upgrading" href="upgrading.html"/>
     
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index a42fc9bd7..3db01d4fa 100644
--- a/src/documentation/content/xdocs/tabs.xml
+++ b/src/documentation/content/xdocs/tabs.xml
@@ -22,7 +22,7 @@
 <tabs software="FOP" title="FOP" copyright="@year@ The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
   <tab label="Home" dir=""/>
   <tab label="Version 0.94" dir="0.94/"/>
-  <tab label="Version 0.95beta" dir="0.95/"/>
+  <tab label="Version 0.95" dir="0.95/"/>
   <tab label="FOP Trunk" dir="trunk/"/>
   <tab label="Development" dir="dev/"/>
 </tabs>
diff --git a/src/documentation/content/xdocs/trunk/compiling.xml b/src/documentation/content/xdocs/trunk/compiling.xml
index 57761429f..98a6dfb6d 100644
--- a/src/documentation/content/xdocs/trunk/compiling.xml
+++ b/src/documentation/content/xdocs/trunk/compiling.xml
@@ -66,7 +66,7 @@
       <section id="env-ant">
         <title>Apache Ant</title>
         <p>
-          <a href="ext:ant">Apache Ant</a> must be installed in order to
+          <a href="ext:ant">Apache Ant</a> (Version 1.7 or later) must be installed in order to
           build FOP. Following best practices we don't include Ant with FOP anymore. You can find the
           <a href="ext:ant/manual/">instructions to install Ant in the Ant manual</a> on the web.
         </p>
diff --git a/src/documentation/content/xdocs/trunk/output.xml b/src/documentation/content/xdocs/trunk/output.xml
index d03041f19..5e1b09088 100644
--- a/src/documentation/content/xdocs/trunk/output.xml
+++ b/src/documentation/content/xdocs/trunk/output.xml
@@ -754,6 +754,24 @@ out = proc.getOutputStream();]]></source>
   <note>RTF output is currently unmaintained and lacks many features compared to other output
     formats. Using other editable formats like Open Document Format, instead of producing XSL-FO
     then RTF through FOP, might give better results.</note>
+  <p>
+    These are some known restrictions compared to other supported output formats (not a complete list):
+  </p>
+  <ul>
+    <li>
+      Not supported/implemented:
+      <ul>
+        <li>break-before/after (supported by the RTF library but not tied into the RTFHandler)</li>
+        <li>fo:page-number-citation-last</li>
+        <li>keeps (supported by the RTF library but not tied into the RTFHandler)</li>
+        <li>region-start/end (RTF limitation)</li>
+        <li>multiple columns</li>
+      </ul>
+    </li>
+    <li>Only a single page-master is supported</li>
+    <li>Not all variations of fo:leader are supported (RTF limitation)</li>
+    <li>percentages are not supported everywhere</li>
+  </ul>
 </section>
 <section id="xml">
   <title>XML (Area Tree XML)</title>
@@ -786,6 +804,16 @@ out = proc.getOutputStream();]]></source>
     It is possible to directly print the document from the command line.
     This is done with the same code that renders to the Java2D/AWT renderer.
   </p>
+  <section id="print-issues">
+    <title>Known issues</title>
+    <p>
+      If you run into the problem that the printed output is incomplete on Windows:
+      this often happens to users printing to a PCL printer.
+      There seems to be an incompatibility between Java and certain PCL printer drivers
+      on Windows. Since most network-enabled laser printers support PostScript, try
+      switching to the PostScript printer driver for that printer model.
+    </p>
+  </section>
 </section>
 <section id="bitmap">
   <title>Bitmap (TIFF/PNG)</title>
@@ -937,3 +965,4 @@ out = proc.getOutputStream();]]></source>
 </document>
 
 
+