Merged revisions 556567-558280,558282-562946,562948-563926,563928-563950,563952-563955,563957-564855,564857-567293,567295-567296,567298-567302,567304-569099 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_94 ........ r560595 | vhennebert | 2007-07-28 21:26:51 +0200 (sam, 28 jui 2007) | 2 lines Remove tab for the no longer supported 0.20.5 version ........ r560596 | vhennebert | 2007-07-28 21:28:30 +0200 (sam, 28 jui 2007) | 2 lines Create a tab for the new 0.94 version ........ r560600 | vhennebert | 2007-07-28 21:45:13 +0200 (sam, 28 jui 2007) | 2 lines Remove any reference to the old maintenance branch ........ r560886 | vhennebert | 2007-07-30 10:19:59 +0200 (lun, 30 jui 2007) | 2 lines Update the documentation before releasing ........ r562023 | clay | 2007-08-02 08:08:49 +0200 (jeu, 02 aoû 2007) | 1 line Changes to fop-0_94 branch to prepare it for 0.94 release. ........ r562024 | clay | 2007-08-02 08:09:33 +0200 (jeu, 02 aoû 2007) | 1 line Changes to fop-0_94 branch to prepare it for 0.94 release. ........ r562027 | clay | 2007-08-02 08:27:01 +0200 (jeu, 02 aoû 2007) | 1 line Changes to fop-0_94 branch to prepare it for 0.94 release. ........ r562332 | clay | 2007-08-03 07:09:50 +0200 (ven, 03 aoû 2007) | 1 line Updated FOP Compliance page to include additional column for 0.94 (did not remove 0.20.5 or 0.93 column). Also 'Notes' column was *not* modified for 0.94-specific information. ........ r562333 | clay | 2007-08-03 07:10:47 +0200 (ven, 03 aoû 2007) | 1 line Updated FOP Compliance page to include additional column for 0.94 (did not remove 0.20.5 or 0.93 column). Also 'Notes' column was *not* modified for 0.94-specific information. ........ r562880 | vhennebert | 2007-08-05 17:05:41 +0200 (dim, 05 aoû 2007) | 4 lines - Update the website content - Fix some typos - Fix broken links ........ r562881 | vhennebert | 2007-08-05 17:06:59 +0200 (dim, 05 aoû 2007) | 5 lines Changes in the trunk tab: - update content - fix typos - fix broken links ........ r562887 | vhennebert | 2007-08-05 17:22:15 +0200 (dim, 05 aoû 2007) | 2 lines Merge changes on the Trunk tab from revision 562881 ........ r562891 | vhennebert | 2007-08-05 17:32:33 +0200 (dim, 05 aoû 2007) | 4 lines Update the list of known issues: - border-collapsing model for tables is available - internal links point to the exact location ........ r562900 | vhennebert | 2007-08-05 17:48:50 +0200 (dim, 05 aoû 2007) | 2 lines Setup the "known issues" infrastructure for the 0.94 tab ........ r562903 | vhennebert | 2007-08-05 18:23:59 +0200 (dim, 05 aoû 2007) | 2 lines Style only: remove tab characters ........ r562909 | vhennebert | 2007-08-05 19:11:58 +0200 (dim, 05 aoû 2007) | 2 lines Disable "Valid HTML" icons. The site isn't valid... ........ r562919 | vhennebert | 2007-08-05 19:52:13 +0200 (dim, 05 aoû 2007) | 3 lines Disable any link to relnotes.html. This file is not properly placed (in no tab), and only contains release notes for versions up to 0.92. TODO determine what to do with this file; newer versions have their own system ........ r562924 | vhennebert | 2007-08-05 20:09:44 +0200 (dim, 05 aoû 2007) | 2 lines Add a link to the Release Notes for version 0.94 ........ r562925 | vhennebert | 2007-08-05 20:10:34 +0200 (dim, 05 aoû 2007) | 2 lines Replace "Apache Forrest" with "Apache FOP". Copy-paste error? ........ r564159 | vhennebert | 2007-08-09 11:56:41 +0200 (jeu, 09 aoû 2007) | 2 lines Introduce 0.94 in status.xml and README ........ r564233 | vhennebert | 2007-08-09 17:09:49 +0200 (jeu, 09 aoû 2007) | 2 lines Update the compliance page ........ r564864 | vhennebert | 2007-08-11 10:41:15 +0200 (sam, 11 aoû 2007) | 2 lines Fix error that made the 0.94 menu appear in the Trunk tab and vice-versa ........ r564866 | vhennebert | 2007-08-11 10:45:39 +0200 (sam, 11 aoû 2007) | 2 lines Add my key for signing the release ........ r564871 | vhennebert | 2007-08-11 10:51:35 +0200 (sam, 11 aoû 2007) | 2 lines Update dependency on version 1.2 of XML Graphics Commons ........ r567299 | vhennebert | 2007-08-18 19:23:09 +0200 (sam, 18 aoû 2007) | 2 lines Update .htaccess to 0.94 release ........ r567539 | clay | 2007-08-20 06:12:42 +0200 (lun, 20 aoû 2007) | 1 line Added formatting for code in page. ........ git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@569104 13f79535-47bb-0310-9956-ffa450edef68
author: Vincent Hennebert <vhennebert@apache.org> 2007-08-23 18:30:05 +0000
committer: Vincent Hennebert <vhennebert@apache.org> 2007-08-23 18:30:05 +0000
commit: 99cfed96f71c2deff9afdf30c71f93c2ca30d005 (patch)
tree: 960682f0658c15dcddf2ec5f615c7c0f179ee7f1 /src/documentation/content
parent: aa33ef3ebb6e48dae2da620f596d34d7548bf402 (diff)
download: xmlgraphics-fop-99cfed96f71c2deff9afdf30c71f93c2ca30d005.tar.gz
xmlgraphics-fop-99cfed96f71c2deff9afdf30c71f93c2ca30d005.zip
56 files changed, 7437 insertions, 7372 deletions
diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess
index 7a0a17476..db766b7c4 100644
--- a/src/documentation/content/.htaccess
+++ b/src/documentation/content/.htaccess
@@ -1,28 +1,28 @@
 # redirect moved files
-RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.93/anttask$1
-RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.93/compiling$1
-RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.93/configuration$1
-RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.93/embedding$1
-RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.93/extensions$1
-RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.93/fonts$1
-RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.93/graphics$1
-RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.93/hyphenation$1
-RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.93/intermediate$1
-RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.93/output$1
-RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.93/pdfa$1
-RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.93/pdfencryption$1
-RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.93/pdfx$1
-RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.93/running$1
-RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.93/servlets$1
-RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.93/upgrading$1
+RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/0.94/anttask$1
+RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/0.94/compiling$1
+RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/0.94/configuration$1
+RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/0.94/embedding$1
+RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/0.94/extensions$1
+RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/0.94/fonts$1
+RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/0.94/graphics$1
+RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/0.94/hyphenation$1
+RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/0.94/intermediate$1
+RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/0.94/output$1
+RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/0.94/pdfa$1
+RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/0.94/pdfencryption$1
+RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/0.94/pdfx$1
+RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/0.94/running$1
+RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/0.94/servlets$1
+RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/0.94/upgrading$1
 
 # redirect to versioned documentation
-Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.93
-Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.93
+Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/0.94
+Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/0.94
 Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
 Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/trunk
-Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.20.5
-Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.20.5
+Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.93
+Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.93
 Redirect Temp /fop/0.90alpha1 http://xmlgraphics.apache.org/fop/0.93
 Redirect Temp /fop/0.91beta http://xmlgraphics.apache.org/fop/0.93
 Redirect Temp /fop/0.92beta http://xmlgraphics.apache.org/fop/0.93
diff --git a/src/documentation/content/xdocs/0.20.5/compiling.xml b/src/documentation/content/xdocs/0.20.5/compiling.xml
deleted file mode 100644
index e2e2ca8d5..000000000
--- a/src/documentation/content/xdocs/0.20.5/compiling.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
-<document>
-  <header>
-    <title>FOP: Building from Source Code</title>
-    <version>$Revision$</version>
-  </header>
-  <body>
-    <section id="build-needed">
-      <title>Do You Need To Build?</title>
-      <p>FOP distributions are either pre-compiled binary or source.
-If you are using a binary distribution, it is already built and there is no need to build it again. See the <link href="../download.html">Download Instructions</link> for information about whether a binary or source distribution is best for your needs.
-      </p>
-    </section>
-    <section id="env">
-      <title>Set Up Your Environment</title>
-      <section id="env-jdk">
-        <title>JDK</title>
-          <p>
-            Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
-            (A Java Runtime Environment is not sufficient).
-          </p>
-      </section>
-      <section id="env-classpath">
-        <title>CLASSPATH</title>
-        <p>There is generally no need to setup a classpath. All libraries needed to compile FOP are included in the source distribution and are referenced by the build script.
-You will only need to adjust the classpath if you build FOP in some other way. See the build scripts (build.bat for Windows, and build.sh for Unix) for details.</p>
-      </section>
-      <section id="env-java-home">
-        <title>JAVA_HOME</title>
-        <p>The build script uses <link href="http://jakarta.apache.org/ant/">Ant</link>, a popular java-based build tool, which requires that the environment variable JAVA_HOME point to your local JDK root directory. This is true even if you use JDK 1.2 or above, which normally does not need this setting.</p>
-      </section>
-  </section>
-  <section id="build-script">
-    <title>Run the "build" Script</title>
-    <p>Build FOP by executing the "build" script, which is located in the FOP root directory.
-The Windows batch file is build.bat, and the Unix shell script is build.sh.
-The examples below are for running the shell script, but except for the build file extension, the syntax is identical.</p>
-    <p>The file build.xml in the FOP root directory is the blueprint that Ant uses for the build. It contains information for numerous build targets, many of which are building blocks to more useful target, and others which are primarily used by the FOP developers.
-You may benefit from looking through this file to learn more about the various build targets.
-To obtain a complete list of useful build targets:</p>
-    <source>build.sh -projecthelp</source>
-    <p>The most useful targets are:</p>
-    <ul>
-      <li><strong>package</strong>: Generates the jar files (default). This is the normal build that produces a jar file usable for running FOP.</li>
-      <li><strong>clean </strong>: Cleans the build directory. This is useful for making sure that any build errors are cleaned up before starting a new build. It should not ordinarily be needed, but may be helpful if you are having problems with the build process itself.</li>
-      <li><strong>javadocs</strong>: Generates javadocs. This creates the FOP API documentation.</li>
-    </ul>
-    <p>To run the build:</p>
-    <source>build.sh [target ...]</source>
-    <p>For example to do a normal build for the package target (which is the default):</p>
-    <source>build.sh</source>
-    <p>OR</p>
-    <source>build.sh package</source>
-    <p>To clean the build directory first:</p>
-    <source>build.sh clean package</source>
-  </section>
-  <section id="problems">
-    <title id="Troubleshooting">Troubleshooting</title>
-    <p>If you have problems building FOP, please try the following:</p>
-    <ul>
-      <li>Run the build with the target of "clean", then rerun the build.</li>
-      <li>Delete the build directory completely, then rerun the build.</li>
-      <li>Make sure you do not have a non-FOP version of xerces.jar, xalan.jar, batik.jar, or another dependency product somewhere in your CLASSPATH.</li>
-      <li>If the build still fails, see the <link href="../gethelp.html">Getting Help</link> page for further help.</li>
-    </ul>
-  </section>
-  </body>
-</document>
-
diff --git a/src/documentation/content/xdocs/0.20.5/configuration.xml b/src/documentation/content/xdocs/0.20.5/configuration.xml
deleted file mode 100644
index 88097059a..000000000
--- a/src/documentation/content/xdocs/0.20.5/configuration.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
-<document>
-  <header>
-    <title>FOP: Configuration</title>
-    <version>$Revision$</version>
-  </header>
-
-  <body>
-  <section id="general">
-    <title>Configuration File Basics</title>
-    <p>The FOP configuration file is an XML file containing a variety of settings that are useful for controlling FOP's behavior, and for helping it find resources that you wish it to use.</p>
-    <p>The easiest way to get started using a FOP configuration file is to copy the sample found at <code>{fop-dir}/conf/userconfig.xml</code> to a location of your choice, and then to edit it according to your needs.
-It contains templates for the various configuration options, most of which are commented out. Remove the comments and change the settings for entries that you wish to use.
-Be sure to follow any instructions, including comments which specify the value range.
-Also, since the configuration file is XML, be sure to keep it well-formed.</p>
-    <note>Do <strong>not</strong> change <code>{fop-dir}/conf/config.xml</code> or use it as the basis for your configuration file. It has an entirely different purpose.</note>
-    <section id="general-entries">
-      <title>Creating Entries</title>
-      <p>The general structure of the configuration file is a series of &lt;entry> tags, each containing a &lt;key> and a &lt;value>. (Fonts use a different format). Here is an example:</p>
-      <source><![CDATA[<entry>
-  <key>strokeSVGText</key>
-  <value>false</value>
-</entry>]]></source>
-    </section>
-    <section id="general-available">
-      <title>Making Configuration Available to FOP</title>
-      <p>After creating your configuration file, you must tell FOP how to find it:</p>
-      <ul>
-        <li>If running FOP from the command-line, see the "-c" command-line option in <link href="running.html">Running FOP</link>.</li>
-        <li>If running FOP as an embedded application, see <link href="embedding.html#config-external">FOP: Embedding, Using a Configuration File</link>.</li>
-      </ul>
-      <p>See <link href="embedding.html#config-internal">Setting the Configuration Programmatically</link> for instructions on how to do so in an embedded environment.</p>
-    </section>
-  </section>
-  <section id="summary-key-value">
-    <title>Summary of Key-Value Configuration Options</title>
-    <table>
-      <tr>
-        <th>Option (key)</th>
-        <th>Data Type (for the value)</th>
-        <th>Default Value</th>
-      </tr>
-      <tr>
-        <td>baseDir</td>
-        <td>URL</td>
-        <td>For command-line, the directory containing the input FO or XML file. For embedded, the current working directory.</td>
-      </tr>
-      <tr>
-        <td>fontBaseDir</td>
-        <td>URL</td>
-        <td>value of baseDir</td>
-      </tr>
-      <tr>
-        <td><link href="#hyphenation-dir">hyphenation-dir</link></td>
-        <td>URL</td>
-        <td>None. This is for custom hyphenation patterns.</td>
-      </tr>
-      <tr>
-        <td><link href="#svg-strokeSVGText">strokeSVGText</link></td>
-        <td>Boolean</td>
-        <td>True</td>
-      </tr>
-    </table>
-  </section>
-  <section id="detail-key-value">
-    <title>Detail for Key-Value Configuration Options</title>
-    <p>The sections below provide detailed information for configuration options that are not self-explanatory. The parenthetical information after each key name indicates (Data Type, Default).</p>
-    <section id="hyphenation-dir">
-      <title>hyphenation-dir (URL, none)</title>
-      <p>Use this entry to indicate a directory containing custom hyphenation files (if any).
-See <link href="hyphenation.html">FOP: Hyphenation</link> for more information on creating and modifying hyphenation within FOP.</p>
-    </section>
-    <section id="strokeSVGText">
-      <title>strokeSVGText (boolean, True)</title>
-      <p>In some cases, some text in SVG documents is converted to graphical shapes instead of retaining its character as text. To force all text to be rendered as text, set strokeSVGText = false. For a discussion of this issue, see <link href="graphics.html#svg-pdf-text">FOP: Graphics, Placing SVG Text into PDF</link>.</p>
-      <note>strokeSVGText is currently only effective in the PDF renderer.</note>
-    </section>
-  </section>
-  <section id="fonts">
-    <title>Fonts</title>
-    <p>Font configuration information is included in the FOP configuration file, but is documented at <link href="fonts.html">FOP: Fonts</link>. Note especially the section entitled <link href="fonts.html#register">Register Fonts with FOP</link>.</p>
-  </section>
-  </body>
-</document>
-
diff --git a/src/documentation/content/xdocs/0.20.5/embedding.xml b/src/documentation/content/xdocs/0.20.5/embedding.xml
deleted file mode 100644
index e3cff158a..000000000
--- a/src/documentation/content/xdocs/0.20.5/embedding.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
-
-<!-- Embedding FOP -->
-<document>
-  <header>
-    <title>FOP: Embedding</title>
-    <subtitle>How to Embed FOP in a Java application</subtitle>
-    <version>$Revision$</version>
-  </header>
-
-    <body>
-  <section id="overview">
-    <title>Overview</title>
-    <p>Review <link href="running.html">Running FOP</link> for important information that applies to embedded applications as well as command-line use, such as options and performance.
-    </p>
-  <p>To embed FOP in your application, instantiate org.apache.fop.apps.Driver.
-     Once this class is
-     instantiated, methods are called to set the
-     Renderer to use
-     and the OutputStream to use to output the results of the
-     rendering (where applicable). In the case of the Renderer and
-     ElementMapping(s), the Driver may be supplied either with the
-     object itself, or the name of the class, in which case Driver will
-     instantiate the class itself. The advantage of the latter is it
-     enables runtime determination of Renderer and ElementMapping(s).
-  </p>
-  </section>
-  <section id="basics">
-    <title>Basics</title>
-  <p>The simplest way to use Driver is to instantiate it with the
-     InputSource and OutputStream, then set the renderer desired and
-     call the run method.
-  </p>
-  <p>Here is an example use of Driver which outputs PDF:
-  </p>
-    <source><![CDATA[
-import org.apache.fop.apps.Driver;
-
-/*..*/
-
-Driver driver = new Driver(new InputSource(args[0]),
-                           new FileOutputStream(args[1]));
-driver.setRenderer(Driver.RENDER_PDF);
-driver.run();]]></source>
-  <p>
-In the example above, args[0] contains the path to an XSL-FO file, while 
-args[1] contains a path for the target PDF file.
-  </p>
- <section id="basic-logging">
-    <title>Logging</title>
-    <p>
-      You also need to set up logging. Global logging for all FOP
-      processes is managed by MessageHandler. Per-instance logging
-      is handled by Driver. You want to set both using an implementation
-      of org.apache.avalon.framework.logger.Logger. See 
-      <jump href="#logging">below</jump> for more information.
-    </p>
-    <p>
-      Call <code>setLogger(Logger)</code> always immediately after 
-      instantiating the Driver object. See here:
-    </p>
-    <source><![CDATA[
-import org.apache.avalon.framework.logger.Logger; 
-import org.apache.avalon.framework.logger.ConsoleLogger; 
-
-/*..*/
-
-Driver driver = new Driver();
-Logger logger = new ConsoleLogger(ConsoleLogger.LEVEL_INFO);
-MessageHandler.setScreenLogger(logger);
-driver.setLogger(logger);]]></source>
-  </section>
-  
-  <section id="basic-logging-new-version">
-    <title>Logging (Upcoming FOP 1.0 Version only)</title>
-    <p>
-      Logging is handled automatically via Jakarta Commons-Logging, which uses
-      JDK logging by default.  No special driver configuration is needed.
-      For specialized configuration of Commons-Logging (e.g. to use a
-      different logger or to change logging levels), please see the  
-      <fork href="http://jakarta.apache.org/commons/logging/">Jakarta Commons-Logging</fork>
-      site.
-    </p>
-  </section>
-
-  <section id="render">
-    <title>Processing XSL-FO</title>
-    <p>
-      Once the Driver is set up, one of the <code>render()</code> methods
-      is called. Depending on whether DOM or an InputSource is being used, the
-      invocation of the method is either <code>render(Document)</code> or
-      <code>render(Parser, InputSource)</code> respectively.
-    </p>
-    <p>
-      <strong>Another possibility may be used to build the FO Tree: You can
-      call <code>getContentHandler()</code> and fire the SAX events yourself.
-      </strong>
-      You don't have to call <code>run()</code> or <code>render()</code> on the 
-      Driver object if you use <code>getContentHandler()</code>.
-    </p>
-    <p>Here is an example use of Driver:</p>
-    <source><![CDATA[
-Driver driver = new Driver();
-//Setup logging here: driver.setLogger(...
-driver.setRenderer(Driver.RENDER_PDF);
-driver.setInputSource(new FileInputSource(args[0]));
-driver.setOutputStream(new FileOutputStream(args[1]));
-driver.run();]]></source>
-  </section>
-
-  <section id="render-with-xslt">
-    <title>Processing XSL-FO generated from XML+XSLT</title>
-    <p>
-      If you want to process XSL-FO generated from XML using XSLT we recommend 
-      using standard JAXP to do the XSLT part and piping the generated SAX 
-      events directly through to FOP. Here's how this would look like:
-    </p>
-    <source><![CDATA[
-Driver driver = new Driver();
-//Setup logging here: driver.setLogger(...
-driver.setRenderer(Driver.RENDER_PDF);
-
-//Setup the OutputStream for FOP
-driver.setOutputStream(new java.io.FileOutputStream(outFile));
-
-//Make sure the XSL transformation's result is piped through to FOP
-Result res = new SAXResult(driver.getContentHandler());
-
-//Setup XML input
-Source src = new StreamSource(xmlFile);
-
-//Setup Transformer
-Source xsltSrc = new StreamSource(xslFile);
-TransformerFactory transformerFactory = TransformerFactory.newInstance();
-Transformer transformer = transformerFactory.newTransformer(xsltSrc);
-
-//Start the transformation and rendering process
-transformer.transform(src, res);]]></source>
-    <note>There's no need to call <code>run()</code> or <code>render()</code>.</note>
-    <p>
-      This may look complicated at first, but it's really just the combination of an 
-      XSL transformation and a FOP run. It's also easy to comment out the FOP part
-      for debugging purposes, for example when you're tracking down a bug in your 
-      stylesheet. You can easily write the XSL-FO output from the XSL transformation
-      to a file to check if that part generates the expected output.
-    </p>
-    <p>
-      For fully working examples of the above and hints to some interesting 
-      possibilities, see the <link href="#examples">examples section</link> below.
-    </p>
-  </section>
-  </section>
-  <section id="logging">
-    <title>Controlling logging</title>
-    <p>
-      Current FOP 0.20.x production uses the
-      <fork href="http://avalon.apache.org/framework/api/org/apache/avalon/framework/logger/package-summary.html">Logger package</fork>
-      from Apache Avalon Framework to do logging. See the 
-      <fork href="http://avalon.apache.org/framework/">Apache Avalon Framework</fork>
-      for more information.
-    </p>
-    <p>
-      Per default FOP uses the SimpleLog which logs to System.out. If you want to do logging using a
-      logging framework (such as LogKit, Log4J or JDK 1.4 Logging) you can set a
-      different Logger implementation on the Driver object. Here's an example how you would use LogKit:
-    </p>
-    <source><![CDATA[
-Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
-PatternFormatter formatter = new PatternFormatter(
-    "[%{priority}]: %{message}\n%{throwable}" );
-
-LogTarget target = null;
-target = new StreamTarget(System.out, formatter);
-
-hierarchy.setDefaultLogTarget(target);
-log = hierarchy.getLoggerFor("fop");
-log.setPriority(Priority.INFO);
-
-driver.setLogger(new org.apache.avalon.framework.logger.LogKitLogger(log));]]></source>
-    <p>
-      The LogKitLogger class implements the Logger interface so all logging calls are being redirected to LogKit.
-      More information on Jakarta LogKit can be found <fork href="http://jakarta.apache.org/avalon/logkit/index.html">here</fork>.
-    </p>
-    <p>
-      Similar implementations exist for Log4J (org.apache.avalon.framework.logger.Log4JLogger) and
-      JDK 1.4 logging (org.apache.avalon.framework.logger.Jdk14Logger).
-    </p>
-    <p>
-      If you want FOP to be totally silent you can also set an org.apache.avalon.framework.logger.NullLogger instance.
-    </p>
-    <p>
-      If you want to use yet another logging facility you simply have to create a class that 
-      implements org.apache.avalon.framework.logging.Logger and set it on the Driver object. 
-      See the existing implementations in Avalon Framework for examples.
-    </p>
-  </section>
-  <section id="input">
-    <title>Input Sources</title>
-    <p>
-      The input XSL-FO document is always handled internally as SAX (see the 
-      <link href="../dev/design/parsing.html">Parsing Design Document</link> for the rationale).
-      However, the input itself can be provided in a variety of ways to FOP, 
-      which normalizes the input (if necessary) into SAX events:
-    </p>
-    <ul>
-      <li><strong>SAX Events through SAX Handler</strong>: <code>FOTreeBuilder</code> is the SAX Handler which is obtained through <code>getContentHandler</code> on <code>Driver</code>.</li>
-      <li><strong>DOM (which is converted into SAX Events)</strong>: The conversion of a DOM tree is done via the <code>render(Document)</code> method on <code>Driver</code>.</li>
-      <li><strong>Data Source (which is parsed and converted into SAX Events)</strong>: The <code>Driver</code> can take an <code>InputSource</code> as input.
-This can use a <code>Stream</code>, <code>String</code> etc.</li>
-      <li><strong>XML+XSLT Transformation</strong> (which is transformed using an XSLT Processor and the result is fired as SAX Events: <code>XSLTInputHandler</code> is used as an <code>InputSource</code> in the render(<code>XMLReader</code>, <code>InputSource</code>) method on <code>Driver</code>.</li>
-    </ul>
-    <p>
-      There are a variety of upstream data manipulations possible.
-      For example, you may have a DOM and an XSL stylesheet; or you may want to
-      set variables in the stylesheet. Interface documentation and some cookbook 
-      solutions to these situations are provided in 
-      <fork href="http://xml.apache.org/xalan-j/usagepatterns.html">Xalan Basic Usage Patterns</fork>.
-    </p>
-    <p>
-      See the <link href="#examples">Examples</link> for some variations on input. 
-    </p>
-  </section>
-  <section id="config-external">
-    <title>Using a Configuration File</title>
-    <p>
-      To access an external configuration:
-    </p>
-    <source><![CDATA[
-import org.apache.fop.apps.Options;
-
-/*..*/
-
-userConfigFile = new File(userConfig);
-options = new Options(userConfigFile);]]></source>
-    <note>
-        This is all you need to do, it sets up a static configuration class.
-    </note>
-    <p>
-      No further reference to the <code>options</code> variable is necessary.
-      The "options = " is actually not even necessary.
-    </p>
-    <p>
-      See <link href="#multithreading">Multithreading FOP</link> for issues related to changing configuration in a multithreaded environment.
-    </p>
-  </section>
-  <section id="config-internal">
-    <title>Setting the Configuration Programmatically</title>
-    <p>
-      If you wish to set configuration options from within your embedded application, use the <code>Configuration.put</code> method. Here is an example that sets the "baseDir" configuration in a Unix environment:
-    </p>
-    <source>org.apache.fop.configuration.Configuration.put("baseDir","/my/base/dir");</source>
-    <p>
-      Here is another that sets baseDir in a Windows environment:
-    </p>
-    <source>org.apache.fop.configuration.Configuration.put("baseDir","C:\my\base\dir");</source>
-    <p>
-      See <link href="#multithreading">Multithreading FOP</link> for issues related to changing configuration in a multithreaded environment.
-    </p>
-  </section>
-  <section id="hints">
-    <title>Hints</title>
-    <section id="object-reuse">
-      <title>Object reuse</title>
-     <p>
-If FOP is going to be used multiple times within your application
-it may be useful to reuse certain objects to save time.
-     </p>
-     <p>
-The renderers and the driver can both be reused. A renderer is reusable
-once the previous render has been completed. The driver is reuseable
-after the rendering is complete and the <code>reset()</code> method is called.
-You will need to setup the driver again with a new OutputStream,
-IntputStream and renderer.
-     </p>
-    </section>
-    <section id="awt">
-      <title>AWT issues</title>
-      <p>
-        If your XSL-FO files contain SVG then Batik will be used. When Batik is
-        initialised it uses certain classes in <code>java.awt</code> that
-        intialises the java AWT classes. This means that a daemon thread
-        is created by the JVM and on Unix it will need to connect to a
-        DISPLAY.
-      </p>
-      <p>
-        The thread means that the Java application may not automatically quit
-        when finished, you will need to call <code>System.exit()</code>. These
-        issues should be fixed in the upcoming JDK 1.4.
-      </p>
-      <p>
-        If you run into trouble running FOP on a head-less server, please see the
-        <link href="graphics.html#batik">notes on Batik</link>.
-      </p>
-    </section>
-    <section id="render-info">
-      <title>Getting information on the rendering process</title>
-      <p>
-To get the number of pages that were rendered by FOP you can call 
-<code>Driver.getResults()</code>. This returns a FormattingResults object 
-where you can lookup the number of pages produced. It also gives you the 
-page-sequences that were produced along with their id attribute and their 
-number of pages. This is particularly useful if you render multiple 
-documents (each enclosed by a page-sequence) and have to know the number of 
-pages of each document.
-      </p>
-    </section>
-  </section>
-  <section id="performance">
-    <title>Improving performance</title>
-    <p>
-      There are several options to consider:
-    </p>
-    <ul>
-      <li>
-        Whenever possible, try to use SAX to couple the individual components involved 
-        (parser, XSL transformer, SQL datasource etc.).
-      </li>
-      <li>
-        Depending on the target OutputStream (in case of an FileOutputStream, but not 
-        for a ByteArrayOutputStream, for example) it may improve performance considerably 
-        if you buffer the OutputStream using a BufferedOutputStream: 
-        <code>driver.setOutputStream(new java.io.BufferedOutputStream(out));</code>
-        <br/>
-        Make sure you properly close the OutputStream when FOP is finished.
-      </li>
-      <li>
-        Cache the stylesheet. If you use the same stylesheet multiple times 
-        you can setup a JAXP <code>Templates</code> object and reuse it each time you do
-        the XSL transformation.  (More information can be found
-        <fork href="http://www.javaworld.com/javaworld/jw-05-2003/jw-0502-xsl.html">here</fork>.)
-      </li>
-      <li>
-        Use an XSLT compiler like <fork href="http://xml.apache.org/xalan-j/xsltc_usage.html">XSLTC</fork>
-        that comes with Xalan-J.
-      </li>
-    </ul>
-  </section>
-  <section id="multithreading">
-    <title>Multithreading FOP</title>
-    <p>
-      FOP is not currently completely thread safe.
-Although the relevant methods of the Driver object are synchronized, FOP uses static
-variables for configuration data and loading images.
-Here are some tips to mitigate these problems:
-    </p>
-    <ul>
-      <li>
-        To avoid having your threads blocked, create a Driver object for each thread.
-      </li>
-      <li>
-        If possible, do not change the configuration data while there is a Driver object rendering.
-        Setup the configuration only once, preferably in the <code>init()</code> method of the servlet.
-      </li>
-      <li>
-        If you must change the configuration data more often, or if you have multiple 
-        servlets within the same webapp using FOP, consider implementing a singleton 
-        class to encapsulate the configuration settings and to run FOP in synchronized methods.
-      </li>
-    </ul>
-    <p>There is also a known issue with fonts being jumbled between threads when using the AWT renderer (which is used by the -awt and -print output options).
-In general, you cannot safely run multiple threads through the AWT renderer.</p>
-  </section>
-<section id="examples">
-  <title>Examples</title>
-  <p>
-The directory "{fop-dir}/examples/embedding" contains several working examples. 
-In contrast to the examples above the examples here primarily use JAXP for 
-XML access. This may be easier to understand for people familiar with JAXP.
-  </p>
-  <section id="ExampleFO2PDF">
-    <title>ExampleFO2PDF.java</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleFO2PDF.java?view=markup">
-            (current 0.20.5)</fork>
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java?view=markup">
-            (future 1.0dev)</fork>
-demonstrates the basic usage pattern to transform an XSL-FO
-file to PDF using FOP.
-    </p>
-    <figure src="images/EmbeddingExampleFO2PDF.png" alt="Example XSL-FO to PDF"/>
-  </section>
-  <section id="ExampleXML2FO">
-    <title>ExampleXML2FO.java</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleXML2FO.java?view=markup">
-            (current 0.20.5)</fork>
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2FO.java?view=markup">
-            (future 1.0dev)</fork>
-has nothing to do with FOP. It is there to show you how an XML 
-file can be converted to XSL-FO using XSLT. The JAXP API is used to do the
-transformation. Make sure you've got a JAXP-compliant XSLT processor in your 
-classpath (ex. <fork href="http://xml.apache.org/xalan-j">Xalan</fork>).
-    </p>
-    <figure src="images/EmbeddingExampleXML2FO.png" alt="Example XML to XSL-FO"/>
-  </section>
-  <section id="ExampleXML2PDF">
-    <title>ExampleXML2PDF.java</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleXML2PDF.java?view=markup">
-        (current 0.20.5)</fork>
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java?view=markup">
-        (future 1.0dev)</fork>
-demonstrates how you can convert an arbitrary XML file to PDF 
-using XSLT and XSL-FO/FOP. It is a combination of the first two examples 
-above. The example uses JAXP to transform the XML file to XSL-FO and FOP to 
-transform the XSL-FO to PDF.
-    </p>
-    <figure src="images/EmbeddingExampleXML2PDF.png" alt="Example XML to PDF (via XSL-FO)"/>
-    <p>
-The output (XSL-FO) from the XSL transformation is piped through to FOP using 
-SAX events. This is the most efficient way to do this because the 
-intermediate result doesn't have to be saved somewhere. Often, novice users 
-save the intermediate result in a file, a byte array or a DOM tree. We 
-strongly discourage you to do this if it isn't absolutely necessary. The 
-performance is significantly higher with SAX.
-    </p>
-  </section>
-  <section id="ExampleObj2XML">
-    <title>ExampleObj2XML.java</title>
-    <p>This example
-    <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleObj2XML.java?view=markup">
-        (current 0.20.5)</fork>
-    <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2XML.java?view=markup">
-        (future 1.0dev)</fork>
-is a preparatory example for the next one. It's an example that 
-shows how an arbitrary Java object can be converted to XML. It's an often 
-needed task to do this. Often people create a DOM tree from a Java object and 
-use that. This is pretty straightforward. The example here however shows how
-to do this using SAX which will probably be faster and not even more 
-complicated once you know how this works.
-    </p>
-    <figure src="images/EmbeddingExampleObj2XML.png" alt="Example Java object to XML"/>
-    <p>
-For this example we've created two classes: ProjectTeam and ProjectMember 
-(found in xml-fop/examples/embedding/java/embedding/model). They represent 
-the same data structure found in 
-xml-fop/examples/embedding/xml/xml/projectteam.xml. We want to serialize a 
-project team with several members which exist as Java objects to XML. 
-Therefore we created the two classes: ProjectTeamInputSource and 
-ProjectTeamXMLReader (in the same place as ProjectTeam above).
-    </p>
-    <p>
-The XMLReader implementation (regard it as a special kind of XML parser)is 
-responsible for creating SAX events from the Java object. The InputSource 
-class is only used to hold the ProjectTeam object to be used.
-    </p>
-    <p>
-Have a look at the source of ExampleObj2XML.java to find out how this is 
-used. For more detailed information see other resources on JAXP (ex. 
-<fork href="http://java.sun.com/xml/jaxp/dist/1.1/docs/tutorial/xslt/3_generate.html">An older JAXP tutorial</fork>).
-    </p>
-  </section>
-  <section id="ExampleObj2PDF">
-    <title>ExampleObj2PDF.java</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleObj2PDF.java?view=markup">
-            (current 0.20.5)</fork>
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java?view=markup">
-            (future 1.0dev)</fork>
-combines the previous and the third to demonstrate 
-how you can transform a Java object to a PDF directly in one smooth run
-by generating SAX events from the Java object that get fed to an XSL 
-transformation. The result of the transformation is then converted to PDF 
-using FOP as before.
-    </p>
-    <figure src="images/EmbeddingExampleObj2PDF.png" alt="Example Java object to PDF (via XML and XSL-FO)"/>
-  </section>
-  <section id="ExampleDOM2PDF">
-    <title>ExampleDOM2PDF.java</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/tags/fop-0_20_5/examples/embedding/java/embedding/ExampleDOM2PDF.java?view=markup">
-            (current 0.20.5)</fork>
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java?view=markup">
-            (future 1.0dev)</fork>
-has FOP use a DOMSource instead of a StreamSource in order to 
-use a DOM tree as input for an XSL transformation.
-    </p>
-  </section>
-  <section id="ExampleSVG2PDF">
-    <title>ExampleSVG2PDF.java (PDF Transcoder example)</title>
-    <p>This example
-        <fork href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleSVG2PDF.java?view=markup">
-            (applies to 0.20.5 and future 1.0dev)</fork>
-shows use of the PDF Transcoder, a sub-application within FOP.  
-It is used to generate a PDF document from an SVG file.
-    </p>
-  </section>
-  <section id="example-notes">
-    <title>Final notes</title>
-    <p>
-These examples should give you an idea of what's possible. It should be easy 
-to adjust these examples to your needs. Also, if you have other examples that you
-think should be added here, please let us know via either the FOP-USER or FOP-DEV
-mailing lists.  Finally, for more help please send your questions to the FOP-USER
-mailing list.
-    </p>
-  </section>
-</section>
-    </body>
-</document>
-
diff --git a/src/documentation/content/xdocs/0.20.5/graphics.xml b/src/documentation/content/xdocs/0.20.5/graphics.xml
deleted file mode 100644
index fe0a63a8e..000000000
--- a/src/documentation/content/xdocs/0.20.5/graphics.xml
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-<document>
-  <header>
-    <title>FOP: Graphics Formats</title>
-    <version>$Revision$</version>
-  </header>
-  <body>
-    <section id="support-overview">
-      <title>Overview of Graphics Support</title>
-      <p>
-        The table below summarizes the <em>theoretical</em> support for graphical formats within FOP. In other words, within the constraints of the limitations listed here, these formats <em>should</em> work. However, many of them have not been tested, and there may be limitations that have not yet been discovered or documented. The packages needed to support some formats are not included in the FOP distribution and must be installed separately. Follow the links in the "Support Thru" column for more details.
-      </p>
-      <table>
-        <tr>
-          <th>Format</th>
-          <th>Type</th>
-          <th>Support Thru</th>
-        </tr>
-        <tr>
-          <td><link href="#bmp">BMP</link> (Microsoft Windows Bitmap)</td>
-          <td>bitmap</td>
-          <td><link href="#native">FOP native</link></td>
-        </tr>
-        <tr>
-          <td><link href="#eps">EPS</link> (Encapsulated PostScript)</td>
-          <td>metafile (both bitmap and vector), probably most frequently used for vector drawings</td>
-          <td><link href="#native">FOP native</link> (limited support, see restrictions below)</td>
-        </tr>
-        <tr>
-          <td>GIF (Graphics Interchange Format)</td>
-          <td>bitmap</td>
-          <td><link href="#native">FOP native</link></td>
-        </tr>
-        <tr>
-          <td><link href="#jpeg">JPEG</link> (Joint Photographic Experts Group)</td>
-          <td>bitmap</td>
-          <td><link href="#native">FOP native</link></td>
-        </tr>
-        <tr>
-          <td><link href="#png">PNG</link> (Portable Network Graphic)</td>
-          <td>bitmap</td>
-          <td><link href="#jimi">JIMI</link> or <link href="#jai">JAI</link></td>
-        </tr>
-        <tr>
-          <td><link href="#svg">SVG</link> (Scalable Vector Graphics)</td>
-          <td>vector (with embedded bitmaps)</td>
-          <td><link href="#batik">Batik</link></td>
-        </tr>
-        <tr>
-          <td><link href="#tiff">TIFF</link> (Tag Image Format File)</td>
-          <td>bitmap</td>
-          <td><link href="#native">FOP native</link> or <link href="#jai">JAI</link>, depending on the subformat. See <link href="#tiff">TIFF</link> for more details.(JIMI also supports TIFF, but this has not been implemented within FOP).</td>
-        </tr>
-      </table>
-    </section>
-    <section id="packages">
-      <title>Graphics Packages</title>
-      <section id="native">
-        <title>FOP Native</title>
-        <p>
-          FOP has native ability to handle some graphic file formats.
-        </p>
-      </section>
-      <section id="jimi">
-        <title>JIMI</title>
-        <p>
-          Because of licensing issues, the JIMI image library is not included in the FOP distribution. First, <fork href="http://java.sun.com/products/jimi">download</fork> and install it.
-Then, copy the file "JimiProClasses.zip" from the archive to {fop-install-dir}/lib/jimi-1.0.jar. Please note that FOP binary distributions are compiled with JIMI support, so there is no need for you to build FOP to add the support. If jimi-1.0.jar is installed in the right place, it will automatically be used by FOP, otherwise it will not.
-        </p>
-      </section>
-      <section id="jai">
-        <title>JAI (Java Advanced Imaging API)</title>
-        <warning>JAI support is available for Release 0.20.5 and later. The comments in this section do not apply to releases earlier than 0.20.5.</warning>
-        <p>
-          FOP has been compiled with JAI support, but JAI is not included in the FOP distribution.
-To use it, install <link href="http://java.sun.com/products/java-media/jai">JAI</link>, then copy the jai_core.jar and the jai_codec.jar files to {fop-install-dir}/lib.
-JAI is much faster than JIMI, but is not available for all platforms. See <link href="http://java.sun.com/products/java-media/jai/forDevelopers/jaifaq.html#platforms">What platforms are supported?</link> on the JAI FAQ page for more details.
-        </p>
-      </section>
-      <section id="batik">
-        <title>Batik</title>
-        <p>Current FOP distributions include a distribution of the Apache Software Foundation's <jump href="http://xml.apache.org/batik">Batik</jump> version 1.5beta4.
-It is automatically installed with FOP.
-Because Batik's API changes frequently, it is highly recommended that you use the version that ships with FOP, at least when running FOP.</p>
-        <warning>Batik must be run in a graphical environment.</warning>
-        <p>Batik must be run in a graphical environment.
-It uses AWT classes for rendering SVG, which in turn require an X server on Unixish systems.
-If you run a server without X, or if you can't connect to the X server due to security restrictions or policies (a so-called "headless" environment), SVG rendering will fail.</p>
-        <p>Here are some workarounds:</p>
-        <ul>
-          <li>If you are using JDK 1.4, start it with the <code>-Djava.awt.headless=true</code> command line option.</li>
-          <li>Install an X server which provides an in-memory framebuffer without actually using a screen device or any display hardware. One example is Xvfb.</li>
-          <li>Install a toolkit which emulates AWT without the need for an underlying X server. One example is the <link href="http://www.eteks.com/pja/en">PJA toolkit</link>, which is free and comes with detailed installation instructions.</li>
-        </ul>
-      </section>
-    </section>
-    <section id="bmp">
-      <title>BMP</title>
-      <p>FOP native support for BMP images is limited to the RGB color-space.</p>
-    </section>
-    <section id="eps">
-      <title>EPS</title>
-      <p>FOP provides support for two output targets:</p>
-      <ul>
-        <li>PostScript (full support).</li>
-        <li>
-          PDF (partial support). Due to the lack of a built-in PostScript interpreter, FOP 
-          can only embed the EPS file into the PDF. Acrobat Reader will not currently display 
-          the EPS (it doesn't have a PostScript interpreter, either) but it will be shown 
-          correctly when you print the PDF on a PostScript-capable printer. PostScript devices 
-          (including GhostScript) will render the EPS correctly.
-        </li>
-      </ul>
-      <p>
-        Other output targets can't be supported at the moment because
-        FOP lacks a PostScript interpreter.
-      </p>
-    </section>
-    <section id="jpeg">
-      <title>JPEG</title>
-      <p>FOP native support of JPEG does not include all variants, especially those containing unusual color lookup tables and color profiles.
-If you have trouble with a JPEG image in FOP, try opening it with an image processing program (such as Photoshop or Gimp) and then saving it.
-Specifying 24-bit color output may also help.
-For the PDF and PostScript renderers most JPEG images can be passed through without decompression.
-User reports indicate that grayscale, RGB, and CMYK color-spaces are all rendered properly.
-      </p>
-    </section>
-    <section id="png">
-      <title>PNG</title>
-      <p>If using JAI for PNG support, only RGB and RGBA color-spaces are supported for FOP rendering.</p>
-    </section>
-    <section id="svg">
-      <title>SVG</title>
-      <section id="svg-intro">
-        <title>Introduction</title>
-        <p>FOP uses <link href="#batik">Batik</link> for SVG support.
-This format can be handled as an <code>fo:instream-foreign-object</code> or in a separate
-file referenced with <code>fo:external-graphic</code>.</p>
-      <note>   
-Batik's SVG Rasterizer utility may also be used to convert standalone SVG
-documents into PDF.  For more information please see the
-<link href="http://xml.apache.org/batik/svgrasterizer.html">SVG Rasterizer documentation</link>
-on the Batik site.
-      </note>
-      </section>
-      <section id="svg-pdf-graphics">
-        <title>Placing SVG Graphics into PDF</title>
-        <p>
-The SVG is rendered into PDF by using PDF commands to draw and fill
-lines and curves. This means that the graphical objects created with
-this remain as vector graphics.
-        </p>
-        <p>
-There are a number of SVG things that cannot be converted directly into
-PDF. Parts of the graphic such as effects, patterns and images are inserted
-into the PDF as a raster graphic. The resolution of this graphic may not
-be ideal depending on the FOP dpi (72dpi) and the scaling for that graphic.
-We hope to improve this in the future.</p>
-        <p>
-Currently transparency is not supported in PDF so many svg images that
-contain effects or graphics with transparent areas will not be displayed
-correctly.
-        </p>
-      </section>
-      <section id="svg-pdf-text">
-        <title>Placing SVG Text into PDF</title>
-        <p>If possible, Batik will use normal PDF text when inserting text. It does
-this by checking if the text can be drawn normally and the font is
-supported. This example svg <link href="../dev/svg/text.svg">text.svg</link> /
-<!--link href="../dev/svg/text.pdf"-->text.pdf<!--/link-->
-shows how various types and effects with text are handled.
-Note that tspan and outlined text are not yet implemented.</p>
-        <p>
-Otherwise, text is converted and drawn as a set of shapes by batik, using the stroking text painter.
-This means that a typical character will
-have about 10 curves (each curve consists of at least 20 characters).
-This can make the pdf files large and when the pdf is viewed the
-viewer does not normally draw those fine curves very well (turning on
-Smooth Line Art in the Acrobat preferences will fix this).
-If the text is inserted into the PDF using the inbuilt text commands
-for PDF it will use a single character.
-        </p>
-        <p>
-For PDF output, there is a <link href="configuration.html#svg-strokeSVGText">configuration option to force SVG text to be rendered as text</link>.
-The drawback to this approach is that it is effective only for available fonts (including embedded fonts).
-Font sizes are rounded to the next integer point size.
-This will be improved in the future.
-        </p>
-        <p>Note that because SVG text can be rendered as either text or a vector graphic, you may need to consider settings in your viewer for both.
-The Acrobat viewer has both "smooth line art" and "smooth text" settings that may need to be set for SVG images to be displayed nicely on your screen (see Edit / Preferences / Display).
-This setting will not affect the printing of your document, which should be OK in any case, but will only affect the quality of the screen display.</p>
-      </section>
-      <section id="svg-scaling">
-        <title>Scaling</title>
-        <p>Currently, SVG images are rendered with the dimensions specified <em>in the SVG file</em>, within the viewport specified in the fo:external-graphic element.
-For everything to work properly, the two should be equal.
-The SVG standard leaves this issue as an implementation detail.
-FOP will probably implement a scaling mechanism in the future.</p>
-      </section>
-      <section id="svg-problems">
-        <title>Known Problems</title>
-        <ul>
-          <li>
-soft mask transparency is combined with white so that it looks better
-on pdf 1.3 viewers but this causes the soft mask to be slightly lighter
-or darker on pdf 1.4 viewers
-          </li>
-          <li>
-there is some problem with a gradient inside a pattern causing a pdf
-error when viewed in acrobat 5
-          </li>
-          <li>
-text is not always handled correctly, it may select the wrong font
-especially if characters have multiple fonts in the font list
-          </li>
-          <li>
-more pdf text handling could be implemented
-It could draw the string using the attributed character iterator
-to handle tspans and other simple changes of text.
-          </li>
-          <li>
-JPEG images are not inserted directly into the pdf document
-This area has not been implemented yet since the appropriate
-method in batik is static
-          </li>
-          <li>
-Uniform transparency for images and other svg elements that are converted
-into a raster graphic are not drawn properly in PDF. The image is opaque.
-          </li>
-        </ul>
-      </section>
-    </section>
-    <section id="tiff">
-      <title>TIFF</title>
-      <p>FOP-native TIFF support is limited to PDF and PostScript output only. Also, according to user reports, FOP's native support for TIFF is limited to images with the following characteristics (all must be true for successful rendering):</p>
-      <ul>
-        <li>single channel images (i.e., bi-level and grayscale only)</li>
-        <li>uncompressed images, or images using CCITT T.4, CCITT T.6, or JPEG compression</li>
-        <li>images using white-is-zero encoding in the TIFF PhotometricInterpretation tag</li>
-      </ul>
-      <p><em>JAI:</em> Supports RGB and RGBA only for FOP rendering.</p>
-    </section>
-    <section id="resolution">
-      <title>Graphics Resolution</title>
-      <p>Some bitmapped image file formats store a dots-per-inch (dpi) or other resolution value. Since PDF and most output formats do not have a concept of resolution, but only of absolute image units (i.e. pixels) FOP ignores the resolution values as well. Instead, FOP uses the dimensions of the image as specified in the fo:external-graphic element to render the image:</p>
-      <ul>
-        <li>If no dimensions are given, FOP uses a default value of 72 dpi to compute the graphic's dimensions. For example, suppose a graphic 300 pixels wide and 400 pixels high. FOP will render the graphic at 4.167 inches wide, 5.555 inches high, with an apparent resolution of 72 dpi.</li>
-        <li>If only one dimension is given, FOP by default uses the same aspect ratio to compute the other dimension (to avoid the appearance of stretching). For example, suppose a graphic 300 pixels wide and 400 pixels high, for which content-width = ".5in". FOP will compute the content-height = .667 inches, and will render the graphic at that size, with an apparent resolution of 600 dpi.</li>
-        <li>If both dimensions are given, FOP simply renders the image in that space. For example, suppose a graphic 300 pixels wide and 400 pixels high, for which content-width = "3in" and content-height = "4in". FOP will render the graphic at that size, with an apparent resolution of 100 dpi.</li>
-      </ul>
-      <p>If you need a higher apparent output resolution for bitmapped images, first make sure that at least one dimension of the image is defined in your XSL-FO input. Apart from that, resolution problems are in the image file itself, and must be corrected there: use or create a higher-resolution image file.</p>
-      <note>The explanation above describes only the basic default behavior. There are other attributes of the fo:external-graphic element that can affect the behavior described above.</note>
-    </section>
-    <section id="caching">
-      <title>Image caching</title>
-      <p>
-        FOP caches images between runs. The URL is used as a key to identify images which means that when
-        a particular URL appears again, the image is taken from the cache. If you have a servlet that
-        generates a different image each time it is called with the same URL you need to use a constantly 
-        changing dummy parameter on the URL to avoid caching.
-      </p>
-      <p>
-        Currently, the images are not automatically released when an OutOfMemoryError is imminent. The
-        image cache can grow to a considerable size over time when a lot of different URLs are in use.
-        Starting with version 0.20.5 you can call <code>org.apache.fop.image.FopImageFactory.resetCache()</code>
-        to manually empty the cache. Image caching will be improved as part of our redesign effort.
-      </p>
-    </section>
-  </body>
-</document>
diff --git a/src/documentation/content/xdocs/0.20.5/output.xml b/src/documentation/content/xdocs/0.20.5/output.xml
deleted file mode 100644
index 577e51b04..000000000
--- a/src/documentation/content/xdocs/0.20.5/output.xml
+++ /dev/null
@@ -1,329 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
-<!-- Output Formats: Renderers -->
-<document>
-  <header>
-    <title>FOP Output Options</title>
-    <version>$Revision$</version>
-    <authors>
-      <person name="Keiron Liddle" email="keiron@aftexsw.com"/>
-      <person name="Art Welch" email=""/>
-    </authors>
-  </header>
-
-    <body>
-    <p>
-FOP supports multiple output formats by using a different renderer for each format.
-The renderers do not all have the same set of capabilities, sometimes because of the output format itself, sometimes because some renderers get more development attention than others.
-    </p>
-<section id="general">
-  <title>General Information</title>
-  <section id="general-fonts">
-    <title>Fonts</title>
-    <p>
-Most FOP renderers use a FOP-specific system for font registration.
-However, the AWT and print renderers use the java awt package, which gets its font information from the operating system registration.
-This can result in several differences, including actually using different fonts, and having different font metrics for the same font.
-The net effect is that the layout of a given FO document can be quite different between renderers that do not use the same font information.
-    </p>
-  </section>
-  <section id="general-direct-output">
-    <title>Output to a Printer or Other Device</title>
-        <p>
-The most obvious way to print your document is to use the FOP <link href="#print">print renderer</link>, which uses the Java API (AWT).
-However, you can also send output from the Postscript renderer directly to a Postscript device, or output from the PCL renderer directly to a PCL device.
-    </p>
-    <p>
-Here are Windows command-line examples for Postscript and PCL:
-    </p>
-    <source><![CDATA[fop ... -ps \\computername\printer]]></source>
-    <source><![CDATA[fop ... -pcl \\computername\printer]]></source>
-    <p>
-Here is some Java code to accomplish the task in UNIX:
-    </p>
-<source><![CDATA[proc = Runtime.getRuntime().exec("lp -d" + print_queue + " -o -dp -");
-out = proc.getOutputStream();]]></source>
-    <p>
-Set the OutputStream (out) to the PCLRenderer and it happily sends the
-PCL to the UNIX printer queue.
-    </p>
-  </section>
-</section>
-<section id="pdf">
-  <title>PDF</title>
-  <p>
-PDF is the best supported output format. It is also the most accurate
-with text and layout. This creates a PDF document that is streamed out
-as each page is rendered. This means that the internal page index
-information is stored near the end of the document.
-The PDF version supported is 1.3 which is currently the most popular
-version for Acrobat Reader (4.0), PDF versions are forwards/backwards
-compatible.
-  </p>
-  <p>Note that FOP does not currently support "tagged pdf".</p>
-  <section id="pdf-fonts">
-    <title>Fonts</title>
-    <p>
-      PDF has a set of fonts that are always available to all PDF viewers,
-      to quote from the PDF Specification:
-
-<em>"PDF prescribes a set of 14 standard fonts that can be used without prior
-definition.
-These include four faces each of three Latin text typefaces (Courier,
-Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf
-Dingbats). These fonts, or suitable substitute fonts with the same metrics, are
-guaranteed to be available in all PDF viewer applications."</em>
-    </p>
-  </section>
-  <section id="pdf-postprocess">
-    <title>Post-processing</title>
-    <p>FOP does not currently support several desirable PDF features: document properties (title, author, etc.), and watermarks. One workaround is to use Adobe Acrobat (the full version, not the Reader) to process the file manually or with scripting that it supports.</p>
-    <p>Another popular post-processing tool is <link href="http://www.lowagie.com/iText">iText</link>, which has tools for adding security features, document properties, watermarks, and many other features to PDF files.
-    </p>
-    <warning>
-      Caveat: iText may swallow PDF bookmarks. But 
-      <link href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37589">Jens Stavnstrup tells us</link>
-      that this doesn't happen if you use iText's PDFStamper.
-    </warning>
-    <p>Here is some sample code that uses iText to encrypt a FOP-generated PDF. (Note that FOP now supports <link href="pdfencryption.html">PDF encryption</link>. However the principles for using iText for other PDF features are similar.)</p>
-    <source><![CDATA[public static void main(String args[]) {
-  try {
-    ByteArrayOutputStream fopout=new ByteArrayOutputStream();
-    FileOutputStream outfile=new FileOutputStream(args[2]);
-    Driver driver =new Driver();
-    driver.setOutputStream(fopout);
-    driver.setRenderer(Driver.RENDER_PDF);
-    Transformer transformer=TransformerFactory
-      .newInstance().newTransformer(new StreamSource(new File(args[1])));
-    transformer.transform(new StreamSource(new File(args[0])),
-       new SAXResult(driver.getContentHandler()));
-    PdfReader reader = new PdfReader(fopout.toByteArray());
-    int n = reader.getNumberOfPages();
-    Document document = new Document(reader.getPageSizeWithRotation(1));
-    PdfWriter writer = PdfWriter.getInstance(document, outfile);
-    writer.setEncryption(PdfWriter.STRENGTH40BITS, "pdf", null,
-      PdfWriter.AllowCopy);
-    document.open();
-    PdfContentByte cb = writer.getDirectContent();
-    PdfImportedPage page;
-    int rotation;
-    int i = 0;
-    while (i < n) {
-      i++;
-      document.setPageSize(reader.getPageSizeWithRotation(i));
-      document.newPage();
-      page = writer.getImportedPage(reader, i);
-      rotation = reader.getPageRotation(i);
-      if (rotation == 90 || rotation == 270) {
-        cb.addTemplate(page, 0, -1f, 1f, 0, 0,
-         reader.getPageSizeWithRotation(i).height());  }
-      else {
-        cb.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
-      }
-      System.out.println("Processed page " + i);
-    }
-    document.close();
-  }
-  catch( Exception e) {
-    e.printStackTrace();
-  }
-}]]></source>
-    <p>Check the iText tutorial and documentation for setting access flags, password, encryption strength and other parameters.
-    </p>
-  </section>
-  <section id="pdf-watermark">
-    <title>Watermarks</title>
-    <p>
-      In addition to the <link href="#pdf-postprocess">PDF Post-processing</link> options, consider the following workarounds:
-    </p>
-    <ul>
-      <li>
-        Use a background image for the body region.
-      </li>
-      <li>
-        (submitted by Trevor_Campbell@kaz.com.au) Place an image in a
-        region that overlaps the flowing text. For example, make
-        region-before large enough to contain your image. Then include a
-        block (if necessary, use an absolutely positioned block-container)
-        containing the watermark image in the static-content for the
-        region-before. Note that the image will be drawn on top of the
-        normal content.
-      </li>
-    </ul>
-  </section>
-</section>
-<section id="pcl">
-  <title>PCL</title>
-    <p>
-This format is for the Hewlett-Packard PCL printers.
-It should produce output as close to identical as possible to the
-printed output of the PDFRenderer within the limitations of the
-renderer, and output device.
-    </p>
-    <p>
-The output created by the PCLRenderer is generic PCL 5 as documented
-in the "HP PCL 5 Printer Language Technical Reference Manual" (copyright 1990).
-This should allow any device fully supporting PCL 5 to be able to
-print the output generated by the PCLRenderer.
-    </p>
-    <section id="pcl-limitations">
-      <title>Limitations</title>
-      <ul>
-        <li>Text or graphics outside the left or top of the printable area are not rendered properly. In general things that should print to the left of the printable area are shifted to the right so that they start at the left edge of the printable area and an error message is generated.</li>
-        <li>The Helvetica and Times fonts are not well supported among PCL printers so Helvetica is mapped to Arial and Times is mapped to Times New. This is done in the PCLRenderer, no changes are required in the FO's. The metrics and appearance for Helvetica/Arial and Times/Times New are nearly identical, so this has not been a problem so far.</li>
-        <li>Only the original fonts built into FOP are supported.</li>
-        <li>For the non-symbol fonts, the ISO 8859/1 symbol set is used (PCL set "0N").</li>
-        <li>Multibyte characters are not supported.</li>
-        <li>SVG is not supported.</li>
-        <li>Images print black and white only (not dithered). When the renderer prints a color image it uses a threshold value, colors above the threshold are printed as white and below are black. If you need to print a non-monochrome image you should dither it first.</li>
-        <li>Image scaling is accomplished by modifying the effective resolution of the image data. The available resolutions are 75, 100, 150, 300, and 600 DPI.</li>
-        <li>Color printing is not supported. Colors are rendered by mapping the color intensity to one of the PCL fill shades (from white to black in 9 steps).</li>
-      </ul>
-    </section>
-
-    <section id="pcl-additional">
-      <title>Additional Features</title>
-      <p>There are some special features that are controlled by some public variables on the PCLRenderer class.</p>
-
-      <dl>
-        <dt>orientation</dt>
-        <dd>The logical page orientation is controlled by the public orientation variable. Legal values are:
-          <!--ul>
-            <li>0 Portrait</li>
-            <li>1 Landscape</li>
-            <li>2 Reverse Portrait</li>
-            <li>3 Reverse Landscape</li>
-          </ul-->
-        </dd>
-        <dt>curdiv, paperheight</dt>
-        <dd>The curdiv and paperheight variables allow multiple virtual pages to be printed on a piece of paper. This allows a standard laser printer to use perforated paper where every perforation will represent an individual page. The paperheight sets the height of a piece of paper in decipoints. This will be divided by the page.getHeight() to determine the number of equal sized divisions (pages) that will fit on the paper. The curdiv variable may be read/written to get/set the current division on the page (to set the starting division and read the ending division for multiple invocations).</dd>
-        <dt>topmargin, leftmargin</dt>
-        <dd>The topmargin and leftmargin may be used to increase the top and left margins for printing.</dd>
-      </dl>
-    </section>
-</section>
-<section id="ps">
-  <title>PostScript</title>
-    <p>
-The PostScript renderer is still in its early stages and therefore still
-missing some features. It provides good support for most text and layout.
-Images and SVG are not fully supported, yet. Currently, the PostScript
-renderer generates PostScript Level 3 with most DSC comments. Actually,
-the only Level 3 feature used is FlateDecode, everthing else is Level 2.
-    </p>
-    <section id="ps-limitations">
-      <title>Limitations</title>
-      <ul>
-        <li>Images and SVG may not be display correctly. SVG support is far from being complete. No image transparency is available.</li>
-        <li>Character spacing may be wrong.</li>
-        <li>No font embedding is supported.</li>
-        <li>Multibyte characters are not supported.</li>
-        <li>PPD support is still missing.</li>
-        <li>The renderer is not yet configurable.</li>
-      </ul>
-    </section>
-</section>
-<section id="rtf">
-  <title>RTF</title>
-    <p>
-This is currently not integrated with FOP but it will soon.
-This will create an rtf (rich text format) document that will
-attempt to contain as much information from the fo document as
-possible.
-    </p>
-</section>
-<section id="svg">
-  <title>SVG</title>
-    <p>
-This format creates an SVG document that has links between the pages.
-This is primarily for slides and creating svg images of pages.
-Large documents will create SVG files that are far too large for
-and SVG viewer to handle. Since fo documents usually have text the
-SVG document will have a large number of text elements.
-The font information for the text is obtained from the jvm in the
-same way as the AWT viewer, if the svg is view where the fonts are
-different, such as another platform, then the page will appear wrong.
-    </p>
-</section>
-<section id="xml">
-  <title>XML</title>
-    <p>
-This is for testing and verification. The XML created is simply
-a representation of the internal area tree put into XML. It does
-not perform any other purpose.
-    </p>
-</section>
-<section id="print">
-  <title>Print</title>
-    <p>
-It is possible to directly print the document from the command line.
-This is done with the same code that renders to the AWT renderer.
-    </p>
-</section>
-<section id="awt">
-  <title>AWT</title>
-    <p>
-The AWT viewer shows a window with the pages displayed inside a
-java graphic. It displays one page at a time.
-The fonts used for the formatting and viewing depend on the fonts
-available to your JRE.
-    </p>
-</section>
-<section id="mif">
-  <title>MIF</title>
-    <p>
-This format is the Maker Interchange Format which is used by
-Adobe Framemaker. This is currently not fully implemented.
-    </p>
-</section>
-<section id="txt">
-  <title>TXT</title>
-    <p>
-The text renderer produces plain ASCII text output
-that attempts to match the output of the PDFRenderer as closely as
-possible. This was originally developed to accommodate an archive system
-that could only accept plain text files, and is primarily useful for getting
-a quick-and-dirty view of the document text. The renderer is very limited,
-so do not be surprised if it gives unsatisfactory results.
-    </p>
-    <p>
-The Text renderer works with a fixed size page buffer. The size of this
-buffer is controlled with the textCPI and textLPI public variables.
-The textCPI is the effective horizontal characters per inch to use.
-The textLPI is the vertical lines per inch to use. From these values
-and the page width and height the size of the buffer is calculated.
-The formatting objects to be rendered are then mapped to this grid.
-Graphic elements (lines, borders, etc) are assigned a lower priority
-than text, so text will overwrite any graphic element representations.
-    </p>
-    <p>Because FOP lays the text onto a grid during layout, there are frequently extra or missing spaces between characters and lines, which is generally unsatisfactory.
-Users have reported that the optimal settings to avoid such spacing problems are:</p>
-    <ul>
-      <li>font-family="Courier"</li>
-      <li>font-size="7.3pt"</li>
-      <li>line-height="10.5pt"</li>
-    </ul>
-</section>
-
-    </body>
-</document>
-
diff --git a/src/documentation/content/xdocs/0.20.5/running.xml b/src/documentation/content/xdocs/0.20.5/running.xml
deleted file mode 100644
index 0432735f6..000000000
--- a/src/documentation/content/xdocs/0.20.5/running.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
-<document>
-  <header>
-    <title>Running FOP</title>
-    <version>$Revision$</version>
-  </header>
-
-  <body>
-    <section id="require">
-      <title>System Requirements</title>
-      <p>The following software must be installed:</p>
-      <ul>
-        <li>Java 1.2.x or later Runtime Environment.</li>
-        <li>FOP. The <link href="../download.html">FOP distribution</link> includes all libraries that you will need to run a basic FOP installation. These can be found in the xml-fop/lib directory. These libraries include the following:
-          <ul>
-            <li><jump href="http://xml.apache.org/xerces-j/index.html">Apache Xerces-J</jump> for XML parsing. You can use other XML parsers which support SAX and DOM.</li>
-            <li><jump href="http://xml.apache.org/xalan-j/index.html">Apache Xalan-J</jump>, an XSLT processor.</li>
-            <li><jump href="http://xml.apache.org/batik/">Apache Batik</jump>, an SVG library.</li>
-          </ul>
-        </li>
-      </ul>
-      <p>The following software is optional, depending on your needs:</p>
-      <ul>
-        <li>Graphics libraries. Support for some graphics formats requires additional packages. See <link href="graphics.html">FOP: Graphics Formats</link> for details.</li>
-        <li>PDF encryption. See <link href="pdfencryption.html">FOP: PDF Encryption</link> for details.</li>
-      </ul>
-      <p>In addition, the following system requirements apply:</p>
-      <ul>
-        <li>If you will be using FOP to process SVG, you must do so in a graphical environment. See <link href="graphics.html#batik">FOP: Graphics (Batik)</link> for details.</li>
-      </ul>
-    </section>
-    <section id="install">
-      <title>Installation</title>
-      <section id="install-instruct">
-        <title>Instructions</title>
-        <p>Basic FOP installation consists of first unzipping the <code>.gz</code> file that is the distribution medium, then unarchiving the resulting <code>.tar</code> file in a directory/folder that is convenient on your system. Please consult your operating system documentation or Zip application software documentation for instructions specific to your site.</p>
-      </section>
-      <section id="install-problems">
-        <title>Problems</title>
-        <p>Some Mac OSX users have experienced filename truncation problems using Stuffit to unzip and unarchive their distribution media. This is a legacy of older Mac operating systems, which had a 31-character pathname limit. Several Mac OSX users have recommended that Mac OSX users use the shell command <code>tar -xzf</code> instead.</p>
-      </section>
-    </section>
-    <section id="standalone-start">
-      <title>Starting FOP as a Standalone Application</title>
-      <p>The usual and recommended practice for starting FOP from the command line is to run the batch file fop.bat (Windows) or the shell script fop.sh (Unix/Linux).
-If you write your own scripts, be sure to review these standard scripts to make sure that you get your environment properly configured.</p>
-      <p>The standard scripts for starting FOP require that the environment variable JAVA_HOME be set to a path pointing to the appropriate Java installation on your system. Macintosh OSX includes a Java environment as part of its distribution. We are told by Mac OSX users that the path to use in this case is <code>/Library/Java/Home</code>. <strong>Caveat: </strong>We suspect that, as Apple releases new Java environments and as FOP upgrades the minimum Java requirements, the two will inevitably not match on some systems. Please see <jump href="http://developer.apple.com/java/faq">Java on Mac OSX FAQ</jump> for information as it becomes available.</p>
-      <p><code>fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-pcl|-ps|-txt|-svg|-at|-print] &lt;outfile></code></p>
-      <p>[OPTIONS]</p>
-      <source>
-      -d             debug mode
-      -x             dump configuration settings
-      -q             quiet mode
-      -c cfg.xml     use additional configuration file cfg.xml
-      -l lang        the language to use for user information
-      -s             (-at output) omit tree below block areas
-      -txt.encoding  (-txt output encoding use the encoding for the output file.
-                     The encoding must be a valid java encoding.
-      -o [password]  pdf file will be encrypted with option owner password
-      -u [password]  pdf file will be encrypted with option user password
-      -noprint       pdf file will be encrypted without printing permission
-      -nocopy        pdf file will be encrypted without copy content permission
-      -noedit        pdf file will be encrypted without edit content permission
-      -noannotations pdf file will be encrypted without edit annotation permission</source>
-      <p>[INPUT]</p>
-      <source>      infile            XSLFO input file (the same as the next)
-      -fo  infile       xsl:fo input file
-      -xml infile       xml input file, must be used together with -xsl
-      -xsl stylesheet   xslt stylesheet</source>
-
-      <p>[OUTPUT]</p>
-      <source>      outfile           input will be rendered as pdf file into outfile
-      -pdf outfile      input will be rendered as pdf file (outfile req'd)
-      -awt              input will be displayed on screen
-      -mif outfile      input will be rendered as mif file (outfile req'd)
-      -pcl outfile      input will be rendered as pcl file (outfile req'd)
-      -ps outfile       input will be rendered as PostScript file (outfile req'd)
-      -txt outfile      input will be rendered as text file (outfile req'd)
-      -svg outfile      input will be rendered as an svg slides file (outfile req'd)
-      -at outfile       representation of area tree as XML (outfile req'd)
-      -print            input file will be rendered and sent to the printer
-                        see print specific options with "-print help"</source>
-      <p>[Examples]</p>
-      <source>      fop foo.fo foo.pdf
-      fop -fo foo.fo -pdf foo.pdf (does the same as the previous line)
-      fop -xsl foo.xsl -xml foo.xml -pdf foo.pdf
-      fop foo.fo -mif foo.mif
-      fop foo.fo -print or fop -print foo.fo
-      fop foo.fo -awt</source>
-      <p>PDF encryption is only available if FOP was compiled with encryption support <strong>and</strong> if compatible encryption support is availabe at run time. Currently, only the JCE is supported. Check the <link href="pdfencryption.html">Details</link>.</p>
-    </section>
-    <section id="check-input">
-      <title>Using Xalan to Check XSL-FO Input</title>
-      <p>FOP sessions that use -xml and -xsl input instead of -fo input are actually controlling two distinct conversions: Tranforming XML to XSL-FO, then formatting the XSL-FO to PDF (or another FOP output format).
-Although FOP controls both of these processes, the first is included merely as a convenience and for performance reasons.
-Only the second is part of FOP's core processing.
-If a user has a problem running FOP, it is important to determine which of these two processes is causing the problem.
-If the problem is in the first process, the user's stylesheet is likely the cause.
-The FOP development team does not have resources to help with stylesheet issues, although we have included links to some useful <link href="../resources.html#specs">Specifications</link> and <link href="../resources.html#articles">Books/Articles</link>.
-If the problem is in the second process, FOP may have a bug or an unimplemented feature that does require attention from the FOP development team.</p>
-      <note>The user is always responsible to provide correct XSL-FO code to FOP.</note>
-      <p>In the case of using -xml and -xsl input, although the user is responsible for the XSL-FO code that is FOP's input, it is not visible to the user. To make the intermediate FO file visible, the FOP distribution includes xalan.bat (Windows batch file) and xalan.sh (Unix/Linux script), which run only the first (transformation) step, and write the results to a file.</p>
-      <note>When asking for help on the FOP mailing lists, <em>never</em> attach XML and XSL to illustrate the issue. Always run the xalan script and send the resulting XSL-FO file instead. Of course, be sure that the XSL-FO file is correct before sending it.</note>
-      <p>
-        The scripts are invoked the same way that <link href="http://xml.apache.org/xalan-j/commandline.html">Xalan</link> is:
-      </p>
-      <p>
-        <code>xalan -in xmlfile -xsl file -out outfile</code>
-      </p>
-      <p>
-        Note that there are some subtle differences between the "fop" and "xalan" command lines.
-      </p>
-    </section>
-    <section id="memory">
-      <title>Memory Usage</title>
-      <p>
-FOP can consume quite a bit of memory, even though this has been continually improved.
-This is partly inherent to the formatting process and partly caused by implementation choices.
-All FO processors currently on the market have memory problems with certain layouts.
-      </p>
-      <p>
-If you are running out of memory when using FOP, here are some ideas that may help:
-      </p>
-      <ul>
-        <li>
-Increase memory available to the JVM. See <link href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</link> for more information.
-          <!--<warning>-->
-(Warning: It is usually unwise to increase the memory allocated to the JVM beyond the amount of physical RAM, as this will generally cause significantly slower performance.)
-          <!--</warning>-->
-        </li>
-        <li>
-Avoid forward references.
-Forward references are references to some later part of a document.
-Examples include page number citations which refer to pages which follow the citation, tables of contents at the beginning of a document, and page numbering schemes that include the total number of pages in the document (<link href="../faq.html#pagenum">"page N of TOTAL"</link>).
-Forward references cause all subsequent pages to be held in memory until the reference can be resolved, i.e. until the page with the referenced element is encountered.
-Forward references may be required by the task, but if you are getting a memory overflow, at least consider the possibility of eliminating them.
-A table of contents could be replaced by PDF bookmarks instead or moved to the end of the document (reshuffle the paper could after printing).
-        </li>
-        <li>
-Avoid large images, especially if they are scaled down.
-If they need to be scaled, scale them in another application upstream from FOP.
-For many image formats, memory consumption is driven mainly by the size of the image file itself, not its dimensions (width*height), so increasing the compression rate may help.
-If FOP is running embedded, clearing the image from time to time cache might prevent memory exhaustion, you can call
-<code>org.apache.fop.image.FopImageFactory.resetCache()</code> to empty the 
-<jump href="graphics.html#caching">image cache</jump>.
-        </li>
-        <li>
-Use multiple page sequences.
-FOP starts rendering after the end of a page sequence is encountered.
-While the actual rendering is done page-by-page, some additional memory is freed after the page sequence has been rendered.
-This can be substantial if the page sequence contains lots of FO elements.
-        </li>
-      </ul>
-      <p>
-There are currently some bugs which cause FOP to go into a nonterminating loop, which will also often result in a memory overflow.
-A characteristic symptom is continuous <link href="../faq.html#boxoverflow">box overflows</link> in the log.
-Most of these loops are triggered by elements that do not fit in the available space, such as big images or an improperly specified width in nested block elements.
-The only workaround is to locate such problems and correct them.
-      </p>
-      <p>
-One of FOP's stated design goals is to be able to process input of arbitrary size.
-Addressing this goal is one of the prime motivations behind the <link href="../dev/index.html">FOP Redesign</link>.
-      </p>
-    </section>
-    <section id="problems">
-      <title>Problems</title>
-      <p>If you have problems running FOP, please see the <jump href="../gethelp.html">"How to get Help" page</jump>.</p>
-    </section>
-  </body>
-</document>
diff --git a/src/documentation/content/xdocs/0.93/configuration.xml b/src/documentation/content/xdocs/0.93/configuration.xml
index c40a64de5..ed96c3eb7 100644
--- a/src/documentation/content/xdocs/0.93/configuration.xml
+++ b/src/documentation/content/xdocs/0.93/configuration.xml
@@ -290,10 +290,10 @@
     </section>
   </section>
 
-	<section>
-	  <title>When it does not work</title>
+  <section>
+    <title>When it does not work</title>
 
-	  <p>FOP searches the configuration file for the information it
+    <p>FOP searches the configuration file for the information it
 expects, at the position it expects. When that information is not
 present, FOP will not complain, it will just continue. When there is
 other information in the file, FOP will not complain, it will just
@@ -301,14 +301,14 @@ ignore it. That means that when your configuration information is in
 the file but in a different XML element, or in a different XML path,
 than FOP expects, it will be silently ignored.</p>
 
-	  <p>Check the following possibilities:</p>
+    <p>Check the following possibilities:</p>
 
-	  <ul>
-		<li>The format of the configuration file has changed
+    <ul>
+    <li>The format of the configuration file has changed
 considerably between FOP 0.20.5 and FOP 1.0 and its beta versions. Did
 you convert your file to the new format?</li>
 
-		<li>The FOP distribution contains a schema for configuration
+    <li>The FOP distribution contains a schema for configuration
 files, at src/foschema/fop-configuration.xsd. Did you validate your
 configuration file against it? Add the following schema location to
 the <code>schema</code> element:
@@ -323,13 +323,13 @@ and run the configuration file through a validating schema
 parser. Note that the schema cannot detect all errors, and that it is
 stricter about the order of some elements than FOP itself is.</li>
 
-		<li>Run FOP in debug mode (command line option
+    <li>Run FOP in debug mode (command line option
 <code>-d</code>). This makes FOP report which configuration
 information it finds. Check if FOP finds what you expect.</li>
 
-	  </ul>
+    </ul>
 
-	</section>
+  </section>
   </body>
 </document>
 
diff --git a/src/documentation/content/xdocs/0.93/running.xml b/src/documentation/content/xdocs/0.93/running.xml
index 492c55ca1..3e852ea98 100644
--- a/src/documentation/content/xdocs/0.93/running.xml
+++ b/src/documentation/content/xdocs/0.93/running.xml
@@ -212,35 +212,35 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
       directory in a single directory. If you use hyphenation, you
       must also put <code>fop-hyph.jar</code> in that directory.</p>
 
-		<p>In both cases the arguments consist of the options and
+    <p>In both cases the arguments consist of the options and
         infile and outfile specifications as shown above for the
         standard scripts.</p>
       </section>
       <section id="dynamical-classpath">
-		<title>FOP's dynamical classpath construction</title>
+        <title>FOP's dynamical classpath construction</title>
 
-		<p>If FOP is started without a proper classpath, it tries to
-		add its dependencies dynamically. FOP uses the current working
-		directory as the base directory for its search. If the base
-		directory is called <code>build</code>, then its parent
-		directory becomes the base directory.</p>
+        <p>If FOP is started without a proper classpath, it tries to
+        add its dependencies dynamically. FOP uses the current working
+        directory as the base directory for its search. If the base
+        directory is called <code>build</code>, then its parent
+        directory becomes the base directory.</p>
 
         <p>FOP expects to find <code>fop.jar</code> in the
-		<code>build</code> subdirectory of the base directory, and
-		adds it to the classpath. Subsequently FOP adds all
-		<code>jar</code> files in the lib directory to the
-		classpath. The lib directory is either the <code>lib</code>
-		subdirectory of the base directory, or, if that does not
-		exist, the base directory itself.</p>
+        <code>build</code> subdirectory of the base directory, and
+        adds it to the classpath. Subsequently FOP adds all
+        <code>jar</code> files in the lib directory to the
+        classpath. The lib directory is either the <code>lib</code>
+        subdirectory of the base directory, or, if that does not
+        exist, the base directory itself.</p>
 
         <p>If the system property <code>fop.optional.lib</code>
-		contains the name of a directory, then all <code>jar</code>
-		files in that directory are also added to the classpath. See
-		the methods <code>getJARList</code> and
-		<code>checkDependencies</code> in
-		<code>org.apache.fop.cli.Main</code>.</p>
+        contains the name of a directory, then all <code>jar</code>
+        files in that directory are also added to the classpath. See
+        the methods <code>getJARList</code> and
+        <code>checkDependencies</code> in
+        <code>org.apache.fop.cli.Main</code>.</p>
 
-	  </section>
+      </section>
     </section>
     <section id="check-input">
       <title>Using Xalan to Check XSL-FO Input</title>
diff --git a/src/documentation/content/xdocs/0.93/upgrading.xml b/src/documentation/content/xdocs/0.93/upgrading.xml
index 46c9cff3b..0f04e63b2 100644
--- a/src/documentation/content/xdocs/0.93/upgrading.xml
+++ b/src/documentation/content/xdocs/0.93/upgrading.xml
@@ -51,7 +51,7 @@
           an example configuration file. A XML Schema file can be found under
           src/foschema/fop-configuration.xsd.
         </li>
-		<li>
+        <li>
           If you are using font metrics files for version 0.20.5 or
           0.92 or earlier, you have to regenerate them in the new
           format. The new format is characterized by a version
diff --git a/src/documentation/content/xdocs/0.20.5/anttask.xml b/src/documentation/content/xdocs/0.94/anttask.xml
index 9bc3c59ee..44550c3d7 100644
--- a/src/documentation/content/xdocs/0.20.5/anttask.xml
+++ b/src/documentation/content/xdocs/0.94/anttask.xml
@@ -16,9 +16,7 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Ant task</title>
@@ -26,29 +24,36 @@
   </header>
   <body>
     <p>
-    FOP provides an Ant task for automating the document build process.</p>
-    <section id="basics"><title>Description</title>
-    <p>
-    The FOP Ant task will convert XSL-FO documents to PDF/PS/PCL/MIF/RTF output
-    (see <link href="output.html">Output formats</link> for available formats).</p>
-    <p>
-	To call FOP tasks within Ant, first add a FOP task definition to your Ant build file.
-	One method of defining the task is as follows:
-	</p>
-	<source><![CDATA[
-<property name="fop.dir" value="....path to your FOP jar files..."/>
+      Apache FOP provides an Ant task for automating the document build process.
+    </p>
+    <section id="basics">
+      <title>Description</title>
+      <p>
+        The FOP Ant task will convert XSL-FO documents to PDF, PS, PCL etc. output
+        (see <a href="output.html">Output formats</a> for available formats).
+      </p>
+      <p>
+        To call FOP tasks within Ant, first add a FOP task definition to your Ant build file.
+        One method of defining the task is as follows:
+      </p>
+      <source><![CDATA[
+<property name="fop.home" value="....path to your FOP HOME directory..."/>
 
 <taskdef name="fop" 
          classname="org.apache.fop.tools.anttasks.Fop">
-         <classpath>
-            <pathelement location="${fop.dir}\fop.jar"/>
-            <pathelement location="${fop.dir}\avalon.jar"/>
-            <pathelement location="${fop.dir}\batik.jar"/>
-         </classpath>
+  <classpath>
+    <fileset dir="${fop.home}/lib">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${fop.home}/build">
+      <include name="fop.jar"/>
+      <include name="fop-hyph.jar" />
+    </fileset>
+  </classpath>
 </taskdef>
-	]]></source>
+    ]]></source>
 <p>
-	Then create FOP tasks within your Ant build file, using the FOP task parameters listed below.</p>
+    Then create FOP tasks within your Ant build file, using the FOP task parameters listed below.</p>
     </section>
     <!-- TODO: Installation/Configuration -->
     <section id="parameters"><title>Parameters for FOP Ant task</title>
@@ -71,13 +76,24 @@
       <tr> 
        <td>format</td> 
        <td>Possible output formats:<br/>
+         <code>application/X-fop-awt-preview</code><br/>
+         <code>application/X-fop-print</code><br/>
+         <code>application/X-fop-areatree</code><br/>
          <code>application/pdf</code><br/>
          <code>application/postscript</code><br/>
-         <code>application/vnd.mif</code><br/>
-         <code>application/rtf</code><br/>
+         <code>application/mif</code><br/>
+         <code>application/rtf</code>,
+         <code>text/richtext</code>,
+         <code>text/rtf</code><br/>
+         <code>application/x-pcl</code>,
          <code>application/vnd.hp-PCL</code><br/>
+         <code>application/x-afp</code>,
+         <code>application/vnd.ibm.modcap</code><br/>
          <code>text/plain</code><br/>
-         <code>text/xml</code><br/>
+         <code>image/svg+xml</code><br/>
+         <code>image/gif</code><br/>
+         <code>image/png</code><br/>
+         <code>image/tiff</code><br/>
        </td> 
        <td>No, defaults to <code>application/pdf</code></td> 
       </tr> 
@@ -117,24 +133,24 @@
       </tr> 
       <tr> 
        <td>userconfig</td> 
-       <td>User configuration file (same as the FOP "-c" command line option)</td> 
+       <td>User configuration file (same as the FOP "-c" command line option).</td> 
        <td>No</td> 
       </tr> 
       <tr> 
        <td>messagelevel</td> 
        <td>Logging level<br/>
-       Possible values: <code>error</code>, <code>warn</code>, <code>info</code>, <code>verbose</code>, <code>debug</code></td> 
+       Possible values: <code>error</code>, <code>warn</code>, <code>info</code>, <code>verbose</code>, <code>debug</code>. <strong>Currently doesn't work in FOP Trunk!!!</strong></td> 
        <td>No, defaults to <code>verbose</code></td> 
       </tr> 
       <tr> 
        <td>logFiles</td> 
        <td>Controls whether the names of the files that are processed are logged 
-	   		(<code>true</code>) or not (<code>false</code>)</td> 
+            (<code>true</code>) or not (<code>false</code>). <strong>Currently doesn't work in FOP Trunk!!!</strong></td> 
        <td>No, default is <code>true</code></td> 
       </tr> 
      </table>
-	 <p/>
-	 <table><caption>Parameters specified as nested elements</caption>
+     <p/>
+     <table><caption>Parameters specified as nested elements</caption>
       <tr> 
        <th>Attribute</th> 
        <th>Description</th> 
@@ -142,11 +158,11 @@
       </tr> 
       <tr> 
        <td>fileset</td> 
-       <td><link href="http://ant.apache.org/manual/CoreTypes/fileset.html">FileSets</link> 
-	   		are used to specify multiple XSL-FO files to be rendered.</td> 
+       <td><a href="http://ant.apache.org/manual/CoreTypes/fileset.html">FileSets</a> 
+            are used to specify multiple XSL-FO files to be rendered.</td> 
        <td>Yes, if no fofile attribute is supplied</td> 
       </tr> 
-	  </table>
+      </table>
     </section>
     <section id="examples">
     <title>Examples</title>
diff --git a/src/documentation/content/xdocs/0.94/compiling.xml b/src/documentation/content/xdocs/0.94/compiling.xml
new file mode 100644
index 000000000..c6c17a3c0
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/compiling.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Apache FOP: Building from Source Code</title>
+    <version>$Revision$</version>
+  </header>
+  <body>
+    <section id="build-needed">
+      <title>Do You Need To Build?</title>
+      <p>
+        FOP distributions are either pre-compiled binary or source.
+        If you are using a binary distribution, it is already built and there is no need to build it again. 
+        See the <a href="../download.html">Download Instructions</a> for information about whether a 
+        binary or source distribution is best for your needs.
+      </p>
+      <p>
+        If you got the source code from a repository snapshot or via Subversion you will need to build FOP
+        in any case.
+      </p>
+    </section>
+    <section id="env">
+      <title>Set Up Your Environment</title>
+      <section id="env-jdk">
+        <title>JDK</title>
+        <p>
+          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.3
+          (A Java Runtime Environment is not sufficient).
+        </p>
+      </section>
+      <section id="env-classpath">
+        <title>CLASSPATH</title>
+        <p>
+          There is generally no need to setup a classpath. All libraries needed to compile FOP are included 
+          in the source distribution and are referenced by the build script.
+          You will only need to adjust the classpath if you build FOP in some other way. See the build 
+          script build.xml for details.
+        </p>
+      </section>
+      <section id="env-java-home">
+        <title>JAVA_HOME</title>
+        <p>
+          The build script uses <a href="ext:ant">Apache Ant</a>, a popular 
+          Java-based build tool, which usually requires that the environment variable JAVA_HOME point to 
+          your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally 
+          does not need this setting.
+        </p>
+      </section>
+      <section id="env-ant">
+        <title>Apache Ant</title>
+        <p>
+          <a href="ext:ant">Apache Ant</a> 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>
+      </section>
+    </section>
+    <section id="build-script">
+      <title>Run the Build Script</title>
+      <p>
+        Change to the FOP root directory and build FOP by executing the build script (build.xml)
+        using the "ant" command.
+      </p>
+      <note>
+        The "ant" command is only available on your system if you've properly 
+        <a href="ext:ant/manual/">installed Apache Ant</a> and added Ant's location to the PATH 
+        environment variable.
+      </note>
+      <p>
+        The file build.xml in the FOP root directory is the blueprint that Ant uses for the build. It 
+        contains information for numerous build targets, many of which are building blocks to more 
+        useful target, and others which are primarily used by the FOP developers.
+        You may benefit from looking through this file to learn more about the various build targets.
+        To obtain a complete list of useful build targets:
+      </p>
+      <source>ant -projecthelp</source>
+      <p>The most useful targets are:</p>
+      <ul>
+        <li>
+          <strong>package</strong>: Generates the JAR files (default). This is the normal build that 
+          produces a jar file usable for running FOP.
+        </li>
+        <li>
+          <strong>clean </strong>: Cleans the build directory. This is useful for making sure that 
+          any build errors are cleaned up before starting a new build. It should not ordinarily be 
+          needed, but may be helpful if you are having problems with the build process itself.
+        </li>
+        <li>
+          <strong>javadocs</strong>: Creates the FOP API documentation.
+          <note>A minimum JDK version of 1.4.2 is required for generating the javadocs.</note>
+        </li>
+      </ul>
+      <p>To run the build:</p>
+      <source>ant [target ...]</source>
+      <p>For example to do a normal build for the "all" target (which is the default):</p>
+      <source>ant</source>
+      <p>OR</p>
+      <source>ant all</source>
+      <p>To clean the build directory first:</p>
+      <source>ant clean all</source>
+      <note>
+        If you want to shorten the build time you can just call the "package" target which
+        doesn't perform any automated tests during the build.
+      </note>
+    </section>
+    <section id="problems">
+      <title id="Troubleshooting">Troubleshooting</title>
+      <p>If you have problems building FOP, please try the following:</p>
+      <ul>
+        <li>Run the build with the target of "clean", then rerun the build.</li>
+        <li>Delete the build directory completely, then rerun the build.</li>
+        <li>
+          Make sure you do not have a non-FOP version of xerces.jar, xalan.jar, batik.jar, 
+          or another dependency product somewhere in your CLASSPATH.
+        </li>
+        <li>
+          If the build still fails, see the <a href="../gethelp.html">Getting Help</a> 
+          page for further help.
+        </li>
+      </ul>
+    </section>
+  </body>
+</document>
+
diff --git a/src/documentation/content/xdocs/0.94/configuration.xml b/src/documentation/content/xdocs/0.94/configuration.xml
new file mode 100644
index 000000000..656c3b706
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/configuration.xml
@@ -0,0 +1,385 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Apache FOP: Configuration</title>
+    <version>$Revision$</version>
+  </header>
+
+  <body>
+  <section id="general">
+    <title>Configuration File Basics</title>
+    <p>
+      The FOP configuration file is an XML file containing a variety of settings that are useful 
+      for controlling FOP's behavior, and for helping it find resources that you wish it to use.
+    </p>
+    <p>
+      The easiest way to get started using a FOP configuration file is to copy the sample found 
+      at <code>{fop-dir}/conf/fop.xconf</code> to a location of your choice, and then to 
+      edit it according to your needs.
+      It contains templates for the various configuration options, most of which are commented 
+      out. Remove the comments and change the settings for entries that you wish to use.
+      Be sure to follow any instructions, including comments which specify the value range.
+      Also, since the configuration file is XML, be sure to keep it well-formed.
+    </p>
+    <section id="general-available">
+      <title>Making Configuration Available to FOP</title>
+      <p>After creating your configuration file, you must tell FOP how to find it:</p>
+      <ul>
+        <li>
+          If running FOP from the command-line, see the "-c" command-line option in 
+          <a href="running.html">Running FOP</a>.
+        </li>
+        <li>
+          If running FOP as an embedded application, see 
+          <a href="embedding.html#config-external">Embedding, Using a Configuration File</a>.
+        </li>
+      </ul>
+      <p>
+        See <a href="embedding.html#config-internal">Setting the Configuration Programmatically</a>
+        for instructions on how to do so in an embedded environment.
+      </p>
+    </section>
+  </section>
+  <section id="general-elements">
+    <title>Summary of the General Configuration Options</title>
+    <table>
+      <tr>
+        <th>Element</th>
+        <th>Data Type (for the value)</th>
+        <th>Description</th>
+        <th>Default Value</th>
+      </tr>
+      <tr>
+        <td>base</td>
+        <td>URL or directory</td>
+        <td>Specifies the base URL based on which relative URL will be resolved.</td>
+        <td>current directory</td>
+      </tr>
+      <tr>
+        <td>font-base</td>
+        <td>URL or directory</td>
+        <td>Specifies the base URL based on which relative font URLs will be resolved.
+        </td>
+        <td>base URL/directory (above)</td>
+      </tr>
+      <tr>
+        <td>hyphenation-base</td>
+        <td>URL or directory</td>
+        <td>Specifies the base URL based on which relative URLs to hyphenation pattern 
+        files will be resolved. If not specified, support for user-supplied hyphenation 
+        patterns remains disabled.
+        </td>
+        <td>disabled</td>
+      </tr>
+      <tr>
+        <td>source-resolution</td>
+        <td>Integer, dpi</td>
+        <td>
+          Resolution in dpi (dots per inch) which is used internally to determine the pixel 
+          size for SVG images and bitmap images without resolution information.
+        </td>
+        <td>72 dpi</td>
+      </tr>
+      <tr>
+        <td>target-resolution</td>
+        <td>Integer, dpi</td>
+        <td>
+          Resolution in dpi (dots per inch) used to specify the output resolution for bitmap
+          images generated by bitmap renderers (such as the TIFF renderer) and by bitmaps
+          generated by Apache Batik for filter effects and such.
+        </td>
+        <td>72 dpi</td>
+      </tr>
+      <tr>
+        <td>strict-configuration</td>
+        <td>Boolean (true, false)</td>
+        <td>
+          Setting this option to 'true' will cause FOP to strictly verify the contents of the
+          FOP configuration file to ensure that defined resources (such as fonts and base
+          URLs/directories) are valid and available to FOP.  Any errors found will cause FOP to
+          immediately raise an exception.</td>
+        <td>false</td>
+      </tr>
+      <tr>
+        <td>strict-validation</td>
+        <td>Boolean (true, false)</td>
+        <td>
+          Setting this option to 'false' causes FOP to be more forgiving about XSL-FO validity, 
+          for example, you're allowed to specify a border on a region-body which is supported 
+          by some FO implementations but is non-standard. Note that such a border would 
+          currently have no effect in Apache FOP.</td>
+        <td>true</td>
+      </tr>
+      <tr>
+        <td>break-indent-inheritance</td>
+        <td>Boolean (true, false)</td>
+        <td>
+          Setting this option to 'true' causes FOP to use an alternative rule set to determine
+          text indents specified through margins, start-indent and end-indent. Many commercial
+          FO implementations have chosen to break the XSL specification in this aspect. This
+          option tries to mimic their behaviour. Please note that Apache FOP may still not
+          behave exactly like those implementations either because FOP has not fully matched
+          the desired behaviour and because the behaviour among the commercial implementations
+          varies. The default for this option (i.e. false) is to behave exactly like the 
+          specification describes.</td>
+        <td>false</td>
+      </tr>
+      <tr>
+        <td>default-page-settings</td>
+        <td>n/a</td>
+        <td>
+          Specifies the default width and height of a page if "auto" is specified 
+          for either or both values. Use "height" and "width" attributes on the 
+          default-page-settings element to specify the two values.</td>
+        <td>"height" 11 inches, "width" 8.26 inches</td>
+      </tr>
+      <tr>
+        <td>use-cache</td>
+        <td>boolean (true, false)</td>
+        <td>All fonts information that has been gathered as a result of "directory"
+        or "auto-detect" font configurations will be cached for future rendering runs.
+        This setting should improve performance on systems where
+        fonts have been configured using the "directory" or "auto-detect" tag mechanisms.
+        By default this option is switched on.</td>
+        <td>true</td>
+      </tr>
+      <tr>
+        <td>cache-file</td>
+        <td>String</td>
+        <td>This options specifies the file/directory path of the fop cache file.
+        This option can also be specified on the command-line using the -cache option.
+        This file is currently only used to cache font triplet information for future reference.</td>
+        <td>${base}/conf/fop.cache</td>
+      </tr>
+      <tr>
+        <td>renderers</td>
+        <td>(see text below)</td>
+        <td>Contains the configuration for each renderer. See below.</td>
+        <td>N/A</td>
+      </tr>
+    </table>
+    <p>
+      This is an excerpt from the example configuration file coming with FOP:
+    </p>
+    <source><![CDATA[
+<fop version="1.0">
+
+  <!-- Strict user configuration -->
+  <strict-configuration>true</strict-configuration>
+
+  <!-- Strict FO validation -->
+  <strict-validation>true</strict-validation>
+
+  <!-- Base URL for resolving relative URLs -->
+  <base>./</base>
+
+  <!-- Font Base URL for resolving relative font URLs -->
+  <font-base>./</font-base>
+
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi -->
+  <source-resolution>72</source-resolution>
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi -->
+  <target-resolution>72</target-resolution>
+
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
+  <default-page-settings height="11in" width="8.26in"/>
+  
+  <!-- etc. etc..... -->
+</fop>]]></source>
+  </section>
+  <section id="renderers">
+    <title>Renderer configuration</title>
+    <p>
+      Each Renderer has its own configuration section which is identified by the
+      MIME type the Renderer is written for, ex. "application/pdf" for the PDF Renderer.
+    </p>
+    <p>
+      The configuration for the PDF Renderer could look like this:
+    </p>
+    <source><![CDATA[
+  <renderers>
+    <renderer mime="application/pdf">
+      <filterList>
+        <!-- provides compression using zlib flate (default is on) -->
+        <value>flate</value>
+      </filterList>
+      <fonts>
+        <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf">
+          <font-triplet name="Arial" style="normal" weight="normal"/>
+          <font-triplet name="ArialMT" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf">
+          <font-triplet name="Arial" style="normal" weight="bold"/>
+          <font-triplet name="ArialMT" style="normal" weight="bold"/>
+        </font>
+      </fonts>
+    </renderer>
+    
+    <renderer mime="application/postscript">
+    <!-- etc. etc..... -->]]></source>
+    <p>
+      The details on the font configuration can be found on the separate <a href="fonts.html">Fonts</a> page.
+      Note especially the section entitled <a href="fonts.html#register">Register Fonts with FOP</a>.
+    </p>
+    <section id="pdf-renderer">
+      <title>Special Settings for the PDF Renderer</title>
+      <p>
+        The configuration element for the PDF renderer contains two elements. One is for the font configuration
+        (please follow the link above) and one is for the "filter list". The filter list controls how the
+        individual objects in a PDF file are encoded. By default, all objects get "flate" encoded (i.e. simply 
+        compressed with the same algorithm that is also used in ZIP files). Most users don't need to change that
+        setting. For debugging purposes, it may be desired not to compress the internal objects at all so the
+        generated PDF commands can be read. In that case, you can simply use the following filter list. The 
+        second filter list (type="image") ensures that all images still get compressed but also ASCII-85 encoded
+        so the produced PDF file is still easily readable in a text editor.
+      </p>
+    <source><![CDATA[
+    <renderer mime="application/pdf">
+      <filterList>
+        <value>null</value>
+      </filterList>
+      <filterList type="image">
+        <value>flate</value>
+        <value>ascii-85</value>
+      </filterList>
+      
+      <fonts....
+    </renderer>]]></source>
+      <p>
+        Another (optional) setting specific to the PDF Renderer is an output color profile, an ICC 
+        color profile which indicates the target color space the PDF file is generated for. This 
+        setting is mainly used in conjunction with the <a href="pdfx.html">PDF/X</a> feature. 
+        An example:
+      </p>
+    <source><![CDATA[
+    <renderer mime="application/pdf">
+      <filterList...
+      
+      <output-profile>C:\FOP\Color\EuropeISOCoatedFOGRA27.icc</output-profile>
+      
+      <fonts....
+    </renderer>]]></source>
+    </section>
+    <section id="ps-renderer">
+      <title>Special Settings for the PostScript Renderer</title>
+      <p>
+        Besides the normal font configuration (the same "fonts" element as for the PDF renderer) the PostScript
+        renderer has an additional setting to force landscape pages to be rotated to fit on a page inserted into
+        the printer in portrait mode. Set the value to "true" to activate this feature. The default is "false".
+        Example:
+      </p>
+    <source><![CDATA[
+    <renderer mime="application/postscript">
+      <auto-rotate-landscape>true</auto-rotate-landscape>
+      
+      <fonts>
+        <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf">
+          <font-triplet name="Arial" style="normal" weight="normal"/>
+          <font-triplet name="ArialMT" style="normal" weight="normal"/>
+        </font>
+        <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf">
+          <font-triplet name="Arial" style="normal" weight="bold"/>
+          <font-triplet name="ArialMT" style="normal" weight="bold"/>
+        </font>
+      </fonts>
+    </renderer>]]></source>
+    </section>
+    <section id="pcl-renderer">
+      <title>Special Settings for the PCL Renderer</title>
+      <p>
+        Non-standard fonts for the PCL renderer are made available through the Java2D subsystem which means that
+        you don't have to do any custom font configuration in this case but you have to use the font names
+        offered by Java.
+      </p>
+      <p>
+        Additionally, there are certain settings that control how the renderer handles various elements.
+      </p>
+<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+  <rendering>quality</rendering>
+  <text-rendering>bitmap</text-rendering>
+</renderer>]]></source>
+      <p>
+        The default value for the "rendering" setting is "speed" which causes borders 
+        to be painted as plain rectangles. In this mode, no special borders (dotted, 
+        dashed etc.) are available. If you want support for all border modes, set the
+        value to "quality" as indicated above. This will cause the borders to be painted
+        as bitmaps.
+      </p>
+      <p>
+        The default value for the "text-rendering" setting is "auto" which paints the
+        base fonts using PCL fonts. Non-base fonts are painted as bitmaps through Java2D.
+        If the mix of painting methods results in unwelcome output, you can set this
+        to "bitmap" which causes all text to be rendered as bitmaps.
+      </p>
+    </section>
+  </section>
+  <section id="fonts">
+    <title>Apache FOP Font Config</title>
+    <p>
+      Apache FOP has special Font configuration considerations, which are explained
+      in detail on the <a href="fonts.html">Fonts</a> page.
+    </p>
+  </section>
+
+  <section>
+    <title>When it does not work</title>
+
+    <p>FOP searches the configuration file for the information it
+expects, at the position it expects. When that information is not
+present, FOP will not complain, it will just continue. When there is
+other information in the file, FOP will not complain, it will just
+ignore it. That means that when your configuration information is in
+the file but in a different XML element, or in a different XML path,
+than FOP expects, it will be silently ignored.</p>
+
+      <p>Check the following possibilities:</p>
+
+      <ul>
+        <li>The format of the configuration file has changed
+considerably between FOP 0.20.5 and FOP 1.0 and its beta versions. Did
+you convert your file to the new format?</li>
+
+        <li>The FOP distribution contains a schema for configuration
+files, at src/foschema/fop-configuration.xsd. Did you validate your
+configuration file against it? Add the following schema location to
+the <code>schema</code> element:
+
+<source><![CDATA[<fop
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:noNamespaceSchemaLocation=
+"http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/foschema/fop-configuration.xsd?view=co">]]>
+</source>
+
+and run the configuration file through a validating schema
+parser. Note that the schema cannot detect all errors, and that it is
+stricter about the order of some elements than FOP itself is.</li>
+
+        <li>Run FOP in debug mode (command line option
+<code>-d</code>). This makes FOP report which configuration
+information it finds. Check if FOP finds what you expect.</li>
+
+      </ul>
+
+    </section>
+  </body>
+</document>
+
diff --git a/src/documentation/content/xdocs/0.94/embedding.xml b/src/documentation/content/xdocs/0.94/embedding.xml
new file mode 100644
index 000000000..3e3c964f8
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/embedding.xml
@@ -0,0 +1,689 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!-- Embedding FOP -->
+<document>
+  <header>
+    <title>Apache FOP: Embedding</title>
+    <subtitle>How to Embed FOP in a Java application</subtitle>
+    <version>$Revision$</version>
+  </header>
+
+  <body>
+  <section id="overview">
+    <title>Overview</title>
+    <p>
+      Review <a href="running.html">Running FOP</a> for important information that applies 
+      to embedded applications as well as command-line use, such as options and performance.
+    </p>
+    <p>
+      To embed Apache FOP in your application, first create a new
+      org.apache.fop.apps.FopFactory instance. This object can be used to launch multiple
+      rendering runs. For each run, create a new org.apache.fop.apps.Fop instance through
+      one of the factory methods of FopFactory. In the method call you specify which output
+      format (i.e. Renderer) to use and, if the selected renderer requires an OutputStream,
+      which OutputStream to use for the results of the rendering. You can customize FOP's
+      behaviour in a rendering run by supplying your own FOUserAgent instance. The
+      FOUserAgent can, for example, be used to set your own Renderer instance (details
+      below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and
+      use that as the SAXResult of your transformation.
+    </p>
+    <note>
+      We recently changed FOP's outer API to what we consider the final API. This might require
+      some changes in your application. The main reasons for these changes were performance
+      improvements due to better reuse of reusable objects and reduced use of static variables
+      for added flexibility in complex environments.
+    </note>
+  </section>
+  <section id="basics">
+    <title>Basic Usage Pattern</title>
+    <p>
+      Apache FOP relies heavily on JAXP. It uses SAX events exclusively to receive the XSL-FO 
+      input document. It is therefore a good idea that you know a few things about JAXP (which
+      is a good skill anyway). Let's look at the basic usage pattern for FOP...
+    </p>
+    <p>Here is the basic pattern to render an XSL-FO file to PDF:
+    </p>
+    <source><![CDATA[
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.MimeConstants;
+
+/*..*/
+
+// Step 1: Construct a FopFactory
+// (reuse if you plan to render multiple documents!)
+FopFactory fopFactory = FopFactory.newInstance();
+
+// Step 2: Set up output stream.
+// Note: Using BufferedOutputStream for performance reasons (helpful with FileOutputStreams).
+OutputStream out = new BufferedOutputStream(new FileOutputStream(new File("C:/Temp/myfile.pdf")));
+
+try {
+  // Step 3: Construct fop with desired output format
+  Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out);
+
+  // Step 4: Setup JAXP using identity transformer
+  TransformerFactory factory = TransformerFactory.newInstance();
+  Transformer transformer = factory.newTransformer(); // identity transformer
+           
+  // Step 5: Setup input and output for XSLT transformation 
+  // Setup input stream
+  Source src = new StreamSource(new File("C:/Temp/myfile.fo"));
+
+  // Resulting SAX events (the generated FO) must be piped through to FOP
+  Result res = new SAXResult(fop.getDefaultHandler());
+            
+  // Step 6: Start XSLT transformation and FOP processing
+  transformer.transform(src, res);
+
+} finally {
+  //Clean-up
+  out.close();
+}]]></source>
+    <p>
+      Let's discuss these 5 steps in detail:
+    </p>
+    <ul>
+      <li>
+        <strong>Step 1:</strong> You create a new FopFactory instance. The FopFactory instance holds 
+        references to configuration information and cached data. It's important to reuse this
+        instance if you plan to render multiple documents during a JVM's lifetime.
+      </li>
+      <li>
+        <strong>Step 2:</strong> You set up an OutputStream that the generated document
+        will be written to. It's a good idea to buffer the OutputStream as demonstrated 
+        to improve performance.
+      </li>
+      <li>
+        <strong>Step 3:</strong> You create a new Fop instance through one of the factory
+        methods on the FopFactory. You tell the FopFactory what your desired output format
+        is. This is done by using the MIME type of the desired output format (ex. "application/pdf").
+        You can use one of the MimeConstants.* constants. The second parameter is the
+        OutputStream you've setup up in step 2.
+      </li>
+      <li>
+        <strong>Step 4</strong> We recommend that you use JAXP Transformers even 
+        if you don't do XSLT transformations to generate the XSL-FO file. This way 
+        you can always use the same basic pattern. The example here sets up an 
+        "identity transformer" which just passes the input (Source) unchanged to the 
+        output (Result). You don't have to work with a SAXParser if you don't do any 
+        XSLT transformations.
+      </li>
+      <li>
+        <strong>Step 5:</strong> Here you set up the input and output for the XSLT 
+        transformation. The Source object is set up to load the "myfile.fo" file. 
+        The Result is set up so the output of the XSLT transformation is sent to FOP. 
+        The FO file is sent to FOP in the form of SAX events which is the most efficient 
+        way. Please always avoid saving intermediate results to a file or a memory buffer 
+        because that affects performance negatively.
+      </li>
+      <li>
+        <strong>Step 6:</strong> Finally, we start the XSLT transformation by starting 
+        the JAXP Transformer. As soon as the JAXP Transformer starts to send its output 
+        to FOP, FOP itself starts its processing in the background. When the 
+        <code>transform()</code> method returns FOP will also have finished converting 
+        the FO file to a PDF file and you can close the OutputStream.
+        <note label="Tip!">
+          It's a good idea to enclose the whole conversion in a try..finally statement. If
+          you close the OutputStream in the finally section, this will make sure that the
+          OutputStream is properly closed even if an exception occurs during the conversion.
+        </note>
+      </li>
+    </ul>
+    <p>
+      If you're not totally familiar with JAXP Transformers, please have a look at the 
+      <a href="#examples">Embedding examples</a> below. The section contains examples
+      for all sorts of use cases. If you look at all of them in turn you should be able
+      to see the patterns in use and the flexibility this approach offers without adding
+      too much complexity.
+    </p>
+    <p>
+      This may look complicated at first, but it's really just the combination of an 
+      XSL transformation and a FOP run. It's also easy to comment out the FOP part
+      for debugging purposes, for example when you're tracking down a bug in your 
+      stylesheet. You can easily write the XSL-FO output from the XSL transformation
+      to a file to check if that part generates the expected output. An example for that
+      can be found in the <a href="#examples">Embedding examples</a> (See "ExampleXML2FO").
+    </p>
+    <section id="basic-logging">
+      <title>Logging</title>
+      <p>
+        Logging is now a little different than it was in FOP 0.20.5. We've switched from
+        Avalon Logging to <a href="ext:jakarta/commons/logging">Jakarta Commons Logging</a>.
+        While with Avalon Logging the loggers were directly given to FOP, FOP now retrieves
+        its logger(s) through a statically available LogFactory. This is similar to the
+        general pattern that you use when you work with Apache Log4J directly, for example.
+        We call this "static logging" (Commons Logging, Log4J) as opposed to "instance logging" 
+        (Avalon Logging). This has a consequence: You can't give FOP a logger for each
+        processing run anymore. The log output of multiple, simultaneously running FOP instances
+        is sent to the same logger.
+      </p>
+      <note>
+        We know this may be an issue in multi-threaded server environments if you'd like to 
+        know what's going on in every single FOP processing run. We're planning to add an
+        additional feedback facility to FOP which can be used to obtain all sorts of specific
+        feedback (validation messages, layout problems etc.). "Static logging" is mainly 
+        interesting for a developer working on FOP and for advanced users who are debugging 
+        FOP. We don't consider the logging output to be useful to normal FOP users. Please
+        have some patience until we can add this feature or jump in and help us build it. We've
+        set up a <a href="http://wiki.apache.org/xmlgraphics-fop/ProcessingFeedback">Wiki page</a>
+        which documents what we're going to build.
+      </note>
+      <p>
+        By default, <a href="ext:jakarta/commons/logging">Jakarta Commons Logging</a> uses
+        JDK logging (available in JDKs 1.4 or higher) as its backend. You can configure Commons
+        Logging to use an alternative backend, for example Log4J. Please consult the
+        <a href="ext:jakarta/commons/logging">documentation for Jakarta Commons Logging</a> on
+        how to configure alternative backends.
+      </p>
+    </section>
+  
+    <section id="render">
+      <title>Processing XSL-FO</title>
+      <p>
+        Once the Fop instance is set up, call <code>getDefaultHandler()</code> to obtain a SAX 
+        DefaultHandler instance to which you can send the SAX events making up the XSL-FO 
+        document you'd like to render. FOP processing starts as soon as the DefaultHandler's
+        <code>startDocument()</code> method is called. Processing stops again when the
+        DefaultHandler's <code>endDocument()</code> method is called. Please refer to the basic
+        usage pattern shown above to render a simple XSL-FO document.
+      </p>
+    </section>
+
+    <section id="render-with-xslt">
+      <title>Processing XSL-FO generated from XML+XSLT</title>
+      <p>
+        If you want to process XSL-FO generated from XML using XSLT we recommend 
+        again using standard JAXP to do the XSLT part and piping the generated SAX 
+        events directly through to FOP. The only thing you'd change to do that 
+        on the basic usage pattern above is to set up the Transformer differently:
+      </p>
+      <source><![CDATA[
+  //without XSLT:
+  //Transformer transformer = factory.newTransformer(); // identity transformer
+  
+  //with XSLT:
+  Source xslt = new StreamSource(new File("mystylesheet.xsl"));
+  Transformer transformer = factory.newTransformer(xslt);]]></source>
+    </section>
+  </section>
+  <section id="input">
+    <title>Input Sources</title>
+    <p>
+      The input XSL-FO document is always received by FOP as a SAX stream (see the 
+      <a href="../dev/design/parsing.html">Parsing Design Document</a> for the rationale).
+    </p>
+    <p>
+      However, you may not always have your input document available as a SAX stream. 
+      But with JAXP it's easy to convert different input sources to a SAX stream so you
+      can pipe it into FOP. That sounds more difficult than it is. You simply have
+      to set up the right Source instance as input for the JAXP transformation. 
+      A few examples:
+    </p>
+    <ul>
+      <li>
+        <strong>URL:</strong> <code>Source src = new StreamSource("http://localhost:8080/testfile.xml");</code>
+      </li>
+      <li>
+        <strong>File:</strong> <code>Source src = new StreamSource(new File("C:/Temp/myinputfile.xml"));</code>
+      </li>
+      <li>
+        <strong>String:</strong> <code>Source src = new StreamSource(new StringReader(myString)); // myString is a String</code>
+      </li>
+      <li>
+        <strong>InputStream:</strong> <code>Source src = new StreamSource(new MyInputStream(something));</code>
+      </li>
+      <li>
+        <strong>Byte Array:</strong> <code>Source src = new StreamSource(new ByteArrayInputStream(myBuffer)); // myBuffer is a byte[] here</code>
+      </li>
+      <li>
+        <strong>DOM:</strong> <code>Source src = new DOMSource(myDocument); // myDocument is a Document or a Node</code>
+      </li>
+      <li>
+        <strong>Java Objects:</strong> Please have a look at the <a href="#examples">Embedding examples</a> which contain an example for this.
+      </li>
+    </ul>
+    <p>
+      There are a variety of upstream data manipulations possible.
+      For example, you may have a DOM and an XSL stylesheet; or you may want to
+      set variables in the stylesheet. Interface documentation and some cookbook 
+      solutions to these situations are provided in 
+      <a href="http://xml.apache.org/xalan-j/usagepatterns.html">Xalan Basic Usage Patterns</a>.
+    </p>
+  </section>
+  <section id="config-internal">
+    <title>Configuring Apache FOP Programmatically</title>
+    <p>
+      Apache FOP provides two levels on which you can customize FOP's
+      behaviour: the FopFactory and the user agent.
+    </p>
+    <section id="fop-factory">
+      <title>Customizing the FopFactory</title>
+      <p>
+        The FopFactory holds configuration data and references to objects which are reusable over
+        multiple rendering runs. It's important to instantiate it only once (except in special 
+        environments) and reuse it every time to create new FOUserAgent and Fop instances.
+      </p>
+      <p>
+        You can set all sorts of things on the FopFactory:
+      </p>
+      <ul>
+        <li>
+          <p>
+            The <strong>font base URL</strong> to use when resolving relative URLs for fonts. Example:
+          </p>
+          <source>fopFactory.setFontBaseURL("file:///C:/Temp/fonts");</source>
+        </li>
+        <li>
+          <p>
+            The <strong>hyphenation base URL</strong> to use when resolving relative URLs for 
+            hyphenation patterns. Example:
+          </p>
+          <source>fopFactory.setHyphenBaseURL("file:///C:/Temp/hyph");</source>
+        </li>
+        <li>
+          <p>
+            Disable <strong>strict validation</strong>. When disabled FOP is less strict about the rules 
+            established by the XSL-FO specification. Example:
+          </p>
+          <source>fopFactory.setStrictValidation(false);</source>
+        </li>
+        <li>
+          <p>
+            Enable an <strong>alternative set of rules for text indents</strong> that tries to mimic the behaviour of many commercial 
+            FO implementations, that chose to break the specification in this respect. The default of this option is 
+            'false', which causes Apache FOP to behave exactly as described in the specification. To enable the 
+            alternative behaviour, call:
+          </p>
+          <source>fopFactory.setBreakIndentInheritanceOnReferenceAreaBoundary(true);</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>source resolution</strong> for the document. This is used internally to determine the pixel 
+            size for SVG images and bitmap images without resolution information. Default: 72 dpi. Example:
+          </p>
+          <source>fopFactory.setSourceResolution(96); // =96dpi (dots/pixels per Inch)</source>
+        </li>
+        <li>
+          <p>
+            Manually add an <strong>ElementMapping instance</strong>. If you want to supply a special FOP extension
+            you can give the instance to the FOUserAgent. Normally, the FOP extensions can be automatically detected 
+            (see the documentation on extension for more info). Example:
+          </p>
+          <source>fopFactory.addElementMapping(myElementMapping); // myElementMapping is a org.apache.fop.fo.ElementMapping</source>
+        </li>
+        <li>
+          <p>
+            Set a <strong>URIResolver</strong> for custom URI resolution. By supplying a JAXP URIResolver you can add
+            custom URI resolution functionality to FOP. For example, you can use 
+            <a href="ext:xml.apache.org/commons/resolver">Apache XML Commons Resolver</a> to make use of XCatalogs. Example:
+          </p>
+          <source>fopFactory.setURIResolver(myResolver); // myResolver is a javax.xml.transform.URIResolver</source>
+          <note>
+            Both the FopFactory and the FOUserAgent have a method to set a URIResolver. The URIResolver on the FopFactory
+            is primarily used to resolve URIs on factory-level (hyphenation patterns, for example) and it is always used 
+            if no other URIResolver (for example on the FOUserAgent) resolved the URI first.
+          </note>
+        </li>
+      </ul>
+    </section>
+    <section id="user-agent">
+      <title>Customizing the User Agent</title>
+      <p>
+        The user agent is the entity that allows you to interact with a single rendering run, i.e. the processing of a single 
+        document. If you wish to customize the user agent's behaviour, the first step is to create your own instance
+        of FOUserAgent using the appropriate factory method on FopFactory and pass that 
+        to the factory method that will create a new Fop instance:
+      </p>
+      <source><![CDATA[
+  FopFactory fopFactory = FopFactory.newInstance(); // Reuse the FopFactory if possible!
+  // do the following for each new rendering run
+  FOUserAgent userAgent = fopFactory.newFOUserAgent();
+  // customize userAgent
+  Fop fop = fopFactory.newFop(MimeConstants.MIME_POSTSCRIPT, userAgent, out);]]></source>
+      <p>
+        You can do all sorts of things on the user agent:
+      </p>
+      <ul>
+        <li>
+          <p>
+            The <strong>base URL</strong> to use when resolving relative URLs. Example:
+          </p>
+          <source>userAgent.setBaseURL("file:///C:/Temp/");</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>producer</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. The default producer is "Apache FOP". Example:
+          </p>
+          <source>userAgent.setProducer("MyKillerApplication");</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>creating user</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source>userAgent.setCreator("John Doe");</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>author</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source>userAgent.setAuthor("John Doe");</source>
+        </li>
+        <li>
+          <p>
+            Override the <strong>creation date and time</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source>userAgent.setCreationDate(new Date());</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>title</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source>userAgent.setTitle("Invoice No 138716847");</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>keywords</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source>userAgent.setKeywords("XML XSL-FO");</source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>target resolution</strong> for the document. This is used to 
+            specify the output resolution for bitmap images generated by bitmap renderers 
+            (such as the TIFF renderer) and by bitmaps generated by Apache Batik for filter 
+            effects and such. Default: 72 dpi. Example:
+          </p>
+          <source>userAgent.setTargetResolution(300); // =300dpi (dots/pixels per Inch)</source>
+        </li>
+        <li>
+          <p>
+            Set <strong>your own Renderer instance</strong>. If you want to supply your own renderer or 
+            configure a Renderer in a special way you can give the instance to the FOUserAgent. Normally,
+            the Renderer instance is created by FOP. Example:
+          </p>
+          <source>userAgent.setRendererOverride(myRenderer); // myRenderer is an org.apache.fop.render.Renderer</source>
+        </li>
+        <li>
+          <p>
+            Set <strong>your own FOEventHandler instance</strong>. If you want to supply your own FOEventHandler or 
+            configure an FOEventHandler subclass in a special way you can give the instance to the FOUserAgent. Normally, 
+            the FOEventHandler instance is created by FOP. Example:
+          </p>
+          <source>userAgent.setFOEventHandlerOverride(myFOEventHandler); // myFOEventHandler is an org.apache.fop.fo.FOEventHandler</source>
+        </li>
+        <li>
+          <p>
+            Set a <strong>URIResolver</strong> for custom URI resolution. By supplying a JAXP URIResolver you can add
+            custom URI resolution functionality to FOP. For example, you can use 
+            <a href="ext:xml.apache.org/commons/resolver">Apache XML Commons Resolver</a> to make use of XCatalogs. Example:
+          </p>
+          <source>userAgent.setURIResolver(myResolver); // myResolver is a javax.xml.transform.URIResolver</source>
+          <note>
+            Both the FopFactory and the FOUserAgent have a method to set a URIResolver. The URIResolver on the FOUserAgent is
+            used for resolving URIs which are document-related. If it's not set or cannot resolve a URI, the URIResolver
+            from the FopFactory is used.
+          </note>
+        </li>
+      </ul>
+      <note>
+        You should not reuse an FOUserAgent instance between FOP rendering runs although you can. Especially
+        in multi-threaded environment, this is a bad idea.
+      </note>
+    </section>
+  </section>
+  <section id="config-external">
+    <title>Using a Configuration File</title>
+    <p>
+      Instead of setting the parameters manually in code as shown above you can also set 
+      many values from an XML configuration file:
+    </p>
+    <source><![CDATA[
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
+/*..*/
+
+DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
+Configuration cfg = cfgBuilder.buildFromFile(new File("C:/Temp/mycfg.xml"));
+fopFactory.setUserConfig(cfg);
+
+/* ..or.. */
+
+fopFactory.setUserConfig(new File("C:/Temp/mycfg.xml"));]]></source>
+    <p>
+      The layout of the configuration file is described on the <a href="configuration.html">Configuration page</a>.
+    </p>
+  </section>
+  <section id="hints">
+    <title>Hints</title>
+    <section id="object-reuse">
+      <title>Object reuse</title>
+      <p>
+        Fop instances shouldn't (and can't) be reused. Please recreate
+        Fop and FOUserAgent instances for each rendering run using the FopFactory.
+        This is a cheap operation as all reusable information is held in the 
+        FopFactory. That's why it's so important to reuse the FopFactory instance.
+     </p>
+    </section>
+    <section id="awt">
+      <title>AWT issues</title>
+      <p>
+        If your XSL-FO files contain SVG then Apache Batik will be used. When Batik is
+        initialised it uses certain classes in <code>java.awt</code> that
+        intialise the Java AWT classes. This means that a daemon thread
+        is created by the JVM and on Unix it will need to connect to a
+        DISPLAY.
+      </p>
+      <p>
+        The thread means that the Java application may not automatically quit
+        when finished, you will need to call <code>System.exit()</code>. These
+        issues should be fixed in the JDK 1.4.
+      </p>
+      <p>
+        If you run into trouble running FOP on a head-less server, please see the
+        <a href="graphics.html#batik">notes on Batik</a>.
+      </p>
+    </section>
+    <section id="render-info">
+      <title>Getting information on the rendering process</title>
+      <p>
+        To get the number of pages that were rendered by FOP you can call 
+        <code>Fop.getResults()</code>. This returns a <code>FormattingResults</code> object 
+        where you can look up the number of pages produced. It also gives you the 
+        page-sequences that were produced along with their id attribute and their 
+        numbers of pages. This is particularly useful if you render multiple 
+        documents (each enclosed by a page-sequence) and have to know the number of 
+        pages of each document.
+      </p>
+    </section>
+  </section>
+  <section id="performance">
+    <title>Improving performance</title>
+    <p>
+      There are several options to consider:
+    </p>
+    <ul>
+      <li>
+        Whenever possible, try to use SAX to couple the individual components involved 
+        (parser, XSL transformer, SQL datasource etc.).
+      </li>
+      <li>
+        Depending on the target OutputStream (in case of a FileOutputStream, but not 
+        for a ByteArrayOutputStream, for example) it may improve performance considerably 
+        if you buffer the OutputStream using a BufferedOutputStream: 
+        <code>out = new java.io.BufferedOutputStream(out);</code>
+        <br/>
+        Make sure you properly close the OutputStream when FOP is finished.
+      </li>
+      <li>
+        Cache the stylesheet. If you use the same stylesheet multiple times 
+        you can set up a JAXP <code>Templates</code> object and reuse it each time you do
+        the XSL transformation.  (More information can be found
+        <a class="fork" href="http://www.javaworld.com/javaworld/jw-05-2003/jw-0502-xsl.html">here</a>.)
+      </li>
+      <li>
+        Use an XSLT compiler like <a class="fork" href="http://xml.apache.org/xalan-j/xsltc_usage.html">XSLTC</a>
+        that comes with Xalan-J.
+      </li>
+      <li>
+        Fine-tune your stylesheet to make the XSLT process more efficient and to create XSL-FO that can
+        be processed by FOP more efficiently. Less is more: Try to make use of property inheritance where possible.
+      </li>
+    </ul>
+  </section>
+  <section id="multithreading">
+    <title>Multithreading FOP</title>
+    <p>
+      Apache FOP may currently not be completely thread safe.
+      The code has not been fully tested for multi-threading issues, yet.
+      If you encounter any suspicious behaviour, please notify us.
+    </p>
+    <p>
+      There is also a known issue with fonts being jumbled between threads when using 
+      the Java2D/AWT renderer (which is used by the -awt and -print output options).
+      In general, you cannot safely run multiple threads through the AWT renderer.
+    </p>
+  </section>
+<section id="examples">
+  <title>Examples</title>
+  <p>
+   The directory "{fop-dir}/examples/embedding" contains several working examples. 
+  </p>
+  <section id="ExampleFO2PDF">
+    <title>ExampleFO2PDF.java</title>
+    <p>This
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java?view=markup">
+            example</a>
+demonstrates the basic usage pattern to transform an XSL-FO
+file to PDF using FOP.
+    </p>
+    <figure src="images/EmbeddingExampleFO2PDF.png" alt="Example XSL-FO to PDF"/>
+  </section>
+  <section id="ExampleXML2FO">
+    <title>ExampleXML2FO.java</title>
+    <p>This 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2FO.java?view=markup">
+            example</a>
+has nothing to do with FOP. It is there to show you how an XML 
+file can be converted to XSL-FO using XSLT. The JAXP API is used to do the
+transformation. Make sure you've got a JAXP-compliant XSLT processor in your 
+classpath (ex. <a href="http://xml.apache.org/xalan-j">Xalan</a>).
+    </p>
+    <figure src="images/EmbeddingExampleXML2FO.png" alt="Example XML to XSL-FO"/>
+  </section>
+  <section id="ExampleXML2PDF">
+    <title>ExampleXML2PDF.java</title>
+    <p>This 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java?view=markup">
+        example</a>
+demonstrates how you can convert an arbitrary XML file to PDF 
+using XSLT and XSL-FO/FOP. It is a combination of the first two examples 
+above. The example uses JAXP to transform the XML file to XSL-FO and FOP to 
+transform the XSL-FO to PDF.
+    </p>
+    <figure src="images/EmbeddingExampleXML2PDF.png" alt="Example XML to PDF (via XSL-FO)"/>
+    <p>
+The output (XSL-FO) from the XSL transformation is piped through to FOP using 
+SAX events. This is the most efficient way to do this because the 
+intermediate result doesn't have to be saved somewhere. Often, novice users 
+save the intermediate result in a file, a byte array or a DOM tree. We 
+strongly discourage you to do this if it isn't absolutely necessary. The 
+performance is significantly higher with SAX.
+    </p>
+  </section>
+  <section id="ExampleObj2XML">
+    <title>ExampleObj2XML.java</title>
+    <p>This 
+    <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2XML.java?view=markup">
+        example</a>
+is a preparatory example for the next one. It's an example that 
+shows how an arbitrary Java object can be converted to XML. It's an often 
+needed task to do this. Often people create a DOM tree from a Java object and 
+use that. This is pretty straightforward. The example here, however, shows how
+to do this using SAX, which will probably be faster and not even more 
+complicated once you know how this works.
+    </p>
+    <figure src="images/EmbeddingExampleObj2XML.png" alt="Example Java object to XML"/>
+    <p>
+For this example we've created two classes: ProjectTeam and ProjectMember 
+(found in xml-fop/examples/embedding/java/embedding/model). They represent 
+the same data structure found in 
+xml-fop/examples/embedding/xml/xml/projectteam.xml. We want to serialize to XML a 
+project team with several members which exist as Java objects. 
+Therefore we created the two classes: ProjectTeamInputSource and 
+ProjectTeamXMLReader (in the same place as ProjectTeam above).
+    </p>
+    <p>
+The XMLReader implementation (regard it as a special kind of XML parser) is 
+responsible for creating SAX events from the Java object. The InputSource 
+class is only used to hold the ProjectTeam object to be used.
+    </p>
+    <p>
+Have a look at the source of ExampleObj2XML.java to find out how this is 
+used. For more detailed information see other resources on JAXP (ex. 
+<a class="fork" href="http://java.sun.com/xml/jaxp/dist/1.1/docs/tutorial/xslt/3_generate.html">An older JAXP tutorial</a>).
+    </p>
+  </section>
+  <section id="ExampleObj2PDF">
+    <title>ExampleObj2PDF.java</title>
+    <p>This 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java?view=markup">
+            example</a>
+combines the previous and the third to demonstrate 
+how you can transform a Java object to a PDF directly in one smooth run
+by generating SAX events from the Java object that get fed to an XSL 
+transformation. The result of the transformation is then converted to PDF 
+using FOP as before.
+    </p>
+    <figure src="images/EmbeddingExampleObj2PDF.png" alt="Example Java object to PDF (via XML and XSL-FO)"/>
+  </section>
+  <section id="ExampleDOM2PDF">
+    <title>ExampleDOM2PDF.java</title>
+    <p>This 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java?view=markup">
+            example</a>
+has FOP use a DOMSource instead of a StreamSource in order to 
+use a DOM tree as input for an XSL transformation.
+    </p>
+  </section>
+  <section id="ExampleSVG2PDF">
+    <title>ExampleSVG2PDF.java (PDF Transcoder example)</title>
+    <p>This 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleSVG2PDF.java?view=markup">
+            example</a>
+shows the usage of the PDF Transcoder, a sub-application within FOP.  
+It is used to generate a PDF document from an SVG file.
+    </p>
+  </section>
+  <section id="example-notes">
+    <title>Final notes</title>
+    <p>
+These examples should give you an idea of what's possible. It should be easy 
+to adjust these examples to your needs. Also, if you have other examples that you
+think should be added here, please let us know via either the fop-users or fop-dev
+mailing lists.  Finally, for more help please send your questions to the fop-users
+mailing list.
+    </p>
+  </section>
+</section>
+  </body>
+</document>
+
diff --git a/src/documentation/content/xdocs/0.20.5/extensions.xml b/src/documentation/content/xdocs/0.94/extensions.xml
index 07b98da89..dd4a79535 100644
--- a/src/documentation/content/xdocs/0.20.5/extensions.xml
+++ b/src/documentation/content/xdocs/0.94/extensions.xml
@@ -16,60 +16,55 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Standard FOP Extensions</title>
     <version>$Revision$</version>
   </header>
   <body>
-    <p>By "extension", we mean any data that can be placed in the input XML document that is not addressed by the XSL-FO standard.
-By having a mechanism for supporting extensions, FOP is able to add features that are not covered in the specification.</p>
-      <p>The extensions documented here are included with FOP, and are automatically available to you. If you wish to add an extension of your own to FOP, please see the <link href="../dev/extensions.html">Developers' Extension Page</link>.</p>
-    <note>All extensions required the correct use of an appropriate namespace in your input document.</note>
-      <section id="svg">
-        <title>SVG</title>
-        <p>
-Please see the <link href="graphics.html#svg">SVG documentation</link> for more details.
-        </p>
-      </section>
+    <p>
+      By "extension", we mean any data that can be placed in the input XML document that 
+      is not addressed by the XSL-FO standard.
+      By having a mechanism for supporting extensions, FOP is able to add features that 
+      are not covered in the specification.
+    </p>
+    <p>
+      The extensions documented here are included with FOP, and are automatically available 
+      to you. If you wish to add an extension of your own to FOP, please see the 
+      <a href="../dev/extensions.html">Developers' Extension Page</a>.
+    </p>
+    <note>All extensions require the correct use of an appropriate namespace in your input document.</note>
+    <section id="svg">
+      <title>SVG</title>
+      <p>
+        Please see the <a href="graphics.html#svg">SVG documentation</a> for more details.
+      </p>
+    </section>
     <section id="fo-extensions">
       <title>FO Extensions</title>
       <section id="fox-namespace">
         <title>Namespace</title>
-        <p>By convention, FO extensions in FOP use the "fox:" namespace identifier.
-To use any of the FO extensions, add a namespace entry for http://xml.apache.org/fop/extensions
-to the root element:</p>
-<source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
-               xmlns:fox="http://xml.apache.org/fop/extensions">]]></source>
+        <p>
+          By convention, FO extensions in FOP use the "fox" namespace prefix.
+          To use any of the FO extensions, add a namespace entry for 
+          <code>http://xml.apache.org/fop/extensions</code> to the root element:
+        </p>
+        <source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+               xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
       </section>
       <section id="bookmarks">
         <title>PDF Bookmarks</title>
         <p>
-You can provide outlines inside the root object (but outside any
-page-sequences or other formatting objects). Here's an example of an outline
-entry:
-        </p>
-        <source>
-<![CDATA[<fox:outline internal-destination="sec3">
-    <fox:label>Running FOP</fox:label>
-
-    <fox:outline internal-destination="sec3-1">
-      <fox:label>Prerequisites</fox:label>
-    </fox:outline>
-  </fox:outline>
-</fo:root>]]></source>
-        <p>
-It works similarly to a basic-link. There is also an external-destination
-property, but it isn't supported currently. See the pdfoutline.fo file in
-examples/fo/basic for a more complete example.
+          In previous versions of Apache FOP there was a <code>fox:outline</code> element
+          which was used to create outlines in PDF files. The redesigned code makes use
+          of the new <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">bookmark feature defined in the latest XSL 1.1 working draft</a>.
         </p>
       </section>
       <section id="named-destinations">
         <title>Anchors or Named Destinations</title>
-        <p>Use the fox:destination element to define "named destinations" inside a PDF document.
+        <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
+        <!--p>Use the fox:destination element to define "named destinations" inside a PDF document.
 These are useful as fragment identifiers, e.g. "http://server/document.pdf#anchor-name".
 fox:destination elements can be placed almost anywhere in the fo document, including a child of
 root, a block-level element, or an inline-level element.
@@ -82,11 +77,12 @@ PDF document. The fox:destination simply gives that view an independent name.
 <fo:block id="table-of-contents">Table of Contents</fo:block>]]></source>
         <warning>It is possible that in some future release of FOP, <em>all </em>elements with
 "id" attributes will generate named-destinations, which will eliminate the need for
-fox:destination.</warning>
+fox:destination.</warning-->
       </section>
       <section id="table-continue-label">
         <title>Table Continuation Label</title>
-        <p>Use the fox:continued-label element to create content in table-header and
+        <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
+        <!--p>Use the fox:continued-label element to create content in table-header and
 table-footer cells that will appear only on pages after the first page that the table
 appears. fox:continued-label is itself inline content, and is a container of fo:inline
 content. This content will be laid out only if the table does not fit on a single page and flows
@@ -102,7 +98,22 @@ to following pages. Here is an example of FO code creating such a table-header:<
       <fo:block>Header column 2 with no continued label</fo:block>
     </fo:table-cell>
   </fo:table-row>
-</fo:table-header>]]></source>
+</fo:table-header>]]></source-->
+      </section>
+      <section id="widow-orphan-content-limit">
+        <title>fox:orphan-content-limit and fox:widow-content-limit</title>
+        <p>
+          The two proprietary extension properties, fox:orphan-content-limit and
+          fox:widow-content-limit, are used to improve the layout of list-blocks and tables.
+          If you have a table with many entries, you don't want a single row to be left over
+          on a page. You will want to make sure that at least two or three lines are kept
+          together. The properties take an absolute length which specifies the area at the
+          beginning (fox:widow-content-limit) or at the end (fox:orphan-content-limit) of a
+          table or list-block. The properties are inherited and only have an effect on fo:table
+          and fo:list-block. An example: fox:widow-content-limit="3 * 1.2em" would make sure
+          the you'll have at least three lines (assuming line-height="1.2") together on a table
+          or list-block.
+        </p>
       </section>
     </section>
   </body>
diff --git a/src/documentation/content/xdocs/0.20.5/fonts.xml b/src/documentation/content/xdocs/0.94/fonts.xml
index 9b5991626..f60dad000 100644
--- a/src/documentation/content/xdocs/0.20.5/fonts.xml
+++ b/src/documentation/content/xdocs/0.94/fonts.xml
@@ -16,20 +16,25 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>FOP: Fonts</title>
+    <title>Apache FOP: Fonts</title>
     <version>$Revision$</version>
     <authors>
       <person name="Jeremias Märki" email=""/>
       <person name="Tore Engvig" email=""/>
+      <person name="Adrian Cumiskey" email=""/>
     </authors>
   </header>
   <body>
     <section id="intro">
       <title>Summary</title>
+      <note>The FOP Font subsystem is currently undergoing a significant change.
+        The details provided here especially related to the generation of FOP Font
+        Metrics files and the FOP Font configuration are likely to change substantially
+        in the future.
+      </note>
       <p>The following table summarizes the font capabilities of the various FOP renderers:</p>
       <table>
         <tr>
@@ -51,15 +56,15 @@
           <td>yes</td>
           <td>no</td>
           <td>yes</td>
-          <td>no</td>
+          <td>yes</td>
         </tr>
-        <tr>
+        <!--tr> NOT AVAILABLE YET!!!
           <td>PCL</td>
           <td>yes (modified)</td>
           <td>no</td>
           <td>no</td>
           <td>no</td>
-        </tr>
+        </tr-->
         <tr>
           <td>TXT</td>
           <td>yes (used for layout but not for output)</td>
@@ -124,21 +129,26 @@
       <p>Support for custom fonts is added by creating font metric files (written in XML) from the actual font files, and registering them with FOP. Currently only Type 1 and TrueType fonts can be added.
 More information about fonts can be found at:</p>
       <ul>
-        <li><link href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</link></li>
-        <li><link href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</link>
-</li>
+        <li><a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a></li>
+        <li><a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a></li>
       </ul>
       <section id="type1-metrics">
         <title>Type 1 Font Metrics</title>
         <p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it.
 To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
-        <p>Windows:</p>
-        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\xml-apis.jar;
-         lib\xercesImpl.jar;lib\xalan.jar
+        <p>Windows (on JDK 1.4 and later):</p>
+        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
+           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
+        <p>Windows (on JDK 1.3.x):</p>
+        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar;lib\xml-apis.jar;
+         lib\xercesImpl.jar;lib\xalan.jar;lib\serializer.jar
+           org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
+        <p>Unix (on JDK 1.4 and later):</p>
+        <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
            org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
-        <p>Unix:</p>
-        <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/xml-apis.jar:
-         lib/xercesImpl.jar:lib/xalan.jar
+        <p>Unix (on JDK 1.3.1):</p>
+        <source>java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar:lib/xml-apis.jar:
+         lib/xercesImpl.jar:lib/xalan.jar:lib/serializer.jar
            org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file</source>
         <p>PFMReader [options]:</p>
         <ul>
@@ -150,8 +160,7 @@ name.</li>
         </ul>
         <note>The classpath in the above example has been simplified for readability.
 You will have to adjust the classpath to the names of the actual JAR files in the lib directory.
-avalon-framework.jar is necessary only for versions 0.20.5 or later.
-xml-apis.jar, xercesImpl.jar and xalan.jar are not necessary for JDK version 1.4 or later.</note>
+xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.</note>
         <note>The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values.
 FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file.
 The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually.
@@ -162,8 +171,7 @@ The constructed values however appear to have no visible influence.</note>
         <p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it.
 Use it in a similar manner to PFMReader.
 For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:</p>
-        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\xml-apis.jar;
-         lib\xercesImpl.jar;lib\xalan.jar
+        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
            org.apache.fop.fonts.apps.TTFReader [options]
              C:\myfonts\cmr10.ttf ttfcm.xml</source>
         <p>TTFReader [options]:</p>
@@ -201,16 +209,18 @@ will produce incorrect results.</td>
           <tr>
             <td>Character Display</td>
             <td>Correct.</td>
-            <td>Correct if and only if the font is embedded in the output. (This is possible
-because, although the underlying characters are encoded incorrectly, the embedded font is
-also encoded incorrectly).</td>
+            <td>Correct, but copy/paste won't work in Acrobat Reader. (FOP currently doesn't emit the /ToUnicode table which is necessary for copy/paste to work.)</td>
+          </tr>
+          <tr>
+            <td>Embedding the Font</td>
+            <td>Optional.</td>
+            <td>Mandatory. Not embedding the font produces invalid PDF documents.</td>
           </tr>
         </table>
-        <warning id="cid-keyed-encoding-ttf">As shown in the above table, regardless of
-whether the font is embedded or not, text generated from a CID-keyed font metrics file
-will <em>never </em>be encoded properly.
-Further, if the related font is not embedded, it cannot even be displayed properly.
-Obviously, this behavior is not desirable, and we hope to correct it in upcoming releases.</warning>
+        <warning>
+          You may experience failures with certain TrueType fonts, especially if they don't contain 
+          the so-called "cmap" table. TTFReader can currently not deal with font like this.
+        </warning>
       </section>
       <section id="truetype-collections-metrics">
         <title>TrueType Collections Font Metrics</title>
@@ -219,44 +229,105 @@ To create metrics files for these fonts, you must specify which font in the coll
         <p>To get a list of the fonts in a collection, just start the TTFReader as if it were a normal TrueType file (without the -ttcname option).
 It will display all of the font names and exit with an Exception.</p>
         <p>Here is an example of generating a metrics file for a .ttc file:</p>
-        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\xml-apis.jar;
-         lib\xercesImpl.jar;lib\xalan.jar
+        <source>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
            org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
              msmincho.ttc msminch.xml</source>
       </section>
       <section id="register">
-        <title>Register Fonts with FOP</title>
-        <p>You must tell FOP how to find and use the font metrics files by registering them in the <link href="configuration.html">FOP Configuration</link>. Add entries for your custom fonts, regardless of font type, to the configuration file in a manner similar to the following:</p>
-        <source><![CDATA[<font metrics-file="FTL_____.xml" kerning="yes"
-      embed-file="C:\myfonts\FTL_____.pfb">
-  <font-triplet name="FrutigerLight" style="normal" weight="normal"/>
-</font>]]></source>
-        <note>Review the documentation for <link href="configuration.html">FOP Configuration</link> for instructions on making the FOP configuration available to FOP when it runs. Otherwise, FOP has no way of finding your custom font information.</note>
+        <title>Register Fonts with FOP - Auto-Detect Fonts</title>
+        <p>You must tell FOP how to find and use the font metrics files by registering them in the <a href="configuration.html">FOP Configuration</a>. Add entries for your custom fonts, regardless of font type, to the configuration file in a manner similar to the following:</p>
+        <source><![CDATA[
+<fonts>
+  <!-- register a particular font -->
+  <font metrics-url="file:///C:/myfonts/FTL_____.xml" kerning="yes"
+      embed-url="file:///C:/myfonts/FTL_____.pfb">
+     <font-triplet name="FrutigerLight" style="normal" weight="normal"/>
+  </font>
+  
+  <!-- register all the fonts found in a directory -->
+  <directory>C:\MyFonts1</directory>
+  
+  <!-- register all the fonts found in a directory
+       and all of its sub directories (use with care) -->
+  <directory recursive="true">C:\MyFonts2</directory>
+
+  <!-- automatically detect operating system installed fonts -->
+  <auto-detect/>  
+</fonts>]]></source>
+        <note>
+          Review the documentation for <a href="configuration.html">FOP Configuration</a> for
+          instructions on making the FOP configuration available to FOP when it runs. Otherwise,
+          FOP has no way of finding your custom font information.
+        </note>
+        The Unix autodetect feature looks in the following locations for fonts it can use:
         <ul>
-          <li>Starting with FOP version 0.20.5 you can use URLs for the paths to the font files.
-Relative URLs are resolved relative to the fontBaseDir property (or baseDir) if available. See <link href="configuration.html">FOP: Configuration</link> for more information.</li>
-          <li>The "kerning" and "embed-file" attributes are optional. Kerning is currently not used at all. If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
-          <li>When setting the embed-file attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
+          <li><code>java user.home + "/.fonts"</code></li>
+          <li><code>"/usr/local/fonts"</code></li>
+          <li><code>"/usr/share/fonts"</code></li>
+          <li><code>"/usr/X11R6/lib/X11/fonts"</code></li>
         </ul>
-        <note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note>
+        <ul>
+          <li>
+            URLs are used to access the font metric and font files.
+            Relative URLs are resolved relative to the font-base property (or base) if available.
+            See <a href="configuration.html">FOP: Configuration</a> for more information.
+          </li>
+          <li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
+          <li>The font "kerning" attribute is optional.</li>
+          <li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
+          <li>When setting the "embed-url" attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
+          <li>The fonts "directory" tag can be used to register fonts contained within a single or list of directory paths.  The "recursive" attribute can be specified to recursively add fonts from all sub directories.</li>
+          <li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.</li>
+          <li>Fonts registered with "font" tag configurations override fonts found by means of "directory" tag definitions.</li>
+          <li>Fonts found as a result of a "directory" tag configuration override fonts found as a result of the "auto-detect" tag being specified.</li>
+          <li>
+            If relative URLs are specified, they are evaluated relative to the value of the 
+            "font-base" setting. If there is no "font-base" setting, the fonts are evaluated 
+            relative to the base directory.
+          </li>
+        </ul>
+        <!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
       </section>
       <section id="embedding">
         <title>Embedding</title>
-        <note>The PostScript renderer does not yet support font embedding.</note>
+        <note>The PostScript renderer does not yet support TrueType fonts, but can embed Type 1 fonts.</note>
         <note>The font is simply embedded into the PDF file, it is not converted.</note>
-        <p>Font embedding is enabled in the userconfig.xml file and controlled by the embed-file attribute.
-If you don't specify the embed-file attribute the font will not be embedded, but will only be referenced.</p>
+        <p>Font embedding is enabled in the userconfig.xml file and controlled by the embed-url attribute.
+If you don't specify the embed-url attribute the font will not be embedded, but will only be referenced.</p>
+        <warning>
+          Omitting the embed-url attribute for CID-encoded TrueType fonts will currently produce invalid 
+          PDF files! If you create the XML font metric file using the "-enc ansi" option, you can omit 
+          the embed-url attribute for TrueType fonts but you're restricted to the WinAnsi character set.
+        </warning>
         <p>When FOP embeds a font, it adds a prefix to the fontname to ensure that the name will not match the fontname of an installed font.
 This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</p>
         <p>When embedding PostScript fonts, the entire font is always embedded.</p>
-        <p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the original font, containing only the glyphs used, is embedded in the output document.
-Currently, this embedded font contains only the minimum data needed to be embedded in a pdf document, and does not contain any codepage information.
-The PDF document contains indexes to the glyphs in the font instead of to encoded characters.
-While the document will be displayed correctly, the net effect of this is that searching, indexing, and cut-and-paste will not work properly.</p>
-        <p>One workaround for this behavior is to use the "-enc ansi" option when generating metrics with TTFReader.
-This will cause the whole font to be embedded in the pdf document.
-Characters will be WinAnsi encoded (as specified in the PDF spec), so you lose the ability to use characters from other character sets.
-See <link href="#ttf-encoding">Table of TTF Encoding Options</link> for more details.</p>
+        <p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
+          original font, containing only the glyphs used, is embedded in the output document.</p>
+      </section>
+      <section id="embedding-base14">
+        <title>Explicitly embedding the base 14 fonts</title>
+        <p>
+          There are cases where you might want to force the embedding of one or more of the base 14 fonts that
+          can normally be considered available on the target platform (viewer, printer). One of these cases is
+          PDF/A which mandates the embedding of even the base 14 fonts. Embedding a font such as Helvetica or
+          Courier is straight-forward. The "Symbol" and "ZapfDingbats" fonts, however, currently present a 
+          problem because FOP cannot correctly determine the encoding of these two single-byte fonts through
+          the PFM file. FOP now correctly interprets the "encoding" value in the XML font metrics file, but the
+          PFMReader application writes "UnknownEncoding" to the generated XML file. In order to embed "Symbol"
+          and "ZapfDingbats" you have to manually change the XML font metrics file and specify "SymbolEncoding"
+          or "ZapfdingbatsEncoding" encoding respectively as the value for the "encoding" element.
+        </p>
+        <p>Example:</p>
+        <source><![CDATA[
+<?xml version="1.0" encoding="UTF-8"?>
+<font-metrics type="TYPE1">
+  <font-name>Symbol</font-name>
+  <embed/>
+  <encoding>SymbolEncoding</encoding>
+  <cap-height>673</cap-height>
+  <x-height>766</x-height>
+  [..]]]></source>
       </section>
     </section>
   </body>
diff --git a/src/documentation/content/xdocs/0.94/fotree/disabled-testcases.xml b/src/documentation/content/xdocs/0.94/fotree/disabled-testcases.xml
new file mode 100644
index 000000000..196eafcc4
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/fotree/disabled-testcases.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<disabled-testcases>
+  <testcase>
+    <name>demo test failure</name>
+    <file>demo-test-failure.fo</file>
+    <description></description>
+  </testcase>
+  <testcase>
+    <name>Markers and core function evaluation</name>
+    <file>from-table-column_marker.fo</file>
+    <description>The code currently evaluates this function according to the column in which the 
+    marker appears in the source document, rather than the column it is retrieved in.</description>
+  </testcase>
+</disabled-testcases>
diff --git a/src/documentation/content/xdocs/0.94/graphics.xml b/src/documentation/content/xdocs/0.94/graphics.xml
new file mode 100644
index 000000000..164069733
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/graphics.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Apache FOP: Graphics Formats</title>
+    <version>$Revision$</version>
+  </header>
+  <body>
+    <section id="support-overview">
+      <title>Overview of Graphics Support</title>
+      <p>
+        The table below summarizes the <em>theoretical</em> support for graphical formats within FOP. In other words, within the constraints of the limitations listed here, these formats <em>should</em> work. However, many of them have not been tested, and there may be limitations that have not yet been discovered or documented. The packages needed to support some formats are not included in the FOP distribution and must be installed separately. Follow the links in the "Support Thru" column for more details.
+      </p>
+      <table>
+        <tr>
+          <th>Format</th>
+          <th>Type</th>
+          <th><a href="#native">FOP native support</a></th>
+          <th><a href="#batik">Batik SVG</a></th>
+          <th><a href="#batik-codecs">Batik codecs</a></th>
+          <th><a href="#imageio">Image I/O</a></th>
+          <th><a href="#jai">JAI</a></th>
+          <th><a href="#jimi">JIMI</a></th>
+        </tr>
+        <tr>
+          <td><a href="#bmp">BMP</a> (Microsoft Windows Bitmap)</td>
+          <td>bitmap</td>
+          <td>X</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td><a href="#eps">EPS</a> (Encapsulated PostScript)</td>
+          <td>metafile (both bitmap and vector), probably most frequently used for vector drawings</td>
+          <td>(X)</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>GIF (Graphics Interchange Format)</td>
+          <td>bitmap</td>
+          <td>X</td>
+          <td></td>
+          <td></td>
+          <td>X</td>
+          <td>X</td>
+          <td>X</td>
+        </tr>
+        <tr>
+          <td><a href="#jpeg">JPEG</a> (Joint Photographic Experts Group)</td>
+          <td>bitmap</td>
+          <td>(X)</td>
+          <td></td>
+          <td></td>
+          <td>X</td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td><a href="#png">PNG</a> (Portable Network Graphic)</td>
+          <td>bitmap</td>
+          <td></td>
+          <td></td>
+          <td>X</td>
+          <td>X</td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td><a href="#svg">SVG</a> (Scalable Vector Graphics)</td>
+          <td>vector (with embedded bitmaps)</td>
+          <td></td>
+          <td>X</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td><a href="#tiff">TIFF</a> (Tag Image Format File)</td>
+          <td>bitmap</td>
+          <td>(X)</td>
+          <td></td>
+          <td>X</td>
+          <td>X</td>
+          <td>X</td>
+          <td></td>
+          <!--td><a href="#native">FOP native</a> or <a href="#jai">JAI</a>, depending on the subformat. See <a href="#tiff">TIFF</a> for more details.(JIMI also supports TIFF, but this has not been implemented within FOP).</td-->
+        </tr>
+        <tr>
+          <td><a href="#emf">EMF</a> (Windows Enhanced Metafile)</td>
+          <td>vector (with embedded bitmaps)</td>
+          <td>(X)</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+      </table>
+      <note>"(X)" means restricted support. Please see the details below.</note>
+    </section>
+    <section id="packages">
+      <title>Graphics Packages</title>
+      <section id="native">
+        <title>FOP Native</title>
+        <p>
+          FOP has native ability to handle some graphic file formats.
+        </p>
+      </section>
+      <section id="batik-codecs">
+        <title>"Internal" codecs</title>
+        <p>
+          Apache XML Graphics Commons contains codecs for PNG and TIFF access. FOP can use these.
+        </p>
+      </section>
+      <section id="imageio">
+        <title>Image I/O (JDK 1.4 or higher)</title>
+        <p>
+          For JDKs 1.4 or higher, FOP provides a wrapper to load images through the 
+          <a class="fork" href="http://java.sun.com/j2se/1.4.2/docs/guide/imageio/index.html">JDK's Image I/O API</a> (JSR 015).
+          Image I/O allows to dynamically add additional image codecs. An example of such an add-on library are the
+          <a class="fork" href="http://java.sun.com/products/java-media/jai/">JAI Image I/O Tools</a> available from Sun.
+        </p>
+      </section>
+      <section id="jimi">
+        <title>JIMI</title>
+        <p>
+          Because of licensing issues, the JIMI image library is not included in the FOP distribution. First, <a class="fork" href="http://java.sun.com/products/jimi">download</a> and install it.
+Then, copy the file "JimiProClasses.zip" from the archive to {fop-install-dir}/lib/jimi-1.0.jar. Please note that FOP binary distributions are compiled with JIMI support, so there is no need for you to build FOP to add the support. If jimi-1.0.jar is installed in the right place, it will automatically be used by FOP, otherwise it will not.
+        </p>
+      </section>
+      <section id="jai">
+        <title>JAI (Java Advanced Imaging API)</title>
+        <p>
+          FOP has been compiled with JAI support, but JAI is not included in the FOP distribution.
+To use it, install <a href="http://java.sun.com/products/java-media/jai">JAI</a>, then copy the jai_core.jar and the jai_codec.jar files to {fop-install-dir}/lib.
+JAI is much faster than JIMI, but is not available for all platforms. See <a href="http://java.sun.com/products/java-media/jai/forDevelopers/jaifaq.html#platforms">What platforms are supported?</a> on the JAI FAQ page for more details.
+        </p>
+      </section>
+      <section id="batik">
+        <title>Apache Batik</title>
+        <p>Current FOP distributions include a distribution of the Apache <a class="fork" href="ext:batik">Batik</a> version 1.6.
+It is automatically installed with FOP.
+Because Batik's API changes frequently, it is highly recommended that you use the version that ships with FOP, at least when running FOP.</p>
+        <warning>Batik must be run in a graphical environment.</warning>
+        <p>Batik must be run in a graphical environment.
+It uses AWT classes for rendering SVG, which in turn require an X server on Unixish systems.
+If you run a server without X, or if you can't connect to the X server due to security restrictions or policies (a so-called "headless" environment), SVG rendering will fail.</p>
+        <p>Here are some workarounds:</p>
+        <ul>
+          <li>If you are using JDK 1.4, start it with the <code>-Djava.awt.headless=true</code> command line option.</li>
+          <li>Install an X server which provides an in-memory framebuffer without actually using a screen device or any display hardware. One example is Xvfb.</li>
+          <li>Install a toolkit which emulates AWT without the need for an underlying X server. One example is the <a href="http://www.eteks.com/pja/en">PJA toolkit</a>, which is free and comes with detailed installation instructions.</li>
+        </ul>
+      </section>
+    </section>
+    <section id="bmp">
+      <title>BMP</title>
+      <p>FOP native support for BMP images is limited to the RGB color-space.</p>
+    </section>
+    <section id="eps">
+      <title>EPS</title>
+      <p>FOP provides support for two output targets:</p>
+      <ul>
+        <li>PostScript (full support).</li>
+        <li>
+          PDF (partial support). Due to the lack of a built-in PostScript interpreter, FOP 
+          can only embed the EPS file into the PDF. Acrobat Reader will not currently display 
+          the EPS (it doesn't have a PostScript interpreter, either) but it will be shown 
+          correctly when you print the PDF on a PostScript-capable printer. PostScript devices 
+          (including GhostScript) will render the EPS correctly.
+        </li>
+      </ul>
+      <warning>
+        Please note that the EPS embedding feature has been <strong>deprecated</strong> in the
+        PDF specification version 1.4. You should not use this feature anymore, especially 
+        since newer PDF tools don't support embedded EPS files anymore.
+      </warning>
+      <p>
+        Other output targets can't be supported at the moment because
+        FOP lacks a PostScript interpreter. Furthermore, FOP is not able
+        to parse the preview bitmaps sometimes contained in EPS files.
+      </p>
+    </section>
+    <section id="jpeg">
+      <title>JPEG</title>
+      <p>
+        FOP native support of JPEG does not include all variants, especially those containing 
+        unusual color lookup tables and color profiles.
+        If you have trouble with a JPEG image in FOP, try opening it with an image processing 
+        program (such as Photoshop or Gimp) and then saving it. Specifying 24-bit color output 
+        may also help. For the PDF and PostScript renderers most JPEG images can be passed 
+        through without decompression. User reports indicate that grayscale, RGB, and 
+        CMYK color-spaces are all rendered properly.
+      </p>
+    </section>
+    <section id="png">
+      <title>PNG</title>
+      <p>
+        If using JAI for PNG support, only RGB and RGBA color-spaces are supported for 
+        FOP rendering.
+      </p>
+      <p>
+        Transparency is supported but not guaranteed to work with every output format.
+      </p>
+    </section>
+    <section id="svg">
+      <title>SVG</title>
+      <section id="svg-intro">
+        <title>Introduction</title>
+        <p>FOP uses <a href="#batik"> Apache Batik</a> for SVG support.
+This format can be handled as an <code>fo:instream-foreign-object</code> or in a separate
+file referenced with <code>fo:external-graphic</code>.</p>
+      <note>   
+Batik's SVG Rasterizer utility may also be used to convert standalone SVG
+documents into PDF.  For more information please see the
+<a href="http://xmlgraphics.apache.org/batik/svgrasterizer.html">SVG Rasterizer documentation</a>
+on the Batik site.
+      </note>
+      </section>
+      <section id="svg-pdf-graphics">
+        <title>Placing SVG Graphics into PDF</title>
+        <p>
+The SVG is rendered into PDF by using PDF commands to draw and fill
+lines and curves. This means that the graphical objects created with
+this remain as vector graphics. The same applies to PostScript output.
+For other output formats the SVG graphic will be converted to a bitmap
+image.
+        </p>
+        <p>
+There are a number of SVG things that cannot be converted directly into
+PDF. Parts of the graphic such as effects, patterns and images are inserted
+into the PDF as a raster graphic. The resolution of these raster images can
+          be controlled through the "target resolution" setting in the 
+          <a href="configuration.html">configuration</a>.</p>
+        <p>
+Currently transparency is limited in PDF so many svg images that
+contain effects or graphics with transparent areas may not be displayed
+correctly.
+        </p>
+      </section>
+      <section id="svg-pdf-text">
+        <title>Placing SVG Text into PDF and PostScript</title>
+        <p>If possible, Batik will use normal PDF or PostScript text when inserting text. It does
+this by checking if the text can be drawn normally and the font is
+supported. This example svg <a href="../dev/svg/text.svg">text.svg</a> /
+<!--link href="../dev/svg/text.pdf"-->text.pdf<!--/link-->
+shows how various types and effects with text are handled.
+Note that tspan and outlined text are not yet implemented.</p>
+        <p>
+Otherwise, text is converted and drawn as a set of shapes by Batik, using the stroking text painter.
+This means that a typical character will
+have about 10 curves (each curve consists of at least 20 characters).
+This can make the output files large and when it is viewed the
+viewer may not normally draw those fine curves very well (In Adobe Acrobat, turning on
+"Smooth Line Art" in the preferences will fix this).
+If the text is inserted into the output file using the inbuilt text commands
+it will use a single character.
+        </p>
+        <p>
+          Note that because SVG text can be rendered as either text or a vector graphic, you 
+          may need to consider settings in your viewer for both. The Acrobat viewer has both 
+          "smooth line art" and "smooth text" settings that may need to be set for SVG images 
+          to be displayed nicely on your screen (see Edit / Preferences / Display).
+          This setting will not affect the printing of your document, which should be OK in 
+          any case, but will only affect the quality of the screen display.</p>
+      </section>
+      <section id="svg-scaling">
+        <title>Scaling</title>
+        <p>
+          Currently, SVG images are rendered with the dimensions specified <em>in the SVG 
+          file</em>, within the viewport specified in the fo:external-graphic element.
+          For everything to work properly, the two should be equal. The SVG standard leaves 
+          this issue as an implementation detail. FOP will probably implement a scaling 
+          mechanism in the future. 
+        </p>
+        <p>
+          If you use pixels to specify the size of an SVG graphic the "source resolution" setting
+          in the <a href="configuration.html">configuration</a> will be used to determine the
+          size of a pixel. The use of pixels to specify sizes is discouraged as they may
+          be interpreted differently in different environments.
+        </p>
+      </section>
+      <section id="svg-problems">
+        <title>Known Problems</title>
+        <ul>
+          <li>
+Soft mask transparency is combined with white so that it looks better
+on pdf 1.3 viewers but this causes the soft mask to be slightly lighter
+or darker on pdf 1.4 viewers.
+          </li>
+          <li>
+There is some problem with a gradient inside a pattern causing a PDF
+error when viewed in acrobat 5.
+          </li>
+          <li>
+Text is not always handled correctly, it may select the wrong font
+especially if characters have multiple fonts in the font list.
+          </li>
+          <li>
+More PDF text handling could be implemented.
+It could draw the string using the attributed character iterator
+to handle tspans and other simple changes of text.
+          </li>
+          <li>
+JPEG images are not inserted directly into the pdf document.
+This area has not been implemented yet since the appropriate
+method in batik is static.
+          </li>
+          <li>
+Uniform transparency for images and other svg elements that are converted
+into a raster graphic are not drawn properly in PDF. The image is opaque.
+          </li>
+        </ul>
+      </section>
+    </section>
+    <section id="tiff">
+      <title>TIFF</title>
+      <p>
+        FOP-native TIFF support is limited to PDF and PostScript output only. Also, 
+        according to user reports, FOP's native support for TIFF is limited to images with the 
+        following characteristics (all must be true for successful rendering):
+      </p>
+      <ul>
+        <li>single channel images (i.e., bi-level and grayscale only)</li>
+        <li>uncompressed images, or images using CCITT T.4, CCITT T.6, or JPEG compression</li>
+        <li>images using white-is-zero encoding in the TIFF PhotometricInterpretation tag</li>
+      </ul>
+      <note>
+        Native support in this case means that the images can be embedded into the output format
+        without decoding it.
+      </note>
+      <p><em>JAI:</em> Supports RGB and RGBA only for FOP rendering.</p>
+    </section>
+    <section id="emf">
+      <title>EMF</title>
+      <p>Windows Enhanced Metafiles (EMF) are only supported in RTF output.</p>
+    </section>
+    <section id="resolution">
+      <title>Graphics Resolution</title>
+      <p>
+        Some bitmapped image file formats store a dots-per-inch (dpi) or other resolution 
+        values. FOP tries to use this resolution information whenever possible to determine
+        the image's intrinsic size. This size is used during the layout process when it is not
+        superceeded by an explicit size on fo:external-graphic (content-width and content-height 
+        properties).
+      </p>
+      <p>
+        Please note that not all images contain resolution information. If it's not available
+        72 dpi is assumed (the default resolution of PDF and PostScript).
+      </p>
+      <p>
+        Bitmap images are generally embedded into the output format at their original resolution
+        (as is). No resampling of the image is performed. Explicit resampling is on our wishlist, 
+        but hasn't been implemented, yet. Bitmaps included in SVG graphics may be resampled to 
+        the resolution specified in the "target resolution" setting in the 
+        <a href="configuration.html">configuration</a> if SVG filters are applied. This can be
+        used as a work-around to resample images in FO documents. 
+      </p>
+    </section>
+    <section id="caching">
+      <title>Image caching</title>
+      <p>
+        FOP caches images between runs. There is one cache per FopFactory instance. The URI is 
+        used as a key to identify images which means that when a particular URI appears again, 
+        the image is taken from the cache. If you have a servlet that generates a different 
+        image each time it is called with the same URL you need to use a constantly 
+        changing dummy parameter on the URL to avoid caching.
+      </p>
+      <p>
+        The image cache has been improved considerably in the redesigned code. Therefore, a 
+        resetCache() method like in earlier versions of FOP has become unnecessary. If you 
+        still experience OutOfMemoryErrors, please notify us.
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/0.20.5/hyphenation.xml b/src/documentation/content/xdocs/0.94/hyphenation.xml
index d18f50961..ed97c6868 100644
--- a/src/documentation/content/xdocs/0.20.5/hyphenation.xml
+++ b/src/documentation/content/xdocs/0.94/hyphenation.xml
@@ -16,11 +16,10 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>FOP: Hyphenation</title>
+    <title>Apache FOP: Hyphenation</title>
     <version>$Revision$</version>
   </header>
   <body>
@@ -29,95 +28,22 @@
     <section id="intro">
       <title>Introduction</title>
       <p>FOP uses Liang's hyphenation algorithm, well known from TeX. It needs
-       language specific patterns and other data for operation.</p>
-      <p>Because of <link href="#license-issues">licensing issues</link> (and for 
+       language specific pattern and other data for operation.</p>
+      <p>Because of <a href="#license-issues">licensing issues</a> (and for 
        convenience), all hyphenation patterns for FOP are made available through 
-       the <fork href="http://offo.sourceforge.net/hyphenation/index.html">Objects For 
-       Formatting Objects</fork> project.</p>
+       the <a class="fork" href="http://offo.sourceforge.net/hyphenation/index.html">Objects For 
+       Formatting Objects</a> project.</p>
       <note>If you have made improvements to an existing FOP hyphenation pattern, 
        or if you have created one from scratch, please consider contributing these 
        to OFFO so that they can benefit other FOP users as well. 
-       Please inquire on the <link href="../maillist.html#fop-user">FOP User
-       mailing list</link>.</note>
-    </section>
-    <section id="using">
-      <title>Using Hyphenation</title>
-      <p>
-        In order to get words hyphenated, hyphenation has to be
-        enabled explicitely (set property hyphenation="true") and a
-        language has to be defined (e.g. language="en"). Optionally, a
-        country can be specified (e.g. country="GB").
-      </p>
-      <p>
-        If hyphenation is requested, at first a serialized instance
-        containing precompiled hyphenation patterns is looked up in
-        the classpath. If only a language is specified, a ressource
-        named <code>hyph/&lt;language>.hyp</code> is loaded. If both
-        language and country are specified, the ressource
-        <code>hyph/&lt;language>_&lt;country>.hyp</code> is looked up,
-        and if this fails, the loader looks also for
-        <code>hyph/&lt;language>.hyp</code>. 
-      </p>
-      <p>
-        If no precompiled patterns are found, FOP tries to load raw
-        patterns from the an XML file name
-        <code>/hyph/&lt;language>.xml</code> respective
-        <code>/hyph/&lt;language>_&lt;country>.xml</code> . The /hyph
-        prefix is hardcoded and can't be configured. Note that this
-        usually constitues an absolute file path. FOP can't load raw
-        patterns from other sources than files.
-      </p>
-      <p>
-        If you think hyphenation is enabled but words aren't
-        hyphenated, check whether FOP finds the relevant hyphenation
-        patterns:
-      </p>
-      <ol>
-        <li>Did you download and install the hyphenation patterns
-        properly? In case you downloaded the files from OFFO, check
-        whether you have downloaded the patterns for the correct FOP
-        version (0.20.5 or the development version), and check whether
-        you followed the installation instructions.</li>
-        <li>Check whether you have spelled the language code and
-        optionally the country code correctly. Note that the country
-        codes are in uppercase, by convention. This matters.</li>
-      </ol>
-      <p>
-        If hyphenation works in general, but specific words aren't
-        hyphenated, or aren't hyphenated as expected, you may have one
-        of the following problems:
-      </p>
-      <ol>
-        <li>The patters contain a bug, or simply wont do as you
-        expect. In order to reduce the amount of patters, they are
-        usually cut some slack.</li>
-        <li>The patterns may be for an unexpected, unofficial or
-        outdated dialect of the language. For example, the turkish
-        patterns were (and maybe still are) made for 17c Osman rather
-        than modern turkish.</li>
-        <li>The word may contain invisible characters which prevent it
-        from being parsed properly from the content stream, or from
-        being properly matched. Examples of such characters are the
-        soft hyphen (U+00AD) and the zero width joiner (U+200D). You
-        have to remove them in order to get the words hyphenated
-        properly. OTOH, you can use them in order to prevent certain
-        (unwanted, spurious or incorrect) hyphenations</li>
-        <li>If the word contains characters which can be composed from
-        other Unicode characters, or vice versa (e.g. U+00E4 "latin
-        small a with diaresis" and U+0061 U+0308 "latin small a"
-        "combining diaresis"), the patterns may just contain the
-        opposite form. FOP doesn't run <link
-        href="http://www.unicode.org/reports/tr15/">Unicode
-        normalization</link> on either the content nor on the
-        patterns. You have no choice but to check which form the
-        patterns use and adapt your FO source.</li>
-      </ol>
+       Please inquire on the <a href="../maillist.html#fop-user">FOP User
+       mailing list</a>.</note>
     </section>
     <section id="license-issues">
       <title>License Issues</title>
       <p>Many of the hyphenation files distributed with TeX and its offspring are
-       licenced under the <fork href="http://www.latex-project.org/lppl.html">LaTeX
-       Project Public License (LPPL)</fork>, which prevents them from being
+       licenced under the <a class="fork" href="http://www.latex-project.org/lppl.html">LaTeX
+       Project Public License (LPPL)</a>, which prevents them from being
        distributed with Apache software. The LPPL puts restrictions on file names
        in redistributed derived works which we feel can't guarantee. Some
        hyphenation pattern files have other or additional restrictions, for
@@ -133,8 +59,8 @@
     <section id="sources">
       <title>Sources of Custom Hyphenation Pattern Files</title>
       <p>The most important source of hyphenation pattern files is the
-       <fork href="http://www.ctan.org/tex-archive/language/hyphenation/">CTAN TeX
-        Archive</fork>.</p>
+       <a class="fork" href="http://www.ctan.org/tex-archive/language/hyphenation/">CTAN TeX
+        Archive</a>.</p>
     </section>
     <section id="install">
       <title>Installing Custom Hyphenation Patterns</title>
@@ -153,9 +79,9 @@
              hyphenation patterns.</li>
           </ul>
           The language and country codes must match the XSL-FO input, which
-          follows <link href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">ISO
-          639</link> (languages) and <link href="http://www.ics.uci.edu/pub/ietf/http/related/iso3166.txt">ISO
-          3166</link> (countries). NOTE: The ISO 639/ISO 3166 convention is that
+          follows <a href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt">ISO
+          639</a> (languages) and <a href="http://www.ics.uci.edu/pub/ietf/http/related/iso3166.txt">ISO
+          3166</a> (countries). NOTE: The ISO 639/ISO 3166 convention is that
           language names are written in lower case, while country codes are written
           in upper case. FOP does not check whether the language and country specified
           in the FO source are actually from the current standard, but it relies
@@ -165,12 +91,12 @@
         <li>There are basically three ways to make the FOP-compatible hyphenation pattern 
           file(s) accessible to FOP:
           <ul>
-            <li>Download the precompiled JAR from <fork href="http://offo.sourceforge.net/hyphenation/index.html">OFFO
-            </fork> and place it either in the <code>{fop-dir}/lib</code> directory, or 
+            <li>Download the precompiled JAR from <a class="fork" href="http://offo.sourceforge.net/hyphenation/index.html">OFFO
+            </a> and place it either in the <code>{fop-dir}/lib</code> directory, or 
              in a directory of your choice (and append the full path to the JAR to 
              the environment variable <code>FOP_HYPHENATION_PATH</code>).</li>
             <li>Download the desired FOP-compatible hyphenation pattern file(s) from 
-             <fork href="http://offo.sourceforge.net/hyphenation/index.html">OFFO</fork>,
+             <a class="fork" href="http://offo.sourceforge.net/hyphenation/index.html">OFFO</a>,
              and/or take your self created hyphenation pattern file(s), 
              <ul>
                 <li>place them in the directory <code>{fop-dir}/hyph</code>, </li>
@@ -188,7 +114,7 @@
              be created from the supplied pattern(s)).</li>
             <li>Put the pattern source file(s) into a directory of your choice and 
              configure FOP to look for custom patterns in this directory, by setting the
-             <link href="configuration.html#hyphenation-dir">&lt;hyphenation-dir&gt;</link> 
+             <a href="configuration.html">&lt;hyphenation-base&gt;</a> 
              configuration option.</li>
           </ul>
         </li>
@@ -197,7 +123,7 @@
         Either of these three options will ensure hyphenation is working when using
         FOP from the command-line. If FOP is being embedded, remember to add the location(s)
         of the hyphenation JAR(s) to the CLASSPATH (option 1 and 2) or to set the 
-        <link href="configuration.html#hyphenation-dir">&lt;hyphenation-dir&gt;</link> 
+        <a href="configuration.html#hyphenation-dir">&lt;hyphenation-dir&gt;</a> 
         configuration option programmatically (option 3).
       </warning>
     </section>
@@ -207,15 +133,15 @@
     <p>If you would like to build your own hyphenation pattern files, or modify
      existing ones, this section will help you understand how to do so. Even
      when creating a pattern file from scratch, it may be beneficial to start
-     with an existing file and modify it. See <fork href="http://offo.sourceforge.net/hyphenation/index.html">
-     OFFO's Hyphenation page</fork> for examples. 
+     with an existing file and modify it. See <a class="fork" href="http://offo.sourceforge.net/hyphenation/index.html">
+     OFFO's Hyphenation page</a> for examples. 
      Here is a brief explanation of the contents of FOP's hyphenation patterns:</p>
     <warning>The remaining content of this section should be considered "draft"
      quality. It was drafted from theoretical literature, and has not been
      tested against actual FOP behavior. It may contain errors or omissions.
      Do not rely on these instructions without testing everything stated here.
      If you use these instructions, please provide feedback on the
-     <link href="../maillist.html#fop-user">FOP User mailing list</link>, either
+     <a href="../maillist.html#fop-user">FOP User mailing list</a>, either
      confirming their accuracy, or raising specific problems that we can
      address.</warning>
     <ul>
@@ -301,10 +227,10 @@
      online. The original patgen.web source, included in the TeX source distributions,
      contains valuable comments, unfortunately technical details obscure often the
      high level issues. Another important source is
-     <fork href="http://www.ctan.org/tex-archive/systems/knuth/tex/texbook.tex">The
-     TeX Book</fork>, appendix H (either read the TeX source, or run it through
+     <a class="fork" href="http://www.ctan.org/tex-archive/systems/knuth/tex/texbook.tex">The
+     TeX Book</a>, appendix H (either read the TeX source, or run it through
      TeX to typeset it). Secondary articles, for example the works by Petr Sojka,
-     may alos give some much needed insigth into problems arising in automated
+     may also give some much needed insight into problems arising in automated
      hyphenation.</p>
   </section>
   </body>
diff --git a/src/documentation/content/xdocs/0.20.5/index.xml b/src/documentation/content/xdocs/0.94/index.xml
index a99df5fb1..750047678 100644
--- a/src/documentation/content/xdocs/0.20.5/index.xml
+++ b/src/documentation/content/xdocs/0.94/index.xml
@@ -19,22 +19,34 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>Apache FOP Version 0.20.5</title>
+    <title>Apache FOP Version 0.94</title>
     <version>$Revision: 201586 $</version>
   </header>
   <body>
     <section id="intro">
       <title>Introduction</title>
       <p>
-        Version 0.20.5 represents Apache FOP's previous stable release.  It is now
-        recommended that you use <a href="../0.93/index.html">0.93</a> instead.
+        The Apache FOP team is proud to present to you this production quality release.
+        We're still in the process of adding new features. We welcome any feedback you
+        might have and even more, any other form of help to get the project forward.
       </p>
       <p>
-        Please notice that, although we still provide support for 0.20.5, we won't fix any bugs or add any 
-        new features to this branch of development anymore.
-        Instead, please help us with <a href="../trunk/index.html">FOP Trunk</a> by trying it out and 
-        sending us your feedback. Of course, we especially appreciate any contributions in the form of 
-        documentation updates and code patches.
+        This fifth release contains many bug fix release and new features compared
+        to 0.92beta. To see what has changed since the last release, please visit the 
+        <a href="changes_0.94.html">Changes Page</a> and the <a href="releaseNotes_0.94.html">Release Notes</a>.
+      </p>
+    </section>
+    <section id="upgrading">
+      <title>Upgrading from an earlier version</title>
+      <p>
+        If you're upgrading to this version from an earlier version of FOP, please read the 
+        information contained on the <a href="upgrading.html">Upgrading page</a>!
+      </p>
+    </section>
+    <section id="download">
+      <title>Download</title>
+      <p>
+        To download this version, please visit the <a href="../download.html">download page</a>.
       </p>
     </section>
   </body>
diff --git a/src/documentation/content/xdocs/0.94/intermediate.xml b/src/documentation/content/xdocs/0.94/intermediate.xml
new file mode 100644
index 000000000..4744185aa
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/intermediate.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Intermediate Format</title>
+    <version>$Revision$</version>
+  </header>
+  <body>
+    <note>
+      Please note that the intermediate format is an <strong>advanced feature</strong> and can be ignored by most
+      users of Apache FOP.
+    </note>
+    <section id="introduction">
+      <title>Introduction</title>
+      <p>
+        The intermediate format (IF) is a proprietary XML format that represents the area tree 
+        generated by the layout engine. The area tree is conceptually defined in the 
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a>.
+        The IF can be generated through the area tree XML Renderer (the XMLRenderer).
+      </p>
+      <p>
+        The intermediate format can be used to generate intermediate documents that are modified 
+        before they are finally rendered to their ultimate output format. Modifications include
+        adjusting and changing trait values, adding or modifying area objects, inserting prefabricated
+        pages, overlays, imposition (n-up, rotation, scaling etc.). Multiple IF files can be combined
+        to a single output file.
+      </p>
+    </section>
+    <section id="usage">
+      <title>Usage of the Intermediate Format</title>
+      <p>
+        As already mentioned, the IF is generated by using the <strong>XMLRenderer</strong> (MIME type: 
+        <strong>application/X-fop-areatree</strong>). So, you basically set the right MIME type for
+        the output format and process your FO files as if you would create a PDF file. However, there
+        is an important detail to consider: The various Renderers don't all use the same font sources.
+        To be able to create the right area tree for the ultimate output file, you need to create
+        the IF file using the right font setup. This is achieved by telling the XMLRenderer to mimic
+        another renderer. This is done by calling the XMLRenderer's mimicRenderer() method with an
+        instance of the ultimate target renderer as the single parameter. This has a consequence: An
+        IF file rendered with the Java2DRenderer may not look as expected when it was actually generated
+        for the PDF renderer. For renderers that use the same font setup, this restriction does not
+        apply (PDF and PS, for example). Generating the intermediate format file is the first step.
+      </p>
+      <p>
+        The second step is to reparse the IF file using the <strong>AreaTreeParser</strong> which is 
+        found in the org.apache.fop.area package. The pages retrieved from the IF file are added to an
+        AreaTreeModel instance from where they are normally rendered using one of the available Renderer
+        implementations. You can find examples for the IF processing in the 
+        <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><code>examples/embedding</code></a>
+        directory in the FOP distribution
+      </p>
+      <p>
+        The basic pattern to parse the IF format looks like this:
+      </p>
+      <source><![CDATA[
+FopFactory fopFactory = FopFactory.newInstance();      
+      
+// Setup output
+OutputStream out = new java.io.FileOutputStream(pdffile);
+out = new java.io.BufferedOutputStream(out);
+try {
+    //Setup fonts and user agent
+    FontInfo fontInfo = new FontInfo();
+    FOUserAgent userAgent = fopFactory.newFOUserAgent();
+
+    //Construct the AreaTreeModel that will received the individual pages
+    AreaTreeModel treeModel = new RenderPagesModel(userAgent, 
+            MimeConstants.MIME_PDF, fontInfo, out);
+            
+    //Parse the IF file into the area tree
+    AreaTreeParser parser = new AreaTreeParser();
+    Source src = new StreamSource(myIFFile);
+    parser.parse(src, treeModel, userAgent);
+            
+    //Signal the end of the processing. The renderer can finalize the target document.
+    treeModel.endDocument();
+} finally {
+    out.close();
+}]]></source>
+      <p>
+        This example simply reads an IF file and renders it to a PDF file. Please note, that in normal
+        FOP operation you're shielded from having to instantiate the FontInfo object yourself. This
+        is normally a task of the AreaTreeHandler which is not present in this scenario. The same
+        applies to the AreaTreeModel instance, in this case an instance of a subclass called 
+        RenderPagesModel. RenderPagesModel is ideal in this case as it has very little overhead 
+        processing the individual pages. An important line in the example is the call to 
+        <code>endDocument()</code> on the AreaTreeModel. This lets the Renderer know that the processing
+        is now finished.
+      </p>
+      <p>
+        The intermediate format can also be used from the <a href="running.html#standalone-start">command-line</a>
+        by using the "-atin" parameter for specifying the area tree XML as input file. You can also 
+        specify a "mimic renderer" by inserting a MIME type between "-at" and the output file.
+      </p>
+      <section id="concat">
+        <title>Concatenating Documents</title>
+        <p>
+          This initial example is obviously not very useful. It would be faster to create the PDF file 
+          directly. As the <a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java">ExampleConcat.java</a>
+          example shows you can easily parse multiple IF files in a row and add the parsed pages to the
+          same AreaTreeModel instance which essentially concatenates all the input document to one single
+          output document.
+        </p>
+      </section>
+      <section id="modifying">
+        <title>Modifying Documents</title>
+        <p>
+          One of the most important use cases for the intermediate format is obviously modifying the area
+          tree XML before finally rendering it to the target format. You can easily use XSLT to process
+          the IF file according to your needs. Please note, that we will currently not formally describe
+          the intermediate format. You need to have a good understanding its structure so you don't
+          create any non-parseable files. We may add an XML Schema and more detailed documentation at a
+          later time. You're invited to help us with that.
+        </p>
+      </section>
+      <section id="advanced">
+        <title>Advanced Use</title>
+        <p>
+          The generation of the intermediate format as well as it parsing process has been designed to allow
+          for maximum flexibility and optimization. Please note that you can call <code>setTransformerHandler()</code> on
+          XMLRenderer to give the XMLRenderer your own TransformerHandler instance in case you would like to
+          do custom serialization (to a W3C DOM, for example) and/or to directly modify the area tree using 
+          XSLT. The AreaTreeParser on the other side allows you to retrieve a ContentHandler instance where
+          you can manually send SAX events to to start the parsing process (see <code>getContentHandler()</code>).
+        </p>
+      </section>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/0.94/known-issues.xml b/src/documentation/content/xdocs/0.94/known-issues.xml
new file mode 100644
index 000000000..27ae55494
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/known-issues.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<known-issues>
+      <known-issue>
+        MIF and SVG output support have not been restored, yet.
+      </known-issue>
+      <known-issue>
+        Java2D/AWT support has been improved, but some problems remain,
+        for example with block-containers.
+      </known-issue>
+      <known-issue>
+        Auto table layout is not implemented, yet.
+      </known-issue>
+      <known-issue>
+        Footnotes may overlap with text of the region-body in multi-column 
+        documents.
+      </known-issue>
+      <known-issue>
+        Space resolution does not work between footnote regions.
+      </known-issue>
+      <known-issue>
+        There's a problem involving nested block-containers and 
+        reference-orientation 180/-180 (<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=36391">Bugzilla #36391</a>)
+      </known-issue>
+      <known-issue>
+        block-containers with no height currently don't create a fence for
+        spaces as they should (they behave like a normal block).
+      </known-issue>
+      <known-issue>
+        Preserved linefeeds in fo:character are not handled correctly.
+      </known-issue>
+      <known-issue>
+        An empty block currently produces a fence for stacking constraints
+        which it shouldn't.
+      </known-issue>
+      <known-issue>
+        There are several small problems around white space handling.
+      </known-issue>
+      <known-issue>
+        Images currently don't shrink so they fit on a page when they are 
+        too big and shrinking is allowed to happen.
+      </known-issue>
+      <known-issue>
+        inline-container may not work as expected.
+      </known-issue>
+      <known-issue>
+        letter-spacing and word-spacing properties may not work as expected.
+      </known-issue>
+      <known-issue>
+        leaders with leader-pattern="use-content" may not work as expected.
+      </known-issue>
+      <known-issue>
+        keep-with-previous doesn't work inside tables and lists, yet.
+      </known-issue>
+      <known-issue>
+        If two consecutive pages don't have the same available width, the 
+        content currently isn't properly fit into the available space on
+        the new page.
+      </known-issue>
+      <known-issue>
+        background-images on page-number-citations are not placed correctly.
+      </known-issue>
+      <known-issue>
+        Not all FO elements can be referenced by their "id", most notably:
+        table-body, table-header, table-footer and table-row.
+      </known-issue>
+      <known-issue>
+        The backgrounds of table-body, table-header, table-footer and 
+        table-column are not painted, yet.
+      </known-issue>
+      <known-issue>
+        Border and padding conditionality are not supported on table-cells, yet.
+      </known-issue>
+      <known-issue>
+        Column balancing in multi-column documents may not work as expected
+        (<a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=36356">Bugzilla #36356</a>)
+      </known-issue>
+</known-issues>
diff --git a/src/documentation/content/xdocs/0.94/knownissues_overview.xml b/src/documentation/content/xdocs/0.94/knownissues_overview.xml
new file mode 100644
index 000000000..5720424b7
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/knownissues_overview.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document xmlns:xi="http://www.w3.org/2001/XInclude">
+  <header>
+    <title>Apache FOP: Known Issues</title>
+    <version>$Revision$</version>
+  </header>
+<body>
+<section>
+  <title>Known issues</title>
+  <p>
+    This page lists currently known issues in the current release.
+  </p>
+  <note>
+    <p>
+      For additional information on known issues in Apache FOP, please have a look at the following pages, too:
+    </p>
+    <ul>
+      <li><a href="../bugs.html">the bug list in Bugzilla</a></li>
+      <li><a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks">the task list in the Wiki</a></li>
+    </ul>
+  </note>
+  <p>
+    Apache FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several 
+    sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit 
+    tests during the normal build process. This indicates a problem in the current codebase. When a bug is 
+    fixed or a missing feature is added the entry for the relevant test case(s) are removed.
+  </p>
+  <section>
+    <title>FO Tree</title>
+    <p>
+      This section lists disabled test cases in the test suite for the FO tree tests, at the time
+      of the release.
+    </p>
+    <xi:include href="cocoon://knownissues-raw-fotree_0.94.xml#xpointer(/document/body/*)"/>
+  </section>
+  <section>
+    <title>Layout Engine</title>
+    <p>
+      This section lists disabled test cases in the test suite for the layout engine tests, at the
+      time of the release.
+    </p>
+    <xi:include href="cocoon://knownissues-raw-layoutengine_0.94.xml#xpointer(/document/body/*)"/>
+  </section>
+  <section>
+    <title>Other known issues</title>
+    <p>This section lists other known issues.</p>
+    <xi:include href="cocoon://knownissues-raw-static_0.94.xml#xpointer(/document/body/*)"/>
+  </section>
+</section>
+</body>
+</document>
+
diff --git a/src/documentation/content/xdocs/0.94/layoutengine/disabled-testcases.xml b/src/documentation/content/xdocs/0.94/layoutengine/disabled-testcases.xml
new file mode 100644
index 000000000..d81c0dc27
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/layoutengine/disabled-testcases.xml
@@ -0,0 +1,327 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="disabled-testcases.xsl"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!--DOCTYPE disabled-testcases SYSTEM "disabled-testcases.dtd"-->
+<disabled-testcases>
+  <testcase>
+    <name>External link around an SVG not properly sized</name>
+    <file>basic-link_external-destination_2.xml</file>
+    <description>The bpd trait of the inlineparent area for the basic-link
+    is not sized correctly if it wraps an image that is higher than the 
+    nominal line.</description>
+  </testcase>
+  <testcase>
+    <name>Bugzilla #36391: reference-orientation</name>
+    <file>block-container_reference-orientation_bug36391.xml</file>
+    <description>There's a problem involving nested block-containers
+    and reference-orientation 180/-180.</description>
+    <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=36391</reference>
+  </testcase>
+  <testcase>
+    <name>Auto-height block-containers produce fences</name>
+    <file>block-container_space-before_space-after_3.xml</file>
+    <description>Block-containers with no height currently don't
+    create a fence for spaces as they should (they behave like a
+    normal block).</description>
+  </testcase>
+  <testcase>
+    <name>font-stretch NYI</name>
+    <file>block_font-stretch.xml</file>
+    <description>Font-stretch is not implemented, yet.</description>
+  </testcase>
+  <testcase>
+    <name>Hyphenation with preserved linefeeds</name>
+    <file>block_hyphenation_linefeed_preserve.xml</file>
+    <description>When hyphenation is enabled and linefeeds are preserved linefeeds 
+    are painted as '#' and the text is output multiple times.</description>
+  </testcase>
+  <testcase>
+    <name>linefeed-treatment</name>
+    <file>block_linefeed-treatment.xml</file>
+    <description>Preserved linefeeds in a fo:character are not handled
+    correctly.</description>
+  </testcase>
+  <testcase>
+    <name>white-space-treatment</name>
+    <file>block_white-space-treatment_3.xml</file>
+    <description>White space handling incorrectly stops at fo:inline
+      boundaries when it comes to formatter generated line breaks.</description>
+  </testcase>
+  <testcase>
+    <name>Empty blocks produce fences</name>
+    <file>block_space-before_space-after_8.xml</file>
+    <description>An empty block currently produces a fence for
+    stacking constraints which it shouldn't.</description>
+  </testcase>
+  <testcase>
+    <name>block white-space nbsp 2</name>
+    <file>block_white-space_nbsp_2.xml</file>
+    <description>The nbsp given as an fo:character is not adjustable and therefore
+    the justification does not work in this case.</description>
+  </testcase>
+  <testcase>
+    <name>block word-spacing</name>
+    <file>block_word-spacing.xml</file>
+    <description>Word-spacing may not work as expected.</description>
+  </testcase>
+  <testcase>
+    <name>block word-spacing text-align justify</name>
+    <file>block_word-spacing_text-align_justify.xml</file>
+    <description>Word-spacing may not work as expected.</description>
+  </testcase>
+  <testcase>
+    <name>external-graphic don't shrink</name>
+    <file>external-graphic_oversized.xml</file>
+    <description>Images currently don't shrink so they fit on a page
+    when they are too big and shrinking is allowed to
+    happen (min/opt/max).</description>
+  </testcase>
+  <testcase>
+    <name>Test case with HTTP URL</name>
+    <file>external-graphic_src_uri.xml</file>
+    <description>Doesn't work behind a proxy which requires
+    authorization.</description>
+  </testcase>
+  <testcase>
+    <name>Space Resolution in foot note area</name>
+    <file>footnote_space-resolution.xml</file>
+    <description>Space resolution does not work between footnote
+    regions.</description>
+  </testcase>
+  <testcase>
+    <name>Footnotes swallowed in lists</name>
+    <file>footnote_in_list.xml</file>
+    <description>Element lists for lists are created by combining the 
+    element lists from list-item-label and list-item-body. The 
+    footnotes contained in the KnuthBlockBoxes are not propagated to 
+    the combined element list.</description>
+    <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37579</reference>
+  </testcase>
+  <testcase>
+    <name>Footnotes swallowed in tables</name>
+    <file>footnote_in_table.xml</file>
+    <description>Element lists for tables are created by combining the 
+    element lists from the individual table-cells. The footnotes 
+    contained in the KnuthBlockBoxes are not propagated to the combined 
+    element list.</description>
+    <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=37579</reference>
+  </testcase>
+  <testcase>
+    <name>keeps on inlines NYI</name>
+    <file>inline_keep-together.xml</file>
+    <description>Keeps are not implemented in inline-level elements, yet.</description>
+  </testcase>
+  <testcase>
+    <name>NPE for table inside an inline</name>
+    <file>inline_block_nested_3.xml</file>
+    <description>Placing a table as a child of an fo:inline produces a 
+    NullPointerException.</description>
+  </testcase>
+  <testcase>
+    <name>inline-container is not implemented, yet.</name>
+    <file>inline-container_block_nested.xml</file>
+    <description>inline-container is not implemented, yet. Content of an 
+    inline-container will get swallowed. The test case contains no checks.</description>
+  </testcase>
+  <testcase>
+    <name>inline-container is not implemented, yet.</name>
+    <file>inline-container_border_padding.xml</file>
+    <description>inline-container is not implemented, yet. Content of an 
+    inline-container will get swallowed.</description>
+  </testcase>
+  <testcase>
+    <name>inline letter-spacing</name>
+    <file>inline_letter-spacing.xml</file>
+    <description>Letter-spacing may not work as
+    expected within fo:inline.</description>
+  </testcase>
+  <testcase>
+    <name>inline word-spacing</name>
+    <file>inline_word-spacing.xml</file>
+    <description>Word-spacing may not work as expected within
+    fo:inline.</description>
+  </testcase>
+  <testcase>
+    <name>inline word-spacing text-align justify</name>
+    <file>inline_word-spacing_text-align_justify.xml</file>
+    <description></description>
+  </testcase>
+  <testcase>
+    <name>leader-alignment NYI</name>
+    <file>leader-alignment.xml</file>
+    <description>Leader-alignment is not yet
+    implemented.</description>
+  </testcase>
+  <testcase>
+    <name>leader-pattern="use-content": Problem with line height</name>
+    <file>leader_leader-pattern_use-content_bug.xml</file>
+    <description>Line height is not correctly calculated for
+    use-content leaders whose height is larger than the rest of the
+    line.</description>
+    <reference>http://www.nabble.com/leaders-with-leader-pattern%3D%22use-content%22-t546244.html</reference>
+  </testcase>
+  <testcase>
+    <name>keep-with-previous doesn't work in lists</name>
+    <file>list-block_keep-with-previous.xml</file>
+    <description>Keep-with-previous doesn't work inside tables and
+    lists, yet.</description>
+  </testcase>
+  <testcase>
+    <name>keep-with-previous doesn't work in lists</name>
+    <file>list-item_block_keep-with-previous.xml</file>
+    <description>Keep-with-previous doesn't work inside tables and
+    lists, yet.</description>
+  </testcase>
+  <testcase>
+    <name>Page breaking doesn't deal with IPD changes</name>
+    <file>page-breaking_4.xml</file>
+    <description>Page breaking currently doesn't support changing available IPD 
+    between pages of a single page-sequence. Element list generation has to be reset to
+    redetermine line breaks in this case.</description>
+  </testcase>
+  <testcase>
+    <name>Overflow handing is incomplete</name>
+    <file>page-breaking_6.xml</file>
+    <description>Line breaking is not 100% correct when there's too little space. 
+    Overflows are not detected and warned.</description>
+  </testcase>
+  <testcase>
+    <name>Indefinite page height handling is imcomplete</name>
+    <file>page-height_indefinite_simple.xml</file>
+    <description>A RuntimeException is thrown for a page of indefinite height. Lots of warnings.</description>
+  </testcase>
+  <testcase>
+    <name>page-number-citation: Problem with background-image</name>
+    <file>page-number-citation_background-image.xml</file>
+    <description>Background-images on page-number-citations are not
+    placed correctly.</description>
+  </testcase>
+  <testcase>
+    <name>page-number-citation-last: FOs spanning multiple pages are not properly handled.</name>
+    <file>page-number-citation-last_basic.xml</file>
+    <description>Resolution of forward references does not wait until an FO is fully finished when an FO spans multiple pages.</description>
+  </testcase>
+  <testcase>
+    <name>IDs are not working on all FO elements</name>
+    <file>page-number-citation_complex_1.xml</file>
+    <description>The "id" attributes are not properly handled for all block-level FO elements.</description>
+  </testcase>
+  <testcase>
+    <name>IDs are not working on all FO elements</name>
+    <file>page-number-citation_complex_2.xml</file>
+    <description>The "id" attributes are not properly handled for all inline-level FO elements.</description>
+  </testcase>
+  <testcase>
+    <name>Footnotes in multi-column documents</name>
+    <file>region-body_column-count_footnote.xml</file>
+    <description>Footnotes may overlap with text of the region-body in
+    multi-column documents.</description>
+  </testcase>
+  <testcase>
+    <name>Column Balancing problems</name>
+    <file>region-body_column-count_balance_4col.xml</file>
+    <description>Situation in a 4-column document where the column balancing doesn't work and even causes some
+    content to disappear.</description>
+  </testcase>
+  <testcase>
+    <name>Column Balancing problems</name>
+    <file>region-body_column-count_bug36356.xml</file>
+    <description>Column balancing doesn't work as expected.</description>
+  </testcase>
+  <testcase>
+    <name>No background-images on table-body</name>
+    <file>table-body_background-image.xml</file>
+    <description>The backgrounds of table-body, table-header,
+    table-footer and table-column are not painted, yet.</description>
+  </testcase>
+  <testcase>
+    <name>Collapsing Border Model NYI</name>
+    <file>table_border-collapse_collapse_1.xml</file>
+    <description>Border-collapse="collapse" is not yet
+    implemented.</description>
+  </testcase>
+  <testcase>
+    <name>Collapsing Border Model NYI</name>
+    <file>table_border-collapse_collapse_2.xml</file>
+    <description>Border-collapse="collapse" is not yet
+    implemented.</description>
+  </testcase>
+  <testcase>
+    <name>Problems with border and padding on tables</name>
+    <file>table_border_padding.xml</file>
+    <description>The element list seems to not be fully correct, yet, causing
+    the layout to look odd.</description>
+  </testcase>
+  <testcase>
+    <name>keep-with-previous doesn't work inside tables</name>
+    <file>table-cell_block_keep-with-previous.xml</file>
+    <description>Keep-with-previous doesn't work inside tables and
+    lists, yet.</description>
+  </testcase>
+  <testcase>
+    <name>Border and padding conditionality is NYI on table-cells</name>
+    <file>table-cell_border_padding_conditionality.xml</file>
+    <description>Border and padding conditionality are not supported
+    on table-cells, yet.</description>
+  </testcase>
+  <testcase>
+    <name>No background-images on table-header</name>
+    <file>table-header_background-image.xml</file>
+    <description>The backgrounds of table-body, table-header,
+    table-footer and table-column are not painted, yet.</description>
+  </testcase>
+  <testcase>
+    <name>keep-with-previous doesn't work on table-rows</name>
+    <file>table-row_keep-with-previous.xml</file>
+    <description>Keep-with-previous doesn't work inside tables and
+    lists, yet.</description>
+  </testcase>
+  <testcase>
+    <name>table-cell empty area with marker.xml</name>
+    <file>table-cell_empty_area_with_marker.xml</file>
+    <description>A table-cell producing an empty area does currently not add any markers to a page. 
+      See TODO entry in AreaAdditionUtil.</description>
+  </testcase>
+  <testcase>
+    <name>Border conditionality on table</name>
+    <file>table_border-width_conditionality.xml</file>
+    <description>The code should be ok, but the test case uses shorthands and therefore
+    is probably not expressing the indended outcome according to the spec. The test
+    case should be revisited.</description>
+  </testcase>
+  <testcase>
+    <name>fo:wrapper around block-level content (with id)</name>
+    <file>wrapper_block_id.xml</file>
+    <description>"id" attributes on fo:wrapper around block-level content don't get
+    added to the area tree.</description>
+  </testcase>
+  <testcase>
+    <name>Bugzilla #40230: invalid extra page break</name>
+    <file>block_break-after_bug40230.xml</file>
+    <description>Currently an extra page is created even if there is nothing
+      after a block with break-after="page"</description>
+    <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=40230</reference>
+  </testcase>
+  <testcase>
+    <name>Soft hyphen with normal hyphenation enabled</name>
+    <file>block_shy_linebreaking_hyph.xml</file>
+    <description>A soft hyphen should be a preferred as break compared to a
+    normal hyphenation point but is not.</description>
+  </testcase>
+</disabled-testcases>
diff --git a/src/documentation/content/xdocs/0.94/output.xml b/src/documentation/content/xdocs/0.94/output.xml
new file mode 100644
index 000000000..998a5e1ce
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/output.xml
@@ -0,0 +1,805 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<!-- Output Formats: Renderers -->
+<document>
+  <header>
+    <title>Apache FOP Output Formats</title>
+    <version>$Revision$</version>
+    <authors>
+      <person name="Keiron Liddle" email="keiron@aftexsw.com"/>
+      <person name="Art Welch" email=""/>
+    </authors>
+  </header>
+
+  <body>
+    <p>
+      FOP supports multiple output formats by using a different renderer for each format.
+      The renderers do not all have the same set of capabilities, sometimes because of 
+      the output format itself, sometimes because some renderers get more development 
+      attention than others.
+    </p>
+    <section id="general">
+      <title>General Information</title>
+      <section id="general-fonts">
+        <title>Fonts</title>
+        <p>
+          Most FOP renderers use a FOP-specific system for font registration.
+          However, the Java2D/AWT and print renderers use the Java AWT package, which gets its 
+          font information from the operating system registration.
+          This can result in several differences, including actually using different fonts, 
+          and having different font metrics for the same font.
+          The net effect is that the layout of a given FO document can be quite different between 
+          renderers that do not use the same font information.
+        </p>
+      </section>
+      <section id="general-direct-output">
+        <title>Output to a Printer or Other Device</title>
+        <p>
+          The most obvious way to print your document is to use the FOP 
+          <a href="#print">print renderer</a>, which uses the Java2D API (AWT).
+          However, you can also send output from the Postscript renderer directly to a Postscript 
+          device, or output from the PCL renderer directly to a PCL device.
+        </p>
+        <p>
+          Here are Windows command-line examples for Postscript and PCL:
+        </p>
+        <source><![CDATA[fop ... -ps \\computername\printer]]></source>
+        <source><![CDATA[fop ... -pcl \\computername\printer]]></source>
+        <p>
+          Here is some Java code to accomplish the task in UNIX:
+        </p>
+        <source><![CDATA[proc = Runtime.getRuntime().exec("lp -d" + print_queue + " -o -dp -");
+out = proc.getOutputStream();]]></source>
+        <p>
+          Set the output MIME type to "application/x-pcl" (MimeConstants.MIME_PCL) and 
+          it happily sends the PCL to the UNIX printer queue.
+        </p>
+      </section>
+    </section>
+    <section id="pdf">
+      <title>PDF</title>
+      <p>
+        PDF is the best supported output format. It is also the most accurate
+        with text and layout. This creates a PDF document that is streamed out
+        as each page is rendered. This means that the internal page index
+        information is stored near the end of the document.
+        The PDF version supported is 1.4. PDF versions are forwards/backwards
+        compatible.
+      </p>
+      <p>
+        Note that FOP does not currently support "tagged PDF" or PDF/A-1a. 
+        Support for <a href="pdfa.html">PDF/A-1b</a> and <a
+          href="pdfx.html">PDF/X</a> has recently been added, however.
+      </p>
+      <section id="pdf-fonts">
+        <title>Fonts</title>
+        <p>
+          PDF has a set of fonts that are always available to all PDF viewers;
+          to quote from the PDF Specification:
+
+          <em>"PDF prescribes a set of 14 standard fonts that can be used without prior
+          definition.
+          These include four faces each of three Latin text typefaces (Courier,
+          Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf
+          Dingbats). These fonts, or suitable substitute fonts with the same metrics, are
+          guaranteed to be available in all PDF viewer applications."</em>
+        </p>
+      </section>
+      <section id="pdf-postprocess">
+        <title>Post-processing</title>
+        <p>
+          FOP does not currently support several desirable PDF features: XMP metadata and watermarks. 
+          One workaround is to use Adobe Acrobat (the full version, not the Reader) to process 
+          the file manually or with scripting that it supports.
+        </p>
+        <p>
+          Another popular post-processing tool is <a href="http://www.lowagie.com/iText">iText</a>, 
+          which has tools for adding security features, document properties, watermarks, and many 
+          other features to PDF files.
+        </p>
+        <warning>
+          Caveat: iText may swallow PDF bookmarks. But 
+          <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37589">Jens Stavnstrup tells us</a>
+          that this doesn't happen if you use iText's PDFStamper.
+        </warning>
+        <p>
+          Here is some sample code that uses iText to encrypt a FOP-generated PDF. (Note that FOP now 
+          supports <a href="pdfencryption.html">PDF encryption</a>. However the principles for using 
+          iText for other PDF features are similar.)
+        </p>
+        <source><![CDATA[public static void main(String args[]) {
+  try {
+    ByteArrayOutputStream fopout = new ByteArrayOutputStream();
+    FileOutputStream outfile = new FileOutputStream(args[2]);
+    FopFactory fopFactory = FopFactory.newInstance();
+    Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, fopout);
+    
+    Transformer transformer = TransformerFactory.newInstance().newTransformer(
+        new StreamSource(new File(args[1])));
+    transformer.transform(new StreamSource(new File(args[0])),
+        new SAXResult(fop.getDefaultHandler()));
+    PdfReader reader = new PdfReader(fopout.toByteArray());
+    int n = reader.getNumberOfPages();
+    Document document = new Document(reader.getPageSizeWithRotation(1));
+    PdfWriter writer = PdfWriter.getInstance(document, outfile);
+    writer.setEncryption(PdfWriter.STRENGTH40BITS, "pdf", null,
+      PdfWriter.AllowCopy);
+    document.open();
+    PdfContentByte cb = writer.getDirectContent();
+    PdfImportedPage page;
+    int rotation;
+    int i = 0;
+    while (i < n) {
+      i++;
+      document.setPageSize(reader.getPageSizeWithRotation(i));
+      document.newPage();
+      page = writer.getImportedPage(reader, i);
+      rotation = reader.getPageRotation(i);
+      if (rotation == 90 || rotation == 270) {
+        cb.addTemplate(page, 0, -1f, 1f, 0, 0,
+        reader.getPageSizeWithRotation(i).height());
+      } else {
+        cb.addTemplate(page, 1f, 0, 0, 1f, 0, 0);
+      }
+      System.out.println("Processed page " + i);
+    }
+    document.close();
+  } catch( Exception e) {
+    e.printStackTrace();
+  }
+}]]></source>
+    <p>
+      Check the iText tutorial and documentation for setting access flags, password, 
+      encryption strength and other parameters.
+    </p>
+  </section>
+  <section id="pdf-watermark">
+    <title>Watermarks</title>
+    <p>
+      In addition to the <a href="#pdf-postprocess">PDF Post-processing</a> options, consider the following workarounds:
+    </p>
+    <ul>
+      <li>
+        Use a background image for the body region.
+      </li>
+      <li>
+        (submitted by Trevor Campbell) Place an image in a
+        region that overlaps the flowing text. For example, make
+        region-before large enough to contain your image. Then include a
+        block (if necessary, use an absolutely positioned block-container)
+        containing the watermark image in the static-content for the
+        region-before. Note that the image will be drawn on top of the
+        normal content.
+      </li>
+    </ul>
+  </section>
+</section>
+<section id="ps">
+  <title>PostScript</title>
+  <p>
+    The PostScript renderer has been brought up to a similar quality as the 
+    PDF renderer, but may still be missing certain features. It provides good 
+    support for most text and layout.
+    Images and SVG are not fully supported, yet. Currently, the PostScript
+    renderer generates PostScript Level 3 with most DSC comments. Actually,
+    the only Level 3 features used are the FlateDecode and DCTDecode 
+    filter (the latter is used for 1:1 embedding of JPEG images), everything 
+    else is Level 2.
+  </p>
+    <section id="ps-configuration">
+      <title>Configuration</title>
+      <p>
+        The PostScript renderer configuration currently allows the following settings:
+      </p>
+<source><![CDATA[<renderer mime="application/postscript">
+  <auto-rotate-landscape>false</auto-rotate-landscape>
+  <language-level>3</language-level>
+  <optimize-resources>false</optimize-resources>
+</renderer>]]></source>
+      <p>
+        The default value for the "auto-rotate-landscape" setting is "false". Setting it
+        to "true" will automatically rotate landscape pages and will mark them as landscape.
+      </p>
+      <p>
+        The default value for the "language-level" setting is "3". This setting specifies
+        the PostScript language level which should be used by FOP. Set this to "2"
+        only if you don't have a Level 3 capable interpreter.
+      </p>
+      <p>
+        The default value for the "optimize-resources" setting is "false". Setting it
+        to "true" will produce the PostScript file in two steps. A temporary file will be
+        written first which will then be processed to add only the fonts which were really
+        used and images are added to the stream only once as PostScript forms. This will
+        reduce file size but can potentially increase the memory needed in the interpreter
+        to process.
+      </p>
+    </section>
+  <section id="ps-limitations">
+    <title>Limitations</title>
+    <ul>
+      <li>Images and SVG may not be displayed correctly. SVG support is far from being complete. No image transparency is available.</li>
+      <li>Only Type 1 fonts are supported.</li>
+      <li>Multibyte characters are not supported.</li>
+      <li>PPD support is still missing.</li>
+    </ul>
+  </section>
+</section>
+  <section id="pcl">
+    <title>PCL</title>
+    <p>
+      This format is for the Hewlett-Packard PCL printers and other printers 
+      supporting PCL. It should produce output as close to identical as possible 
+      to the printed output of the PDFRenderer within the limitations of the
+      renderer, and output device.
+    </p>
+    <p>
+      The output created by the PCLRenderer is generic PCL 5, HP GL/2 and PJL.
+      This should allow any device fully supporting PCL 5 to be able to
+      print the output generated by the PCLRenderer. PJL is used to control the
+      print job and switch to the PCL language. PCL 5 is used for text, raster 
+      graphics and rectangular fill graphics. HP GL/2 is used for more complex
+      painting operations. Certain painting operations are done off-screen and
+      rendered to PCL as bitmaps because of limitations in PCL 5.
+    </p>
+    <section id="pcl-references">
+      <title>References</title>
+      <ul>
+        <li><a href="http://en.wikipedia.org/wiki/Printer_Control_Language">WikiPedia entry on PCL</a></li>
+        <li><a href="http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=bpl04568">Technical reference documents on PCL from Hewlett-Packard</a></li>
+      </ul>
+    </section>
+    <section id="pcl-limitations">
+      <title>Limitations</title>
+      <ul>
+        <li>
+          Text or graphics outside the left or top of the printable area are not 
+          rendered properly. This is a limitation of PCL, not FOP. In general, 
+          things that should print to the left of the printable area are shifted 
+          to the right so that they start at the left edge of the printable area.
+        </li>
+        <li>
+          The Helvetica and Times fonts are not well supported among PCL printers 
+          so Helvetica is mapped to Arial and Times is mapped to Times New. This 
+          is done in the PCLRenderer, no changes are required in the FO's. The 
+          metrics and appearance for Helvetica/Arial and Times/Times New are 
+          nearly identical, so this has not been a problem so far.
+        </li>
+        <li>For the non-symbol fonts, the ISO 8859-1 symbol set is used (PCL set "0N").</li>
+        <li>
+          All fonts available to the Java2D subsystem are usable. The texts are
+          painted as bitmap much like the Windows PCL drivers do.
+        </li>
+        <li>Multibyte characters are not supported.</li>
+        <li>
+          At the moment, only monochrome output is supported. PCL5c color extensions
+          will only be implemented on demand. Color and grayscale images are converted
+          to monochrome bitmaps (1-bit). Dithering only occurs if the JAI image library
+          is available.
+        </li>
+        <li>
+          Images are scaled up to the next resolution level supported by PCL (75, 
+          100, 150, 200, 300, 600 dpi). For color and grayscale images an even
+          higher PCL resolution is selected to give the dithering algorithm a chance
+          to improve the bitmap quality.
+        </li>
+        <li>
+          Currently, there's no support for clipping and image transparency, largely 
+          because PCL 5 has certain limitations.
+        </li>
+      </ul>
+    </section>
+    <section id="pcl-configuration">
+      <title>Configuration</title>
+      <p>
+        The PCL renderer configuration currently allows the following settings:
+      </p>
+<source><![CDATA[<renderer mime="application/vnd.hp-PCL">
+  <rendering>quality</rendering>
+  <text-rendering>bitmap</text-rendering>
+</renderer>]]></source>
+      <p>
+        The default value for the "rendering" setting is "speed" which causes borders 
+        to be painted as plain rectangles. In this mode, no special borders (dotted, 
+        dashed etc.) are available. If you want support for all border modes, set the
+        value to "quality" as indicated above. This will cause the borders to be painted
+        as bitmaps.
+      </p>
+      <p>
+        The default value for the "text-rendering" setting is "auto" which paints the
+        base fonts using PCL fonts. Non-base fonts are painted as bitmaps through Java2D.
+        If the mix of painting methods results in unwelcome output, you can set this
+        to "bitmap" which causes all text to be rendered as bitmaps.
+      </p>
+      <p>
+        You can control the output resolution for the PCL using the "target resolution" 
+        setting on the FOUserAgent. The actual value will be rounded up to the next
+        supported PCL resolution. Currently, only 300 and 600 dpi are supported which
+        should be enough for most use cases. Note that this setting directly affects
+        the size of the output file and the print quality.
+      </p>
+    </section>
+    <section id="pcl-extensions">
+      <title>Extensions</title>
+      <p>The PCL Renderer supports some PCL specific extensions which can be embedded 
+      into the input FO document. To use the extensions the appropriate namespace must 
+      be declared in the fo:root element like this:</p>
+      <source><![CDATA[
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+               xmlns:pcl="http://xmlgraphics.apache.org/fop/extensions/pcl">
+]]></source>
+      <section id="pcl-page-source">
+        <title>Page Source (Tray selection)</title>
+        <p>
+          The page-source extension attribute on fo:simple-page-master allows to 
+          select the paper tray the sheet for a particular simple-page-master is
+          to be taken from. Example:
+        </p>
+      <source><![CDATA[
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple" pcl:paper-source="2">
+          ...
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+]]></source>
+        <p>
+          Note: the tray number is a positive integer and the value depends on
+          the target printer. Not all PCL printers support the same paper trays.
+          Usually, 
+          "1" is the default tray,
+          "2" is the manual paper feed, 
+          "3" is the manual envelope feed, 
+          "4" is the "lower" tray and
+          "7" is "auto-select".
+          Consult the technical reference for your printer for all available values.
+        </p>
+      </section>
+    </section>
+  </section>
+  <section id="afp">
+    <title>AFP</title>
+    <warning>The AFP Renderer is a new addition (27-Apr-2006) to the sandbox and as such not yet fully tested or feature complete.</warning>
+    <p>
+      The FOP AFP Renderer deals with creating documents conforming to the IBM AFP document architecture
+      also refered to as MO:DCA (Mixed Object Document Content Architecture).
+    </p>
+    <section id="afp-references">
+      <title>References</title>
+      <ul>
+        <li><a href="http://en.wikipedia.org/wiki/Advanced_Function_Presentation">AFP (Advanced Function Presentation)</a></li>
+        <li><a href="http://wiki.apache.org/xmlgraphics-fop/AFPResources">AFP Resources on the FOP WIKI</a></li>
+      </ul>
+    </section>
+    <section id="afp-limitations">
+      <title>Limitations</title>
+      <p>This list is most likely badly incomplete.</p>
+      <ul>
+        <li>
+          Clipping of text and graphics is not supported.
+        </li>
+        <li>
+          Only IBM outline and raster fonts and to a limited extend the original fonts built into FOP are supported.
+          Support for TrueType fonts may be added later.
+        </li>
+      </ul>
+    </section>
+    <section id="afp-configuration">
+      <title>Configuration</title>
+      <section id="afp-font-config">
+        <title>Fonts</title>
+      <p>The AFP Renderer requires special configuration particularly related to fonts.
+      AFP Render configuration is done through the normal FOP configuration file. The MIME type
+      for the AFP Renderer is application/x-afp which means the AFP Renderer section in the FOP configuration file
+      looks like:</p>
+      <source><![CDATA[<renderer mime="application/x-afp">
+  <!-- AFP Renderer -->
+  ...
+</renderer>]]></source>
+      <p>There are 3 font configuration variants supported:</p>
+      <ol>
+        <li>IBM Raster fonts</li>
+        <li>IBM Outline fonts</li>
+        <li>FOP built-in Base14 fonts</li>
+      </ol>
+      <p>A typical raster font configuration looks like:</p>
+<source><![CDATA[      <!-- This is an example of mapping actual IBM raster fonts / code pages to a FOP font -->
+        <font>
+        <!-- The afp-font element defines the IBM code page, the matching Java encoding and the
+             path to the font -->
+        <afp-font type="raster" codepage="T1V10500" encoding="Cp500" path="fonts/ibm">
+          <!-- For a raster font a separate element for each font size is required providing
+               the font size and the corresponding IBM Character set name -->
+          <afp-raster-font size="7" characterset="C0N20070"/>
+          <afp-raster-font size="8" characterset="C0N20080"/>
+          <afp-raster-font size="10" characterset="C0N20000"/>
+          <afp-raster-font size="11" characterset="C0N200A0"/>
+          <afp-raster-font size="12" characterset="C0N200B0"/>
+          <afp-raster-font size="14" characterset="C0N200D0"/>
+          <afp-raster-font size="16" characterset="C0N200F0"/>
+          <afp-raster-font size="18" characterset="C0N200H0"/>
+          <afp-raster-font size="20" characterset="C0N200J0"/>
+          <afp-raster-font size="24" characterset="C0N200N0"/>
+          <afp-raster-font size="30" characterset="C0N200T0"/>
+          <afp-raster-font size="36" characterset="C0N200Z0"/>
+        </afp-font>
+        <!-- These are the usual FOP font triplets as they apply to this font -->
+        <font-triplet name="serif" style="normal" weight="normal"/>
+        <font-triplet name="Times" style="normal" weight="normal"/>
+        <font-triplet name="Times-Roman" style="normal" weight="normal"/>
+        <font-triplet name="TimesNewRoman" style="normal" weight="normal"/>
+      </font>]]></source>
+      <p>An outline font configuration is simpler as the individual font size entries are not required.
+      However, the characterset definition is now required within the afp-font element.</p>
+<source><![CDATA[      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH200  "
+             path="fonts/ibm" />
+          <font-triplet name="sans-serif" style="normal" weight="normal"/>
+          <font-triplet name="Helvetica" style="normal" weight="normal"/>
+          <font-triplet name="any" style="normal" weight="normal"/>
+      </font>
+]]></source>
+      <p>Experimentation has shown that the font metrics for the FOP built-in Base14 fonts are actually
+      very similar to some of the IBM outline and raster fonts. In cases were the IBM font files are not
+      available the path attribute in the afp-font element can be replaced by a base14-font attribute 
+      giving the name of the matching Base14 font. In this case the AFP Renderer will take the
+      font metrics from the built-in font.</p>
+<source><![CDATA[      <!-- The following are examples of defining outline fonts based on FOP built-in
+           font metrics for the Adobe Base14 fonts -->
+      <!-- sans-serif fonts based on Helvetica -->
+      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH200  "
+            base14-font="Helvetica" />
+          <font-triplet name="sans-serif" style="normal" weight="normal"/>
+          <font-triplet name="Helvetica" style="normal" weight="normal"/>
+          <font-triplet name="any" style="normal" weight="normal"/>
+      </font>
+      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH300  "
+            base14-font="HelveticaOblique" />
+          <font-triplet name="sans-serif" style="italic" weight="normal"/>
+          <font-triplet name="Helvetica" style="italic" weight="normal"/>
+          <font-triplet name="any" style="italic" weight="normal"/>
+      </font>
+      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH400  "
+            base14-font="HelveticaBold" />
+          <font-triplet name="sans-serif" style="normal" weight="bold"/>
+          <font-triplet name="Helvetica" style="normal" weight="bold"/>
+          <font-triplet name="any" style="normal" weight="bold"/>
+      </font>
+      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZH500  "
+            base14-font="HelveticaBoldOblique" />
+          <font-triplet name="sans-serif" style="italic" weight="bold"/>
+          <font-triplet name="Helvetica" style="italic" weight="bold"/>
+          <font-triplet name="any" style="italic" weight="bold"/>
+      </font>
+      
+      <!-- serif fonts based on Times Roman -->
+      <font>
+          <afp-font type="outline" codepage="T1V10500" encoding="Cp500" characterset="CZN200  "
+            base14-font="TimesRoman" />
+          <font-triplet name="serif" style="normal" weight="normal"/>
+          <font-triplet name="Times" style="normal" weight="normal"/>
+          <font-triplet name="Times-Roman" style="normal" weight="normal"/>
+      </font>
+
+      <!-- The following are examples of defining raster fonts based on FOP built-in
+           font metrics for the Adobe Base14 fonts -->
+      <!-- monospaced fonts based on Courier -->
+      <font>
+        <afp-font type="raster" codepage="T1V10500" encoding="Cp500">
+          <afp-raster-font size="7" characterset="C0420070" base14-font="Courier"/>
+          <afp-raster-font size="8" characterset="C0420080" base14-font="Courier"/>
+          <afp-raster-font size="10" characterset="C0420000" base14-font="Courier"/>
+          <afp-raster-font size="12" characterset="C04200B0" base14-font="Courier"/>
+          <afp-raster-font size="14" characterset="C04200D0" base14-font="Courier"/>
+          <afp-raster-font size="20" characterset="C04200J0" base14-font="Courier"/>
+        </afp-font>
+        <font-triplet name="monospace" style="normal" weight="normal"/>
+        <font-triplet name="Courier" style="normal" weight="normal"/>
+      </font>
+      <font>
+        <afp-font type="raster" codepage="T1V10500" encoding="Cp500">
+          <afp-raster-font size="7" characterset="C0440070" base14-font="CourierBold"/>
+          <afp-raster-font size="8" characterset="C0440080" base14-font="CourierBold"/>
+          <afp-raster-font size="10" characterset="C0440000" base14-font="CourierBold"/>
+          <afp-raster-font size="12" characterset="C04400B0" base14-font="CourierBold"/>
+          <afp-raster-font size="14" characterset="C04400D0" base14-font="CourierBold"/>
+          <afp-raster-font size="20" characterset="C04400J0" base14-font="CourierBold"/>
+        </afp-font>
+        <font-triplet name="monospace" style="normal" weight="bold"/>
+        <font-triplet name="Courier" style="normal" weight="bold"/>
+      </font>]]></source>
+      </section>
+      <section id="afp-image-config">
+        <title>Images</title>
+        <p>By default the AFP Renderer converts all images to 8 bit grey level.
+        This can be overridden by the &lt;images&gt; configuration element. Example:</p>
+      <source><![CDATA[
+      <images mode="color" />
+]]></source>
+      <p>This will put images as RGB images into the AFP output stream. The default setting is:</p>
+      <source><![CDATA[
+      <images mode="b+w" bits-per-pixel="8" />
+]]></source>
+      <p>Only the values "color" and "b+w" are allowed for the mode attribute. The bits-per-pixel
+      attribute is ignored if mode is "color". For "b+w" mode is must be 1, 4, or 8.</p>
+      </section>
+    </section>
+    <section id="afp-extensions">
+      <title>Extensions</title>
+      <p>The AFP Renderer supports some AFP specific extensions which can be embedded into the input 
+      fo document. To use the extensions the appropriate namespace must be declared in the fo:root element like this:</p>
+      <source><![CDATA[
+      <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+               xmlns:afp="http://xmlgraphics.apache.org/fop/extensions/afp">
+]]></source>
+      <section id="afp-page-overlay">
+        <title>Page Overlay Extension</title>
+        <p>The include-page-overlay extension element allows to define on a per simple-page-master basis a page overlay resource. Example:</p>
+      <source><![CDATA[
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple">
+          <afp:include-page-overlay name="O1SAMP1 " />
+          ...
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+]]></source>
+        <p>The mandatory name attribute must refer to an 8 character (space padded) resource name that
+        must be known in the AFP processing environment.</p>
+      </section>
+      <section id="afp-page-segment">
+        <title>Page Segment Extension</title>
+        <p>The include-page-segment extension element allows to define resource substitution for fo:external-graphics elements. 
+          Example:</p>
+      <source><![CDATA[
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+     xmlns:afp="http://xmlgraphics.apache.org/fop/extensions/afp">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple">
+          <afp:include-page-segment name="S1ISLOGO" src="../../resources/images/bgimg300dpi.jpg" />
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+]]></source>
+        <p>The include-page-segment extension element can only occur within a simple-page-master.
+        Multiple include-page-segment extension elements within a simple-page-master are allowed.
+        The mandatory name attribute must refer to an 8 character 
+        (space padded) resource name that must be known in the AFP processing environment.
+        The value of the mandatory src attribute is compared against the value of the src attribute in
+        fo:external-graphic elements and if it is identical (string matching is used) in the generated
+        AFP the external graphic is replaced by a reference to the given resource.
+        </p>
+      </section>
+      <section id="afp-tag-logical-element">
+        <title>Tag Logical Element Extension</title>
+        <p>The tag-logical-element extension element allows to injects TLEs into the AFP output stream. Example: 
+          Example:</p>
+      <source><![CDATA[
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+     xmlns:afp="http://xmlgraphics.apache.org/fop/extensions/afp">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="simple">
+          <afp:tag-logical-element name="The TLE Name" value="The TLE Value" />
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+]]></source>
+        <p>The tag-logical-element extension element can only occur within a simple-page-master.
+        Multiple tag-logical-element extension elements within a simple-page-master are allowed.
+        The name and value attributes are mandatory.
+        </p>
+      </section>
+    </section>
+  </section>
+<section id="rtf">
+  <title>RTF</title>
+  <p>
+    JFOR, an open source XSL-FO to RTF converter has been integrated into Apache FOP.
+    This will create an RTF (rich text format) document that will
+    attempt to contain as much information from the fo document as
+    possible. The RTF output follows Microsoft's RTF specifications
+    and produces best results on Microsoft Word.
+  </p>
+  <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>
+</section>
+<section id="xml">
+  <title>XML (Area Tree XML)</title>
+  <p>
+    This is primarily for testing and verification. The XML created is simply
+    a representation of the internal area tree put into XML. We use that to verify
+    the functionality of FOP's layout engine.
+  </p>
+  <p>
+    The other use case of the Area Tree XML is as FOP's "intermediate format". More information
+    on that can be found on the page dedicated to the <a href="intermediate.html">Intermediate Format</a>.
+  </p>
+</section>
+<section id="awt">
+  <title>Java2D/AWT</title>
+    <p>
+      The Java2DRenderer provides the basic functionality for all 
+      Java2D-based output formats (AWT viewer, direct print, PNG, TIFF).
+    </p>
+    <p>
+      The AWT viewer shows a window with the pages displayed inside a
+      Java graphic. It displays one page at a time.
+      The fonts used for the formatting and viewing depend on the fonts
+      available to your JRE.
+    </p>
+</section>
+<section id="print">
+  <title>Print</title>
+  <p>
+    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>
+<section id="bitmap">
+  <title>Bitmap (TIFF/PNG)</title>
+  <p>
+    It is possible to directly create bitmap images from the individual 
+    pages generated by the layout engine.
+    This is done with the same code that renders to the Java2D/AWT renderer.
+  </p>
+  <p>
+    Currently, two output formats are supported: PNG and TIFF. TIFF produces
+    one file with multiple pages, while PNG output produces one file per
+    page. The quality of the bitmap depends on the target resolution setting 
+    on the FOUserAgent.
+  </p>
+    <section id="bitmap-configuration">
+      <title>Configuration</title>
+      <p>
+        The TIFF and PNG renderer configuration currently allows the following settings:
+      </p>
+<source><![CDATA[<renderer mime="image/png">
+  <transparent-page-background>true</transparent-page-background>
+  <fonts><!-- described elsewhere --></fonts>
+</renderer>]]></source>
+      <p>
+        The default value for the "transparent-page-background" setting is "false" which 
+        paints an opaque, white background for the whole image. If you set this to true,
+        no such background will be painted and you will get a transparent image if
+        an alpha channel is available in the output format.
+      </p>
+    </section>
+    <section id="tiff-configuration">
+      <title>TIFF-specific Configuration</title>
+      <p>
+        In addition to the above values the TIFF renderer configuration allows some additional
+        settings:
+      </p>
+<source><![CDATA[<renderer mime="image/tiff">
+  <transparent-page-background>true</transparent-page-background>
+  <compression>CCITT T.6</compression>
+  <fonts><!-- described elsewhere --></fonts>
+</renderer>]]></source>
+      <p>
+        The default value for the "compression" setting is "PackBits" which 
+        which is a widely supported RLE compression scheme for TIFF. The set of compression
+        names to be used here matches the set that the Image I/O API uses. Note that
+        not all compression schemes may be available during runtime. This depends on the
+        actual codecs being available. Here is a list of possible values:
+      </p>
+      <ul>
+        <li>NONE (no compression)</li>
+        <li>PackBits (RLE, run-length encoding)</li>
+        <li>JPEG</li>
+        <li>Deflate</li>
+        <li>LZW</li>
+        <li>ZLib</li>
+        <li>CCITT T.4 (Fax Group 3)</li>
+        <li>CCITT T.6 (Fax Group 4)</li>
+      </ul>
+      <note>
+        If you want to use CCITT compression, please make sure you've got a J2SE 1.4 or later and
+        <a href="http://java.sun.com/products/java-media/jai/current.html">
+          Java Advanced Imaging Image I/O Tools
+        </a>
+        in your classpath. The Sun JRE doesn't come with a TIFF codec built in, so it has to be
+        added separately. The internal TIFF codec from XML Graphics Commons only supports PackBits,
+        Deflate and JPEG compression for writing.
+      </note>
+    </section>
+</section>
+<section id="txt">
+  <title>TXT</title>
+  <p>
+    The text renderer produces plain ASCII text output
+    that attempts to match the output of the PDFRenderer as closely as
+    possible. This was originally developed to accommodate an archive system
+    that could only accept plain text files, and is primarily useful for getting
+    a quick-and-dirty view of the document text. The renderer is very limited,
+    so do not be surprised if it gives unsatisfactory results.
+  </p>
+  <p>
+    The Text renderer works with a fixed size page buffer. The size of this
+    buffer is controlled with the textCPI and textLPI public variables.
+    The textCPI is the effective horizontal characters per inch to use.
+    The textLPI is the vertical lines per inch to use. From these values
+    and the page width and height the size of the buffer is calculated.
+    The formatting objects to be rendered are then mapped to this grid.
+    Graphic elements (lines, borders, etc) are assigned a lower priority
+    than text, so text will overwrite any graphic element representations.
+  </p>
+  <p>
+    Because FOP lays the text onto a grid during layout, there are frequently 
+    extra or missing spaces between characters and lines, which is generally 
+    unsatisfactory.
+    Users have reported that the optimal settings to avoid such spacing problems are:
+  </p>
+  <ul>
+    <li>font-family="Courier"</li>
+    <li>font-size="7.3pt"</li>
+    <li>line-height="10.5pt"</li>
+  </ul>
+</section>
+<section id="sandbox">
+  <title>Output Formats in the Sandbox</title>
+  <p>
+    Due to the state of certain renderers we moved some of them to a "sandbox" area until 
+    they are ready for more serious use. The renderers and FOEventHandlers in the sandbox
+    can be found under src/sandbox and are compiled into build/fop-sandbox.jar during the
+    main build. The output formats in the sandbox are marked as such below.
+  </p>
+  <section id="mif">
+    <title>MIF</title>
+    <warning>The MIF handler is in the sandbox and not yet functional in FOP Trunk!!! Please help us ressurrect this feature.</warning>
+    <p>
+      This format is the Maker Interchange Format which is used by
+      Adobe Framemaker.
+    </p>
+   </section>
+   <section id="svg">
+     <title>SVG</title>
+     <warning>The SVG renderer is in the sandbox and may not work as expected in FOP Trunk!!! Please help us improve this feature.</warning>
+     <p>
+       This format creates an SVG document that has links between the pages.
+       This is primarily for slides and creating svg images of pages.
+       Large documents will create SVG files that are far too large for
+       an SVG viewer to handle. Since FO documents usually have text the
+       SVG document will have a large number of text elements.
+       The font information for the text is obtained from the JVM in the
+       same way as for the AWT viewer. If the SVG is viewed on a
+       system where the fonts are different, such as another platform,
+       then the page may look wrong.
+     </p>
+   </section>
+</section>
+<section id="wishlist">
+  <title>Wish list</title>
+  <p>
+    Apache FOP is easily extensible and allows you to add new output formats to enhance FOP's functionality. There's a number of output formats
+    which are on our wish list. We're looking for volunteers to help us implement them.
+  </p>
+  <ul>
+    <li>
+      <a href="http://en.wikipedia.org/wiki/OpenDocument">ODF (Open Document Format)</a>: 
+      The standardized successor to OpenOffice's file format.
+    </li>
+  </ul>
+</section>
+
+  </body>
+</document>
+
diff --git a/src/documentation/content/xdocs/0.94/pdfa.xml b/src/documentation/content/xdocs/0.94/pdfa.xml
new file mode 100644
index 000000000..49ffbeb71
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/pdfa.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
+<document>
+  <header>
+    <title>PDF/A (ISO 19005)</title>
+    <version>$Revision: 389563 $</version>
+    <authors>
+      <person name="Jeremias Märki" email="jeremias@apache.org"/>
+    </authors>
+  </header>
+  <body>
+    <section id="overview">
+      <title>Overview</title>
+      <warning>
+        Support for PDF/A is available beginning with version 0.92.
+      </warning>
+      <p>
+        PDF/A is a standard which turns PDF into an "electronic document file 
+        format for long-term preservation". PDF/A-1 is the first part of the 
+        standard and is documented in 
+        <a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=38920&amp;ICS1=37&amp;ICS2=100&amp;ICS3=99">ISO 19005-1:2005(E)</a>. 
+        Work on PDF/A-2 is in progress at 
+        <a href="http://www.aiim.org/standards.asp?ID=25013">AIIM</a>.
+      </p>
+      <p>
+        Design documentation on PDF/A can be found on FOP's Wiki on the
+        <a href="http://wiki.apache.org/xmlgraphics-fop/PDFA1ConformanceNotes">PDFA1ConformanceNotes</a> page.
+      </p>
+    </section>
+    <section id="status">
+      <title>Implementation Status</title>
+      <p>
+        <strong>PDF/A-1b</strong> is implemented to the degree that FOP supports 
+        the creation of the elements described in ISO 19005-1. 
+      </p>
+      <p>
+        Tests have been performed against jHove and Adobe Acrobat 7.0.7 (Preflight function).
+        FOP does not validate completely against Apago's PDF Appraiser. Reasons unknown due to
+        lack of a full license to get a detailed error protocol.
+      </p>
+      <p>
+        <strong>PDF/A-1a</strong> is not implemented, yet. This is mostly because of the requirement
+        for tagged PDF which is not available in FOP, yet.
+      </p>
+    </section>
+    <section id="command-line">
+      <title>Usage (command line)</title>
+      <p>
+        To activate PDF/A-1b from the command-line, specify "-pdfprofile PDF/A-1b" 
+        as a parameter. If there is a violation of one of the validation rules for 
+        PDF/A, an error message is presented and the processing stops.
+      </p>
+    </section>
+    <section id="embedded">
+      <title>Usage (embedded)</title>
+      <p>
+        When FOP is embedded in another Java application you can set a special option
+        on the renderer options in the user agent to activate the PDF/A-1b profile.
+        Here's an example:
+      </p>
+      <source><![CDATA[
+userAgent.getRendererOptions().put("pdf-a-mode", "PDF/A-1b");
+Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
+[..]]]></source>
+      <p>
+        If one of the validation rules of PDF/A is violated, an PDFConformanceException
+        (descendant of RuntimeException) is thrown.
+      </p>
+    </section>
+    <section id="rules">
+      <title>PDF/A in Action</title>
+      <p>
+        There are a number of things that must be looked after if you activate a PDF/A
+        profile. If you receive a PDFConformanceException, have a look at the following
+        list (not necessarily comprehensive):
+      </p>
+      <ul>
+        <li>
+          Make sure all (!) fonts are embedded. If you use base 14 fonts (like Helvetica)
+          you need to obtain a license for them and embed them like any other font.
+        </li>
+        <li>
+          Don't use PDF encryption. PDF/A doesn't allow it.
+        </li>
+        <li>
+          Don't use CMYK images without an ICC color profile. PDF/A doesn't allow mixing
+          color spaces and FOP currently only properly supports the sRGB color space. Please
+          note that FOP embeds a standard sRGB ICC profile (sRGB IEC61966-2.1) as the 
+          primary output intent for the PDF if no other output intent has been specified
+          in the configuration.
+        </li>
+        <li>
+          Don't use non-RGB colors in SVG images. Same issue as with CMYK images.
+        </li>
+        <li>
+          Don't use EPS graphics with fo:external-graphic. Embedding EPS graphics in PDF
+          is deprecated since PDF 1.4 and prohibited by PDF/A.
+        </li>
+        <li>
+          PDF is forced to version 1.4 if PDF/A-1 is activated.
+        </li>
+        <li>
+          No filter must be specified explicitely for metadata objects. Metadata must be
+          embedded in clear text so non-PDF-aware applications can extract the XMP metadata.
+        </li>
+      </ul>
+    </section>
+    <section id="profile-compatibility">
+      <title>PDF profile compatibility</title>
+      <p>
+        The PDF profiles "PDF/X-3:2003" and "PDF/A-1b" are compatible and can both be 
+        activated at the same time.
+      </p>
+    </section>
+    <section id="interoperability">
+      <title>Interoperability</title>
+      <p>
+        There has been some confusion about the namespace for the PDF/A indicator in the XMP
+        metadata. At least three variants have been seen in the wild:
+      </p>
+      <table>
+        <tr>
+          <td>http://www.aiim.org/pdfa/ns/id.html</td>
+          <td><strong>obsolete</strong>, from an early draft of ISO-19005-1, used by Adobe Acrobat 7.x</td>
+        </tr>
+        <tr>
+          <td>http://www.aiim.org/pdfa/ns/id</td>
+          <td><strong>obsolete</strong>, found in the original ISO 19005-1:2005 document</td>
+        </tr>
+        <tr>
+          <td>http://www.aiim.org/pdfa/ns/id/</td>
+          <td><strong>correct</strong>, found in the technical corrigendum 1 of ISO 19005-1:2005</td>
+        </tr>
+      </table>
+      <p>
+        If you get an error validating a PDF/A file in Adobe Acrobat 7.x it doesn't mean that
+        FOP did something wrong. It's Acrobat that is at fault. This is fixed in Adobe Acrobat 8.x
+        which uses the correct namespace as described in the technical corrigendum 1.
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml b/src/documentation/content/xdocs/0.94/pdfencryption.xml
index 030c022b1..c8cdbb29c 100644
--- a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml
+++ b/src/documentation/content/xdocs/0.94/pdfencryption.xml
@@ -16,9 +16,7 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
-
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>PDF encryption.</title>
@@ -31,7 +29,6 @@
   <body>
     <section>
       <title>Overview</title>
-      <warning>PDF Encryption is available in Release 0.20.5 and later. The comments on this page do not apply to releases earlier than 0.20.5.</warning>
       <p>
         FOP supports encryption of PDF output, thanks to Patrick
         C. Lankswert. This feature is commonly used to prevent
@@ -135,22 +132,45 @@
         An example to enable PDF encryption in Java code:
       </p>
       <source><![CDATA[
-Driver driver = new Driver();
-driver.setRenderer(Driver.RENDER_PDF);
-Map rendererOptions = new java.util.HashMap();
-rendererOptions.put("ownerPassword", "mypassword");
-rendererOptions.put("allowCopyContent", "FALSE");
-rendererOptions.put("allowEditContent", "FALSE");
-rendererOptions.put("allowPrint", "FALSE");
-driver.getRenderer().setOptions(rendererOptions);
-driver.setOutputStream(...]]></source>
+import org.apache.fop.pdf.PDFEncryptionParams;
+
+[..]
+
+FOUserAgent userAgent = fopFactory.newFOUserAgent();
+useragent.getRendererOptions().put("encryption-params", new PDFEncryptionParams(
+    null, "password", false, false, true, true));
+Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
+[..]]]></source>
+      <p>
+        The parameters for the constructor of PDFEncryptionParams are:
+      </p>
+      <ol>
+        <li>userPassword: String, may be null</li>
+        <li>ownerPassword: String, may be null</li>
+        <li>allowPrint: true if printing is allowed</li>
+        <li>allowCopyContent: true if copying content is allowed</li>
+        <li>allowEditContent: true if editing content is allowed</li>
+        <li>allowEditAnnotations: true if editing annotations is allowed</li>
+      </ol>
+      <p>
+        Alternatively, you can set each value separately in the Map provided by 
+        FOUserAgent.getRendererOptions() by using the following keys:
+      </p>
+      <ol>
+        <li>user-password: String</li>
+        <li>owner-password: String</li>
+        <li>noprint: Boolean or "true"/"false"</li>
+        <li>nocopy: Boolean or "true"/"false"</li>
+        <li>noedit: Boolean or "true"/"false"</li>
+        <li>noannotations: Boolean or "true"/"false"</li>
+      </ol>
     </section>
     <section>
       <title>Environment</title>
       <p>
         In order to use PDF encryption, FOP has to be compiled with
-        cryptography support. Currently, only <link
-        href="http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html">JCE</link>
+        cryptography support. Currently, only <a
+        href="http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html">JCE</a>
         is supported. JCE is part of JDK 1.4. For earlier JDKs, it can
         be installed separately. The build process automatically
         detects JCE presence and installs PDF encryption support if
@@ -168,18 +188,18 @@ driver.setOutputStream(...]]></source>
       </p>
       <p>
         There are several commercial and a few Open Source packages which
-        provide RC4. A pure Java implementation is produced by <link
+        provide RC4. A pure Java implementation is produced by <a
         href="http://www.bouncycastle.org/">The Legion of the Bouncy
-        Castle</link>. <link
+        Castle</a>. <a
         href="http://www.mozilla.org/projects/security/pki/jss/">Mozilla
-        JSS</link> is an interface to a native implementation.
+        JSS</a> is an interface to a native implementation.
       </p>
     </section>
     <section id="install_crypto">
       <title>Installing a crypto provider</title>
       <p>
-        The pure Java implementation from <link
-        href="http://www.bouncycastle.org/">Bouncy Castle</link> is easy to
+        The pure Java implementation from <a
+        href="http://www.bouncycastle.org/">Bouncy Castle</a> is easy to
         install.
       </p>
       <ol>
@@ -198,7 +218,7 @@ driver.setOutputStream(...]]></source>
           Open the <code>java.security</code> file and add<br/>
           <code>security.provider.6=org.bouncycastle.jce.provider.BouncyCastleProvider</code>,<br/>
           preferably at the end of the block defining the other crypto
-          providers. For JDK 1.4 this is detailed on <link href="http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html#InstallProvider">Sun's web site</link>.
+          providers. For JDK 1.4 this is detailed on <a href="http://java.sun.com/j2se/1.4/docs/guide/security/jce/JCERefGuide.html#InstallProvider">Sun's web site</a>.
         </li>
       </ol>
       <p>
diff --git a/src/documentation/content/xdocs/0.94/pdfx.xml b/src/documentation/content/xdocs/0.94/pdfx.xml
new file mode 100644
index 000000000..342a0ca4c
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/pdfx.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "document-v20.dtd">
+<document>
+  <header>
+    <title>PDF/X (ISO 15930)</title>
+    <version>$Revision$</version>
+    <authors>
+      <person name="Jeremias Märki" email="jeremias@apache.org"/>
+    </authors>
+  </header>
+  <body>
+    <section id="overview">
+      <title>Overview</title>
+      <warning>
+        Support for PDF/X was made available beginning with version 0.93.
+        This feature is new and may not be 100% complete, yet. Feedback is welcome.
+      </warning>
+      <p>
+        PDF/X is a standard which faciliates prepress digital data exchange using PDF.
+        Currently, only PDF/X-3:2003 is implemented out of the many different flavours of PDF/X
+        profiles. PDF/X-3:2003 is documented in 
+        <a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=39940&amp;ICS1=37&amp;ICS2=100&amp;ICS3=99">ISO 15930-6:2003(E)</a>. 
+        More info on PDF/X can be found on the  
+        <a href="http://www.pdfx.info/">PDF/X info site</a>.
+      </p>
+    </section>
+    <section id="status">
+      <title>Implementation Status</title>
+      <p>
+        <strong>PDF/X-3:2003</strong> is implemented to the degree that FOP supports 
+        the creation of the elements described in ISO 15930-6. 
+      </p>
+      <p>
+        An important restriction of the current implementation is that all normal 
+        RGB colors specified in XSL-FO and SVG are left unchanged in the sRGB color
+        space (XSL-FO and SVG both use sRGB as their default color space).
+        There's no conversion to a CMYK color space. Although sRGB is a
+        calibrated color space, its color space has a different size than a CMYK
+        color space which makes the conversion a lossy conversion and can lead to
+        unwanted results. Although the use of the calibrated sRGB has been promoted
+        for years, print shops usually prefer to convert an sRGB PDF to CMYK prior
+        to production. Until there's full CMYK support in FOP you will have to
+        work closely with your print service provider to make sure you get the 
+        intended result.
+      </p>
+      <p>
+        Tests have been performed against Adobe Acrobat 7.0.7 (Preflight function).
+        Note that there are bugs in Adobe Acrobat which cause false alarms if both
+        PDF/A-1b and PDF/X-3:2003 are activated at the same time.
+      </p>
+    </section>
+    <section id="command-line">
+      <title>Usage (command line)</title>
+      <p>
+        To activate PDF/X-3:2003 from the command-line, specify "-pdfprofile PDF/X-3:2003" 
+        as a parameter. If there is a violation of one of the validation rules for 
+        PDF/X, an error message is presented and the processing stops.
+      </p>
+    </section>
+    <section id="embedded">
+      <title>Usage (embedded)</title>
+      <p>
+        When FOP is embedded in another Java application you can set a special option
+        on the renderer options in the user agent to activate the PDF/A-1b profile.
+        Here's an example:
+      </p>
+      <source><![CDATA[
+FOUserAgent userAgent = fopFactory.newFOUserAgent();
+userAgent.getRendererOptions().put("pdf-x-mode", "PDF/X-3:2003");
+Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent);
+[..]]]></source>
+      <p>
+        If one of the validation rules of PDF/X is violated, an PDFConformanceException
+        (descendant of RuntimeException) is thrown.
+      </p>
+    </section>
+    <section id="rules">
+      <title>PDF/X in Action</title>
+      <p>
+        There are a number of things that must be looked after if you activate a PDF/X
+        profile. If you receive a PDFConformanceException, have a look at the following
+        list (not necessarily comprehensive):
+      </p>
+      <ul>
+        <li>
+          Make sure all (!) fonts are embedded. If you use base 14 fonts (like Helvetica)
+          you need to obtain a license for them and embed them like any other font.
+        </li>
+        <li>
+          Don't use PDF encryption. PDF/X doesn't allow it.
+        </li>
+        <li>
+          Don't use CMYK images without an ICC color profile. PDF/X doesn't allow mixing
+          color spaces and FOP currently only properly supports the sRGB color space. However,
+          you will need to specify an 
+          <a href="configuration.html#pdf-renderer">output device profile</a>
+          (usually a CMYK profile) in the configuration. sRGB won't work here since it's a 
+          display device profile, not an output device profile.
+        </li>
+        <li>
+          Don't use non-RGB colors in SVG images. Same issue as with CMYK images.
+        </li>
+        <li>
+          Don't use EPS graphics with fo:external-graphic. Embedding EPS graphics in PDF
+          is deprecated since PDF 1.4 and prohibited by PDF/X-3:2003.
+        </li>
+        <li>
+          PDF is forced to version 1.4 if PDF/X-3:2003 is activated.
+        </li>
+      </ul>
+    </section>
+    <section id="profile-compatibility">
+      <title>PDF profile compatibility</title>
+      <p>
+        The PDF profiles "PDF/X-3:2003" and "PDF/A-1b" are compatible and can both be 
+        activated at the same time.
+      </p>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/0.94/running.xml b/src/documentation/content/xdocs/0.94/running.xml
new file mode 100644
index 000000000..c09f35fee
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/running.xml
@@ -0,0 +1,348 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Running Apache FOP</title>
+    <version>$Revision$</version>
+  </header>
+
+  <body>
+    <section id="require">
+      <title>System Requirements</title>
+      <p>The following software must be installed:</p>
+      <ul>
+        <li>Java 1.3.x or later Runtime Environment.</li>
+        <li>
+          Apache FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will 
+          need to run a basic FOP installation. These can be found in the [fop-root]/lib directory. These 
+          libraries include the following:
+          <ul>
+            <li>
+              A JAXP-compatible XML Parser (FOP comes with <a class="fork" href="ext:xerces">Apache Xerces-J</a>).
+            </li>
+            <li>
+              A JAXP-compatible XSLT Processor (FOP comes with <a class="fork" href="ext:xalan">Apache Xalan-J</a>).
+            </li>
+            <li><a class="fork" href="ext:batik">Apache Batik</a>, an SVG library.</li>
+            <li><a class="fork" href="ext:jakarta/commons/logging">Apache Jakarta Commons Logging</a>, a logger abstraction kit.</li>
+            <li><a class="fork" href="ext:jakarta/commons/io">Apache Jakarta Commons IO</a>, a library with I/O utilities.</li>
+            <li><a class="fork" href="ext:excalibur/framework">Apache Excalibur/Avalon Framework</a>, for XML configuration handling.</li>
+          </ul>
+        </li>
+      </ul>
+      <p>The following software is optional, depending on your needs:</p>
+      <ul>
+        <li>
+          Graphics libraries. Generally, FOP contains direct support for the most important
+          bitmap image formats (including PNG, TIFF, JPEG and GIF). If you're using JDK 1.3, 
+          you may need additional packages to get GIF images to work. See 
+          <a href="graphics.html">FOP: Graphics Formats</a> for details.
+        </li>
+        <li>
+          PDF encryption. See <a href="pdfencryption.html">FOP: PDF Encryption</a> for details.
+        </li>
+      </ul>
+      <p>In addition, the following system requirements apply:</p>
+      <ul>
+        <li>
+          If you will be using FOP to process SVG, you must do so in a graphical environment. 
+          See <a href="graphics.html#batik">FOP: Graphics (Batik)</a> for details.
+        </li>
+      </ul>
+    </section>
+    <section id="install">
+      <title>Installation</title>
+      <section id="install-instruct">
+        <title>Instructions</title>
+        <p>
+          Basic FOP installation consists of first unzipping the <code>.gz</code> file that is the 
+          distribution medium, then unarchiving the resulting <code>.tar</code> file in a 
+          directory/folder that is convenient on your system. Please consult your operating system 
+          documentation or Zip application software documentation for instructions specific to your 
+          site.
+        </p>
+      </section>
+      <section id="install-problems">
+        <title>Problems</title>
+        <p>
+          Some Mac OSX users have experienced filename truncation problems using Stuffit to unzip 
+          and unarchive their distribution media. This is a legacy of older Mac operating systems, 
+          which had a 31-character pathname limit. Several Mac OSX users have recommended that 
+          Mac OSX users use the shell command <code>tar -xzf</code> instead.
+        </p>
+      </section>
+    </section>
+    <section id="standalone-start">
+      <title>Starting FOP as a Standalone Application</title>
+      <section id="fop-script">
+        <title>Using the fop script or batch file</title>
+      <p>
+        The usual and recommended practice for starting FOP from the command line is to run the 
+        batch file fop.bat (Windows) or the shell script fop (Unix/Linux).
+        These scripts require that the environment variable JAVA_HOME be 
+        set to a path pointing to the appropriate Java installation on your system. Macintosh OSX 
+        includes a Java environment as part of its distribution. We are told by Mac OSX users that 
+        the path to use in this case is <code>/Library/Java/Home</code>. <strong>Caveat:</strong>
+        We suspect that, as Apple releases new Java environments and as FOP upgrades the minimum 
+        Java requirements, the two will inevitably not match on some systems. Please see 
+        <a href="http://developer.apple.com/java/faq">Java on Mac OSX FAQ</a> for information as 
+        it becomes available.
+      </p>
+      <source><![CDATA[
+USAGE
+Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl|-ps|-txt|-at [mime]|-print] <outfile>
+ [OPTIONS]  
+  -d                debug mode   
+  -x                dump configuration settings  
+  -q                quiet mode  
+  -c cfg.xml        use additional configuration file cfg.xml
+  -l lang           the language to use for user information 
+  -r                relaxed/less strict validation (where available)
+  -dpi xxx          target resolution in dots per inch (dpi) where xxx is a number
+  -s                for area tree XML, down to block areas only
+  -v                to show FOP version being used
+
+  -o [password]     PDF file will be encrypted with option owner password
+  -u [password]     PDF file will be encrypted with option user password
+  -noprint          PDF file will be encrypted without printing permission
+  -nocopy           PDF file will be encrypted without copy content permission
+  -noedit           PDF file will be encrypted without edit content permission
+  -noannotations    PDF file will be encrypted without edit annotation permission
+  -pdfprofile prof  PDF file will be generated with the specified profile
+                    (Examples for prof: PDF/A-1b or PDF/X-3:2003)
+
+ [INPUT]  
+  infile            xsl:fo input file (the same as the next) 
+  -fo  infile       xsl:fo input file  
+  -xml infile       xml input file, must be used together with -xsl 
+  -atin infile      area tree input file 
+  -xsl stylesheet   xslt stylesheet 
+ 
+  -param name value <value> to use for parameter <name> in xslt stylesheet
+                    (repeat '-param name value' for each parameter)
+ 
+ [OUTPUT] 
+  outfile           input will be rendered as PDF into outfile
+  -pdf outfile      input will be rendered as PDF (outfile req'd)
+  -pdfa1b outfile   input will be rendered as PDF/A-1b compliant PDF
+                    (outfile req'd, same as "-pdf outfile -pdfprofile PDF/A-1b")
+  -awt              input will be displayed on screen 
+  -rtf outfile      input will be rendered as RTF (outfile req'd)
+  -pcl outfile      input will be rendered as PCL (outfile req'd) 
+  -ps outfile       input will be rendered as PostScript (outfile req'd) 
+  -afp outfile      input will be rendered as AFP (outfile req'd)
+  -tiff outfile     input will be rendered as TIFF (outfile req'd)
+  -png outfile      input will be rendered as PNG (outfile req'd)
+  -txt outfile      input will be rendered as plain text (outfile req'd) 
+  -at [mime] out    representation of area tree as XML (outfile req'd) 
+                    specify optional mime output to allow AT to be converted
+                    to final format later
+  -print            input file will be rendered and sent to the printer 
+                    see options with "-print help" 
+  -out mime outfile input will be rendered using the given MIME type
+                    (outfile req'd) Example: "-out application/pdf D:\out.pdf"
+                    (Tip: "-out list" prints the list of supported MIME types)
+  -mif outfile      input will be rendered as MIF (FrameMaker) (outfile req'd)
+                    Experimental feature - requires additional fop-sandbox.jar.
+  -svg outfile      input will be rendered as an SVG slides file (outfile req'd) 
+                    Experimental feature - requires additional fop-sandbox.jar.
+
+  -foout outfile    input will only be XSL transformed. The intermediate 
+                    XSL-FO file is saved and no rendering is performed. 
+                    (Only available if you use -xml and -xsl parameters)
+
+
+ [Examples]
+  Fop foo.fo foo.pdf 
+  Fop -fo foo.fo -pdf foo.pdf (does the same as the previous line)
+  Fop -xml foo.xml -xsl foo.xsl -pdf foo.pdf
+  Fop -xml foo.xml -xsl foo.xsl -foout foo.fo
+  Fop foo.fo -mif foo.mif
+  Fop foo.fo -rtf foo.rtf
+  Fop foo.fo -print or Fop -print foo.fo 
+  Fop foo.fo -awt]]></source>
+      <p>
+        PDF encryption is only available if FOP was compiled with encryption support 
+        <strong>and</strong> if compatible encryption support is available at run time. 
+        Currently, only the JCE is supported. Check the <a href="pdfencryption.html">Details</a>.
+      </p>
+      </section>
+      <section id="your-own-script">
+        <title>Writing your own script</title>
+        <p>FOP's entry point for your own scripts is the class
+<code>org.apache.fop.cli.Main</code>. The general pattern for the
+        command line is: <code>java -classpath &lt;CLASSPATH>
+        org.apache.fop.cli.Main &lt;arguments></code>. The arguments
+        consist of the options and infile and outfile specifications
+        as shown above for the standard scripts. You may wish to review
+        the standard scripts to make sure that 
+        you get your environment properly configured. 
+        </p>
+      </section>
+      <section id="jar-option">
+        <title>Running with java's <code>-jar</code> option</title>
+      <p>
+        As an alternative to the start scripts you can run <code>java
+        -jar path/to/build/fop.jar &lt;arguments></code>, relying on
+        FOP to build the classpath for running FOP dynamically, see <a
+        href="#dynamical-classpath">below</a>. If you use hyphenation,
+        you must put <code>fop-hyph.jar</code> in the <code>lib</code>
+        directory.
+      </p>
+
+      <p>You can also run <code>java -jar path/to/fop.jar
+      &lt;arguments></code>, relying on the <code>Class-Path</code>
+      entry in the manifest file. This works if you put
+      <code>fop.jar</code> and all jar files from the <code>lib</code>
+      directory in a single directory. If you use hyphenation, you
+      must also put <code>fop-hyph.jar</code> in that directory.</p>
+
+      <p>In both cases the arguments consist of the options and
+        infile and outfile specifications as shown above for the
+        standard scripts.</p>
+      </section>
+      <section id="dynamical-classpath">
+        <title>FOP's dynamical classpath construction</title>
+
+        <p>If FOP is started without a proper classpath, it tries to
+        add its dependencies dynamically. If the system property
+        <code>fop.home</code> contains the name of a directory, then
+        FOP uses that directory as the base directory for its
+        search. Otherwise the current working directory is the base
+        directory. If the base directory is called <code>build</code>,
+        then its parent directory becomes the base directory.</p>
+
+        <p>FOP expects to find <code>fop.jar</code> in the
+        <code>build</code> subdirectory of the base directory, and
+        adds it to the classpath. Subsequently FOP adds all
+        <code>jar</code> files in the lib directory to the
+        classpath. The lib directory is either the <code>lib</code>
+        subdirectory of the base directory, or, if that does not
+        exist, the base directory itself.</p>
+
+        <p>If the system property <code>fop.optional.lib</code>
+        contains the name of a directory, then all <code>jar</code>
+        files in that directory are also added to the classpath. See
+        the methods <code>getJARList</code> and
+        <code>checkDependencies</code> in
+        <code>org.apache.fop.cli.Main</code>.</p>
+
+      </section>
+    </section>
+    <section id="check-input">
+      <title>Using Xalan to Check XSL-FO Input</title>
+      <p>
+        FOP sessions that use -xml and -xsl input instead of -fo input are actually 
+        controlling two distinct conversions: Tranforming XML to XSL-FO, then formatting 
+        the XSL-FO to PDF (or another FOP output format).
+        Although FOP controls both of these processes, the first is included merely as 
+        a convenience and for performance reasons.
+        Only the second is part of FOP's core processing.
+        If a user has a problem running FOP, it is important to determine which of these 
+        two processes is causing the problem.
+        If the problem is in the first process, the user's stylesheet is likely the cause.
+        The FOP development team does not have resources to help with stylesheet issues, 
+        although we have included links to some useful 
+        <a href="../resources.html#specs">Specifications</a> and 
+        <a href="../resources.html#articles">Books/Articles</a>.
+        If the problem is in the second process, FOP may have a bug or an unimplemented 
+        feature that does require attention from the FOP development team.
+      </p>
+      <note>The user is always responsible to provide correct XSL-FO code to FOP.</note>
+      <p>
+        In the case of using -xml and -xsl input, although the user is responsible for 
+        the XSL-FO code that is FOP's input, it is not visible to the user. To make the 
+        intermediate FO file visible, the FOP distribution includes the "-foout" option 
+        which causes FOP to run only the first (transformation) step, and write the 
+        results to a file. (See also the Xalan command-line below)
+      </p>
+      <note>
+        When asking for help on the FOP mailing lists, <em>never</em> attach XML and 
+        XSL to illustrate the issue. Always run the XSLT step (-foout) and send the 
+        resulting XSL-FO file instead. Of course, be sure that the XSL-FO file is 
+        correct before sending it.
+      </note>
+      <p>
+        The -foout option works the same way as if you would call the 
+        <a href="http://xml.apache.org/xalan-j/commandline.html">Xalan command-line</a>:
+      </p>
+      <p>
+        <code>java org.apache.xalan.xslt.Process -IN xmlfile -XSL file -OUT outfile</code>
+      </p>
+      <p>
+        Note that there are some subtle differences between the FOP and Xalan command-lines.
+      </p>
+    </section>
+    <section id="memory">
+      <title>Memory Usage</title>
+      <p>
+        FOP can consume quite a bit of memory, even though this has been continually improved.
+        This is partly inherent to the formatting process and partly caused by implementation choices.
+        All FO processors currently on the market have memory problems with certain layouts.
+      </p>
+      <p>
+        If you are running out of memory when using FOP, here are some ideas that may help:
+      </p>
+      <ul>
+        <li>
+          Increase memory available to the JVM. See 
+          <a href="http://java.sun.com/j2se/1.3/docs/tooldocs/solaris/java.html">the -Xmx option</a> 
+          for more information.
+          <warning>
+            It is usually unwise to increase the memory allocated to the JVM beyond the amount of 
+            physical RAM, as this will generally cause significantly slower performance.
+          </warning>
+        </li>
+        <li>
+          Avoid forward references.
+          Forward references are references to some later part of a document.
+          Examples include page number citations which refer to pages which follow the citation, 
+          tables of contents at the beginning of a document, and page numbering schemes that 
+          include the total number of pages in the document 
+          (<a href="../faq.html#pagenum">"page N of TOTAL"</a>).
+          Forward references cause all subsequent pages to be held in memory until the reference 
+          can be resolved, i.e. until the page with the referenced element is encountered.
+          Forward references may be required by the task, but if you are getting a memory 
+          overflow, at least consider the possibility of eliminating them.
+          A table of contents could be replaced by PDF bookmarks instead or moved to the end of 
+          the document (reshuffle the paper could after printing).
+        </li>
+        <li>
+          Avoid large images, especially if they are scaled down.
+          If they need to be scaled, scale them in another application upstream from FOP.
+          For many image formats, memory consumption is driven mainly by the size of the image 
+          file itself, not its dimensions (width*height), so increasing the compression rate 
+          may help.
+        </li>
+        <li>
+          Use multiple page sequences.
+          FOP starts rendering after the end of a page sequence is encountered.
+          While the actual rendering is done page-by-page, some additional memory is 
+          freed after the page sequence has been rendered.
+          This can be substantial if the page sequence contains lots of FO elements.
+        </li>
+      </ul>
+    </section>
+    <section id="problems">
+      <title>Problems</title>
+      <p>If you have problems running FOP, please see the <a href="../gethelp.html">"How to get Help" page</a>.</p>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/0.20.5/servlets.xml b/src/documentation/content/xdocs/0.94/servlets.xml
index 1a7514c1e..119ac701e 100644
--- a/src/documentation/content/xdocs/0.20.5/servlets.xml
+++ b/src/documentation/content/xdocs/0.94/servlets.xml
@@ -16,30 +16,29 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
-    "http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/schema/dtd/document-v12.dtd?view=co">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>Servlets</title>
-    <subtitle>How to use FOP in a Servlet</subtitle>
+    <subtitle>How to use Apache FOP in a Servlet</subtitle>
     <version>$Revision$</version>
   </header>
   <body>
     <section id="overview">
       <title>Overview</title>
       <p>
-        This page discusses topic all around using FOP in a servlet environment.
+        This page discusses topic all around using Apache FOP in a servlet environment.
       </p>
     </section>
     <section id="example-servlets">
       <title>Example Servlets in the FOP distribution</title>
       <p>
-        In the directory {fop-dir}/examples/servlet, you'll find a working example
+        In the directory {fop-dir}/src/java/org/apache/fop/servlet, you'll find a working example
         of a FOP-enabled servlet.
       </p>
       <p>
-        You can build the servlet easily by using the supplied Ant script. After building 
-        the servlet, drop fop.war into the webapps directory of Tomcat. Then, you can use 
+        The servlet is automatically built when you build Apache FOP using the supplied Ant script. After building 
+        the servlet, drop fop.war into the webapps directory of Apache Tomcat (or any other web container). Then, you can use 
         URLs like the following to generate PDF files:
       </p>
       <ul>
@@ -47,26 +46,35 @@
         <li>http://localhost:8080/fop/fop?xml=/home/path/to/xmlfile.xml&amp;xsl=/home/path/to/xslfile.xsl</li>
       </ul>
       <p/>
-      <p>The source code for the servlet can be found under {fop-dir}/examples/servlet/src/FopServlet.java.</p>
+      <p>The source code for the servlet can be found under {fop-dir}/src/java/org/apache/fop/servlet/FopServlet.java.</p>
+      <note>
+        This example servlet should not be used on a public web server connected to the Internet as it does not contain
+        any measures to prevent Denial-of-Service-Attacks. It is provided as an example and as a starting point for
+        your own servlet.
+      </note>
     </section>
     <section id="servlet">
       <title>Create your own Servlet</title>
       <note>
-        This section assumes you are familiar with <link href="embedding.html">embedding FOP</link>.
+        This section assumes you are familiar with <a href="embedding.html">embedding FOP</a>.
       </note>
       <section id="minimal-servlet">
         <title>A minimal Servlet</title>
         <p>
           Here is a minimal code snippet to demonstrate the basics:
         </p>
-        <source>public void doGet(HttpServletRequest request,
+        <source>private FopFactory fopFactory = FopFactory.newInstance();
+private TransformerFactory tFactory = TransformerFactory.newInstance();
+        
+public void doGet(HttpServletRequest request,
                    HttpServletResponse response) throws ServletException {
     try {
         response.setContentType("application/pdf");
-        Driver driver = new Driver(new InputSource("foo.fo"),
-                                   response.getOutputStream());
-        driver.setRenderer(Driver.RENDER_PDF);
-        driver.run();
+        Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, response.getOutputStream());
+        Transformer transformer = tFactory.newTransformer();
+        Source src = new StreamSource("foo.fo");
+        Result res = new SAXResult(fop.getDefaultHandler());
+        transformer.transform(src, res);
     } catch (Exception ex) {
         throw new ServletException(ex);
     }
@@ -80,37 +88,32 @@
       <section id="xslt">
         <title>Adding XSL tranformation (XSLT)</title>
         <p>
-          A common requirement is the to transform an XML source to
-          XSLFO using an XSL transformation. It is recommended to use
+          A common requirement is to transform an XML source to
+          XSL-FO using an XSL transformation. It is recommended to use
           JAXP for this task. The following snippet shows the basic
           code:
         </p>
-        <source>
-protected Logger log;
-protected TransformerFactory transformerFactory;
+        <source>private FopFactory fopFactory = FopFactory.newInstance();
+private TransformerFactory tFactory = TransformerFactory.newInstance();
 
 public void init() throws ServletException {
-    this.log = new SimpleLog(SimpleLog.LOG_LEVEL_WARN);
-    this.transformerFactory = TransformerFactory.newInstance();
+    //Optionally customize the FopFactory and TransformerFactory here
 }
 
 [..]
 
-    //Setup FOP
-    Driver driver = new Driver();
-    driver.setLogger(this.log);
-    driver.setRenderer(Driver.RENDER_PDF);
-
     //Setup a buffer to obtain the content length
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    driver.setOutputStream(out);
+
+    //Setup FOP
+    Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out);
 
     //Setup Transformer
     Source xsltSrc = new StreamSource(new File("foo-xml2fo.xsl"));
-    Transformer transformer = this.transformerFactory.newTransformer(xsltSrc);
+    Transformer transformer = tFactory.newTransformer(xsltSrc);
 
     //Make sure the XSL transformation's result is piped through to FOP
-    Result res = new SAXResult(driver.getContentHandler());
+    Result res = new SAXResult(fop.getDefaultHandler());
 
     //Setup input
     Source src = new StreamSource(new File("foo.xml"));
@@ -127,7 +130,7 @@ public void init() throws ServletException {
     response.getOutputStream().flush();</source>
         <note>
           Buffering the generated PDF in a ByteArrayOutputStream is done to avoid potential 
-          problems with the Acrobat Reader Plug-in in IEx.
+          problems with the Acrobat Reader Plug-in in Microsoft Internet Explorer.
         </note>
         <p>
           The <code>Source</code> instance used above is simply an
@@ -141,21 +144,14 @@ public void init() throws ServletException {
         </p>
         <p>
           Because you have an explicit <code>Transformer</code> object, you can also use it to 
-          explicitly set parameters for the transformation run.
+          explicitely set parameters for the transformation run.
         </p>
       </section>
       <section id="cfg">
         <title>Custom configuration</title>
         <p>
-          If you need to supply a special configuration do this in the <code>init()</code> 
-          method so it will only be done once and to avoid multithreading problems.
+          You can easily set up your own FOUserAgent as demonstrated on the <a href="embedding.html">Embedding page</a>.
         </p>
-        <source>public void init() throws ServletException {
-    [..]
-    new Options(new File("userconfig.xml"));
-    //or
-    Configuration.put("baseDir", "/my/base/dir");
-}</source>
       </section>
       <section id="performance">
         <title>Improving performance</title>
@@ -165,7 +161,8 @@ public void init() throws ServletException {
         <ul>
           <li>
             Instead of java.io.ByteArrayOutputStream consider using the ByteArrayOutputStream
-            implementation from the Jakarta Commons IO project which allocates less memory.
+            implementation from the <a href="ext:jakarta/commons/io">Jakarta Commons IO project</a> which allocates less memory.
+            The full class name is: <code>org.apache.commons.io.output.ByteArrayOutputStream</code>
           </li>
           <li>
             In certain cases it can help to write the generated PDF to a temporary file so
@@ -176,10 +173,75 @@ public void init() throws ServletException {
         </ul>
         <p>
           Of course, the 
-          <link href="embedding.html#performance">performance hints from the Embedding page</link>
+          <a href="embedding.html#performance">performance hints from the Embedding page</a>
           apply here, too.
         </p>
       </section>
+      <section id="uriresolver">
+        <title>Accessing resources in your web application</title>
+        <p>
+          Often, you will want to use resources (stylesheets, images etc.) which are bundled with
+          your web application. FOP provides a URIResolver implementation that lets you access
+          files via the Servlet's ServletContext. The class is called 
+          <code>org.apache.fop.servlet.ServletContextURIResolver</code>.
+        </p>
+        <p>
+          Here's how to set it up in your servlet. Instantiate a new instance in the servlet's 
+          init() method:
+        </p>
+        <source><![CDATA[
+    /** URIResolver for use by this servlet */
+    protected URIResolver uriResolver; 
+
+    public void init() throws ServletException {
+        this.uriResolver = new ServletContextURIResolver(getServletContext());
+        [..]
+    }]]></source>
+        <p>
+          The ServletContextURIResolver reacts on URIs beginning with "servlet-context:". If you
+          want to access an image in a subdirectory of your web application, you could, for
+          example, use: "servlet-context:/images/myimage.png". Don't forget the leading slash
+          after the colon!
+        </p>
+        <p>
+          Further down, you can use the URIResolver for various things:
+        </p>
+        <ul>
+          <li>
+            With the Transformer (JAXP/XSLT) so things like document() functions can resolver 
+            "servlet-context:" URIs.
+          </li>
+          <li>
+            With the FopFactory so every resource FOP loads can be loaded using a "servlet-context:"
+            URI.
+          </li>
+          <li>
+            You can the ServletContextURIResolver yourself in your servlet code to access
+            stylesheets or XML files bundled with your web application.
+          </li>
+        </ul>
+        <p>
+          Here are some example snippets:
+        </p>
+        <source><![CDATA[
+//Setting up the JAXP TransformerFactory
+this.transFactory = TransformerFactory.newInstance();
+this.transFactory.setURIResolver(this.uriResolver);
+
+[..]
+
+//Setting up the FOP factory
+this.fopFactory = FopFactory.newInstance();
+this.fopFactory.setURIResolver(this.uriResolver);
+
+[..]
+
+//The stylesheet for the JAXP Transfomer
+Source xsltSrc = this.uriResolver.resolve(
+    "servlet-context:/xslt/mystylesheet.xsl", null);
+Transformer transformer = this.transFactory.newTransformer(xsltSrc);
+transformer.setURIResolver(this.uriResolver);]]></source>
+      </section>
     </section>
     <section id="ie">
       <title>Notes on Microsoft Internet Explorer</title>
@@ -255,10 +317,9 @@ public void init() throws ServletException {
       <p>
         Sometimes the requirements for a servlet get quite sophisticated: SQL data sources, 
         multiple XSL transformations, merging of several datasources etc. In such a case 
-        consider using <fork href="http://cocoon.apache.org">Apache Cocoon</fork> instead 
+        consider using <a class="fork" href="ext:cocoon">Apache Cocoon</a> instead 
         of a custom servlet to accomplish your goal.
       </p>
     </section>
   </body>
-</document>
-<!-- Last Line of $RCSfile$ -->
+</document>
+\ No newline at end of file
diff --git a/src/documentation/content/xdocs/0.94/upgrading.xml b/src/documentation/content/xdocs/0.94/upgrading.xml
new file mode 100644
index 000000000..b9bec0d66
--- /dev/null
+++ b/src/documentation/content/xdocs/0.94/upgrading.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
+<document>
+  <header>
+    <title>Upgrading from an Earlier Version of Apache FOP</title>
+    <version>$Revision$</version>
+  </header>
+  <body>
+    <section id="important">
+      <title>Important!</title>
+      <p>
+        If you're planning to upgrade to the latest FOP version there are a few very important things 
+        to consider:
+      </p>
+      <ul>
+        <li>
+          More than half of the codebase has been rewritten over the last three years. With version 0.93 the code has reached <strong>production level</strong>, and
+          the tradition continues with version 0.94.
+        </li>
+        <li>
+          The API of FOP has changed considerably and is not
+          backwards-compatible with versions 0.20.5 and
+          0.91beta. Version 0.92 introduced the <strong>new stable
+          API</strong>.
+        </li>
+        <li>
+          Since version 0.92 some deprecated methods which were part
+          of the old API have been removed. If you upgrade from 0.91
+          beta, you will need to adjust your Java code. Similarly if
+          you upgrade from 0.92 and use deprecated methods.
+        </li>
+        <li>
+          If you are using a configuration file for version 0.20.5, you have to rebuild it in the new format. The format
+          of the configuration files has changed since version 0.20.5. See <code>conf/fop.xconf</code> for
+          an example configuration file. A XML Schema file can be found under
+          <code>src/foschema/fop-configuration.xsd</code>.
+        </li>
+        <li>
+          If you are using font metrics files for version 0.20.5 or
+          0.92 or earlier, you have to regenerate them in the new
+          format. The new format is characterized by a version
+          attribute on the top-level font-metrics element, whose value
+          is 2.0. The absence of a version attribute will be
+          interpreted as version 1.0, and such metrics files will no
+          longer be parsed.
+        </li>
+        <li>
+          <p>
+            The new code is much more strict about the interpretation of the XSL-FO 1.0 specification.
+            Things that worked fine in version 0.20.5 might start to produce warnings or even errors
+            now. FOP 0.20.5 contains many bugs which have been corrected in the new code.
+          </p>
+          <note label="An example">
+            While FOP 0.20.5 allowed you to have empty <code>fo:table-cell</code> elements, the new code
+            will complain about that (unless <a href="/0.94/running.html#fop-script">relaxed validation is enabled</a> via the <code>-r</code> switch via the command line) because the specification
+            demands at least one block-level element (<code>(%block;)+</code>, see 
+            <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-cell">XSL-FO 1.0, 6.7.10</a>)
+            inside an <code>fo:table-cell</code> element.
+          </note>
+        </li>
+        <li>
+          Extensions and Renderers written for version 0.20.5 will not work with the new code! The new FOP 
+          extension for <a href="http://barcode4j.krysalis.org">Barcode4J</a> is available since 
+          January 2007.
+        </li>
+        <li>
+          The SVG Renderer and the MIF Handler have not been resurrected, yet! They are currently non-functional
+          and hope for someone to step up and reimplement them.
+        </li>
+      </ul>
+    </section>
+    <section id="issues">
+      <title>What you need to know when you upgrade!</title>
+      <p>
+        When you use your existing FO files or XML/XSL files which work fine with FOP version
+        0.20.5 against this FOP version some things may not work as expected. The following
+        list will hopefully help you to identify and correct those problems.
+      </p>
+      <ul>
+        <li>
+          Check the <a href="../compliance.html">Compliance page</a> for the feature causing
+          trouble. It may contain the necessary information to understand and resolve the problem.
+        </li>
+        <li>
+          Not all 0.20.5 output formats are supported. PDF and Postscript should be fully supported.
+          See <a href="output.html">Output Targets</a> for a more complete description.
+        </li>
+        <li>
+          As stated above empty table cells <code>&lt;fo:table-cell&gt;&lt;/fo:table-cell&gt;</code>
+          are not allowed by the specification. The same applies to empty <code>static-content</code>
+          and <code>block-container</code> elements, for example.
+        </li>
+        <li>
+          0.20.5 is not XSL-FO compliant with respect to sizing images (<code>external-graphic</code>) 
+          or <code>instream-foreign-object</code>
+          objects. If images or SVGs are sized differently in your outputs with the new FOP version
+          check <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37136">Bug 37136</a>
+          as it contains some hints on what to do. The file 
+          <a href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/fo/basic/images.fo?view=markup">
+          <code>"examples/fo/basic/images.fo"</code></a> has
+          a number of good examples that show the new, more correct behaviour.
+        </li>
+        <li>
+          The <code>fox:outline</code> extension is not implemented in this version anymore. 
+          It has been superseded by the new bookmark elements from XSL-FO 1.1.
+        </li>
+        <li>
+          The <code>fox:destination</code> extension is also not implemented in this version
+          although it may be added in the future. See also
+          <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=37157">Bug 37157</a>.
+        </li>
+      </ul>
+    </section>
+  </body>
+</document>
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index 4860eb5c7..2a2768457 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -190,8104 +190,5748 @@
   <table border="1">
     <tr>
       <th rowspan="2">
-        Object Name
-      </th>
+        Object Name      </th>
       <th rowspan="2" align="center">
-        XSL-FO Conformance Level
-      </th>
+        XSL-FO Conformance Level      </th>
       <th rowspan="2" align="center">
-        Citation 
-      </th>
-      <th colspan="3" align="center">
-        Support&nbsp;in&nbsp;FOP
-      </th>
+        Citation      </th>
+      <th colspan="4" align="center">
+        Support&nbsp;in&nbsp;FOP      </th>
       <th rowspan="2">
-        Comments 
-      </th>
+        Comments      </th>
     </tr>
     <tr>
       <th align="center">
-        0.20.5 (previous)
-      </th>
+        0.20.5 (previous)      </th>
+      <th align="center"> 0.93 (stable) </th>
       <th align="center">
-        0.93 (stable)
-      </th>
+        0.94 (stable)      </th>
       <th align="center">
-        develop- ment
-      </th>
+        develop- ment      </th>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-decl-section">Declarations and Pagination and Layout Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N10029-Declarations-and-Pagination-and-Layout-Formatting-Objects">&sect;6.4</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-decl-section">Declarations and Pagination and Layout Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N10029-Declarations-and-Pagination-and-Layout-Formatting-Objects">&sect;6.4</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-root">root</a>
-      </td>
+        <a name="fo-object-root">root</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_root">&sect;6.4.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_root">&sect;6.4.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-declarations">declarations</a>
-      </td>
+        <a name="fo-object-declarations">declarations</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_declarations">&sect;6.4.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_declarations">&sect;6.4.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-color-profile">color-profile</a>
-      </td>
+        <a name="fo-object-color-profile">color-profile</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_color-profile">&sect;6.4.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_color-profile">&sect;6.4.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-page-sequence">page-sequence</a>
-      </td>
+        <a name="fo-object-page-sequence">page-sequence</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-sequence">&sect;6.4.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-sequence">&sect;6.4.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-layout-master-set">layout-master-set</a>
-      </td>
+        <a name="fo-object-layout-master-set">layout-master-set</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_layout-master-set">&sect;6.4.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_layout-master-set">&sect;6.4.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-page-sequence-master">page-sequence-master</a>
-      </td>
+        <a name="fo-object-page-sequence-master">page-sequence-master</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-sequence-master">&sect;6.4.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-sequence-master">&sect;6.4.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-single-page-master-reference">single-page-master-reference</a>
-      </td>
+        <a name="fo-object-single-page-master-reference">single-page-master-reference</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_single-page-master-reference">&sect;6.4.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_single-page-master-reference">&sect;6.4.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-repeatable-page-master-reference">repeatable-page-master-reference</a>
-      </td>
+        <a name="fo-object-repeatable-page-master-reference">repeatable-page-master-reference</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_repeatable-page-master-reference">&sect;6.4.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_repeatable-page-master-reference">&sect;6.4.9</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-repeatable-page-master-alternatives">repeatable-page-master-alternatives</a>
-      </td>
+        <a name="fo-object-repeatable-page-master-alternatives">repeatable-page-master-alternatives</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_repeatable-page-master-alternatives">&sect;6.4.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_repeatable-page-master-alternatives">&sect;6.4.10</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-conditional-page-master-reference">conditional-page-master-reference</a>
-      </td>
+        <a name="fo-object-conditional-page-master-reference">conditional-page-master-reference</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_conditional-page-master-reference">&sect;6.4.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_conditional-page-master-reference">&sect;6.4.11</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-simple-page-master">simple-page-master</a>
-      </td>
+        <a name="fo-object-simple-page-master">simple-page-master</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_simple-page-master">&sect;6.4.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_simple-page-master">&sect;6.4.12</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="center">
         <ul>
           <li>
-            [0.93] The page width may not change among pages of the same page-sequence
-            unless a forced break is inserted.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] The page width may not change among pages of the same page-sequence
+            unless a forced break is inserted.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-region-body">region-body</a>
-      </td>
+        <a name="fo-object-region-body">region-body</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-body">&sect;6.4.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-body">&sect;6.4.13</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-      </td>
+        yes      </td>
+      <td align="center">      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-region-before">region-before</a>
-      </td>
+        <a name="fo-object-region-before">region-before</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-before">&sect;6.4.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-before">&sect;6.4.14</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-region-after">region-after</a>
-      </td>
+        <a name="fo-object-region-after">region-after</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-after">&sect;6.4.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-after">&sect;6.4.15</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-region-start">region-start</a>
-      </td>
+        <a name="fo-object-region-start">region-start</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-start">&sect;6.4.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-start">&sect;6.4.16</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-region-end">region-end</a>
-      </td>
+        <a name="fo-object-region-end">region-end</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-end">&sect;6.4.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_region-end">&sect;6.4.17</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-flow">flow</a>
-      </td>
+        <a name="fo-object-flow">flow</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_flow">&sect;6.4.18</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_flow">&sect;6.4.18</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-static-content">static-content</a>
-      </td>
+        <a name="fo-object-static-content">static-content</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_static-content">&sect;6.4.19</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_static-content">&sect;6.4.19</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-title">title</a>
-      </td>
+        <a name="fo-object-title">title</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_title">&sect;6.4.20</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_title">&sect;6.4.20</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-block-section">Block Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N12764-Block-level-Formatting-Objects">&sect;6.5</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-block-section">Block Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N12764-Block-level-Formatting-Objects">&sect;6.5</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-block">block</a>
-      </td>
+        <a name="fo-object-block">block</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_block">&sect;6.5.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_block">&sect;6.5.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-block-container">block-container</a>
-      </td>
+        <a name="fo-object-block-container">block-container</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_block-container">&sect;6.5.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_block-container">&sect;6.5.3</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Currently only works as direct child of fo:flow.
-          </li>
+            [0.20.5] Currently only works as direct child of fo:flow.          </li>
           <li>
-            [0.20.5] For absolute positioning, use 'position="absolute"' (as 'absolute-position="absolute"' is not implemented), and specify all four of "left", "top", "width" and "height"
-          </li>
+            [0.20.5] For absolute positioning, use 'position="absolute"' (as 'absolute-position="absolute"' is not implemented), and specify all four of "left", "top", "width" and "height"          </li>
           <li>
-            [0.93] No known restrictions.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] No known restrictions.          </li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-inline-section">Inline Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N13277-Inline-level-Formatting-Objects">&sect;6.6</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-inline-section">Inline Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N13277-Inline-level-Formatting-Objects">&sect;6.6</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-bidi-override">bidi-override</a>
-      </td>
+        <a name="fo-object-bidi-override">bidi-override</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_bidi-override">&sect;6.6.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_bidi-override">&sect;6.6.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-character">character</a>
-      </td>
+        <a name="fo-object-character">character</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_character">&sect;6.6.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_character">&sect;6.6.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-initial-property-set">initial-property-set</a>
-      </td>
+        <a name="fo-object-initial-property-set">initial-property-set</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_initial-property-set">&sect;6.6.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_initial-property-set">&sect;6.6.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-external-graphic">external-graphic</a>
-      </td>
+        <a name="fo-object-external-graphic">external-graphic</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_external-graphic">&sect;6.6.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_external-graphic">&sect;6.6.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-instream-foreign-object">instream-foreign-object</a>
-      </td>
+        <a name="fo-object-instream-foreign-object">instream-foreign-object</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_instream-foreign-object">&sect;6.6.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_instream-foreign-object">&sect;6.6.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="center">
         <ul>
           <li>Built-in support for SVG only, additional namespaces through optional extensions.</li>
-        </ul>
-      </td>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-inline">inline</a>
-      </td>
+        <a name="fo-object-inline">inline</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_inline">&sect;6.6.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_inline">&sect;6.6.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-inline-container">inline-container</a>
-      </td>
+        <a name="fo-object-inline-container">inline-container</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_inline-container">&sect;6.6.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_inline-container">&sect;6.6.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-leader">leader</a>
-      </td>
+        <a name="fo-object-leader">leader</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_leader">&sect;6.6.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_leader">&sect;6.6.9</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-page-number">page-number</a>
-      </td>
+        <a name="fo-object-page-number">page-number</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-number">&sect;6.6.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-number">&sect;6.6.10</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-page-number-citation">page-number-citation</a>
-      </td>
+        <a name="fo-object-page-number-citation">page-number-citation</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-number-citation">&sect;6.6.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_page-number-citation">&sect;6.6.11</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Only works for table of contents without any problems. The case where the page number doesn't fit on a line isn't handled, and any text on the same line and after the page-number might not appear exactly where you want it to.
-          </li>
+            [0.20.5] Only works for table of contents without any problems. The case where the page number doesn't fit on a line isn't handled, and any text on the same line and after the page-number might not appear exactly where you want it to.          </li>
           <li>
-            [0.93] After the page number is known, no relayout is performed. The appearance may be suboptimal depending on the use case.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] After the page number is known, no relayout is performed. The appearance may be suboptimal depending on the use case.          </li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-table-section">Table Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N15442-Formatting-Objects-for-Tables">&sect;6.7</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-table-section">Table Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N15442-Formatting-Objects-for-Tables">&sect;6.7</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-and-caption">table-and-caption</a>
-      </td>
+        <a name="fo-object-table-and-caption">table-and-caption</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-and-caption">&sect;6.7.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-and-caption">&sect;6.7.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table">table</a>
-      </td>
+        <a name="fo-object-table">table</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table">&sect;6.7.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table">&sect;6.7.3</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
-          <li>
-            [0.93] Only border-collapse="separate" is supported and there's no support for automatic column widths.
-          </li>
+          <li>[0.20.5&ndash;0.93] Only border-collapse="separate"</li>
+          <li>[All] No support for auto layout yet</li>
         </ul>
       </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-column">table-column</a>
-      </td>
+        <a name="fo-object-table-column">table-column</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-column">&sect;6.7.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-column">&sect;6.7.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] You must explicitly specify column widths.
-          </li>
-        </ul>
-      </td>
+            [0.20.5] You must explicitly specify column widths.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-caption">table-caption</a>
-      </td>
+        <a name="fo-object-table-caption">table-caption</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-caption">&sect;6.7.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-caption">&sect;6.7.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-header">table-header</a>
-      </td>
+        <a name="fo-object-table-header">table-header</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-header">&sect;6.7.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-header">&sect;6.7.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-footer">table-footer</a>
-      </td>
+        <a name="fo-object-table-footer">table-footer</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-footer">&sect;6.7.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-footer">&sect;6.7.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-body">table-body</a>
-      </td>
+        <a name="fo-object-table-body">table-body</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-body">&sect;6.7.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-body">&sect;6.7.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-row">table-row</a>
-      </td>
+        <a name="fo-object-table-row">table-row</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-row">&sect;6.7.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-row">&sect;6.7.9</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-table-cell">table-cell</a>
-      </td>
+        <a name="fo-object-table-cell">table-cell</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-cell">&sect;6.7.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_table-cell">&sect;6.7.10</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="left">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="left">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-list-section">List Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N17076-Formatting-Objects-for-Lists">&sect;6.8</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-list-section">List Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N17076-Formatting-Objects-for-Lists">&sect;6.8</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-list-block">list-block</a>
-      </td>
+        <a name="fo-object-list-block">list-block</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-block">&sect;6.8.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-block">&sect;6.8.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-list-item">list-item</a>
-      </td>
+        <a name="fo-object-list-item">list-item</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item">&sect;6.8.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item">&sect;6.8.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-list-item-body">list-item-body</a>
-      </td>
+        <a name="fo-object-list-item-body">list-item-body</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item-body">&sect;6.8.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item-body">&sect;6.8.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-list-item-label">list-item-label</a>
-      </td>
+        <a name="fo-object-list-item-label">list-item-label</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item-label">&sect;6.8.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_list-item-label">&sect;6.8.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-link-section">Link and Multi Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N17805-Dynamic-Effects:-Link-and-Multi-Formatting-Objects">&sect;6.9</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-link-section">Link and Multi Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N17805-Dynamic-Effects:-Link-and-Multi-Formatting-Objects">&sect;6.9</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-basic-link">basic-link</a>
-      </td>
+        <a name="fo-object-basic-link">basic-link</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_basic-link">&sect;6.9.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_basic-link">&sect;6.9.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            both internal and external supported
-          </li>
-        </ul>
-      </td>
+            both internal and external supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-multi-switch">multi-switch</a>
-      </td>
+        <a name="fo-object-multi-switch">multi-switch</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-switch">&sect;6.9.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-switch">&sect;6.9.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-multi-case">multi-case</a>
-      </td>
+        <a name="fo-object-multi-case">multi-case</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-case">&sect;6.9.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-case">&sect;6.9.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-multi-toggle">multi-toggle</a>
-      </td>
+        <a name="fo-object-multi-toggle">multi-toggle</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-toggle">&sect;6.9.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-toggle">&sect;6.9.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-multi-properties">multi-properties</a>
-      </td>
+        <a name="fo-object-multi-properties">multi-properties</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-properties">&sect;6.9.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-properties">&sect;6.9.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-multi-property-set">multi-property-set</a>
-      </td>
+        <a name="fo-object-multi-property-set">multi-property-set</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-property-set">&sect;6.9.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_multi-property-set">&sect;6.9.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-bookmarks-section">Formatting Objects for Bookmarks</a> (<a href="http://www.w3.org/TR/xsl11/#d0e14206">&sect;6.11 in XSL 1.1 WD</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-bookmarks-section">Formatting Objects for Bookmarks</a> (<a href="http://www.w3.org/TR/xsl11/#d0e14206">&sect;6.11 in XSL 1.1 WD</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-bookmark-tree">bookmark-tree</a> (since XSL 1.1)
-      </td>
+        <a name="fo-object-bookmark-tree">bookmark-tree</a> (since XSL 1.1)      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">&sect;6.11.1 in XSL 1.1 WD</a>
-      </td>
+        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">&sect;6.11.1 in XSL 1.1 WD</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>[0.20.5] Uses the proprietary fox:outline extension.</li>
-        </ul>
-      </td>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-bookmark">bookmark</a> (since XSL 1.1)
-      </td>
+        <a name="fo-object-bookmark">bookmark</a> (since XSL 1.1)      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark">&sect;6.11.2 in XSL 1.1 WD</a>
-      </td>
+        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark">&sect;6.11.2 in XSL 1.1 WD</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>[0.20.5] Uses the proprietary fox:outline extension.</li>
-        </ul>
-      </td>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-bookmark-title">bookmark-title</a> (since XSL 1.1)
-      </td>
+        <a name="fo-object-bookmark-title">bookmark-title</a> (since XSL 1.1)      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-title">&sect;6.11.3 in XSL 1.1 WD</a>
-      </td>
+        <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-title">&sect;6.11.3 in XSL 1.1 WD</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>[0.20.5] Uses the proprietary fox:outline extension.</li>
-          <li>[0.93] color, font-style and font-weight are not supported, yet.</li>
-        </ul>
-      </td>
+          <li>[0.93 and later] color, font-style and font-weight are not supported, yet.</li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-outofline-section">Out-of-line Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N18509-Out-of-Line-Formatting-Objects">&sect;6.10</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-outofline-section">Out-of-line Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N18509-Out-of-Line-Formatting-Objects">&sect;6.10</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-float">float</a>
-      </td>
+        <a name="fo-object-float">float</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_float">&sect;6.10.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_float">&sect;6.10.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-footnote">footnote</a>
-      </td>
+        <a name="fo-object-footnote">footnote</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_footnote">&sect;6.10.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_footnote">&sect;6.10.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
-          <li>[0.93] Restrictions with multi-column documents.</li>
-        </ul>
-      </td>
+          <li>[0.20.5] Footnotes sometimes overlap with the main content</li>
+          <li>[0.93 and later] Restrictions with multi-column documents.</li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-footnote-body">footnote-body</a>
-      </td>
+        <a name="fo-object-footnote-body">footnote-body</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_footnote-body">&sect;6.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_footnote-body">&sect;6.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-object-other-section">Other Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N19019-Other-Formatting-Objects">&sect;6.11</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-object-other-section">Other Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#section-N19019-Other-Formatting-Objects">&sect;6.11</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-wrapper">wrapper</a>
-      </td>
+        <a name="fo-object-wrapper">wrapper</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_wrapper">&sect;6.11.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_wrapper">&sect;6.11.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
-          <li>[0.93] Only works as expected with inline-level content.</li>
-        </ul>
-      </td>
+          <li>[0.93 and later] Only works as expected with inline-level content.</li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-marker">marker</a>
-      </td>
+        <a name="fo-object-marker">marker</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_marker">&sect;6.11.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_marker">&sect;6.11.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-object-retrieve-marker">retrieve-marker</a>
-      </td>
+        <a name="fo-object-retrieve-marker">retrieve-marker</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_retrieve-marker">&sect;6.11.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_retrieve-marker">&sect;6.11.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
   </table>
-  <h1><a name="fo-property-section">XSL-FO Property Support Table</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pr-section">&sect;7</a>)</h1>
+<h1><a name="fo-property-section">XSL-FO Property Support Table</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pr-section">&sect;7</a>)</h1>
   <p>
     The following is a summary of FOP's current support for the standard XSL-FO properties.
   </p>
   <table border="1">
     <tr>
       <th rowspan="2">
-        Property Name
-      </th>
+        Property Name      </th>
       <th rowspan="2" align="center">
-        XSL-FO Conformance Level
-      </th>
+        XSL-FO Conformance Level      </th>
       <th rowspan="2" align="center">
-        Citation 
-      </th>
-      <th colspan="3" align="center">
-        Support&nbsp;in&nbsp;FOP
-      </th>
+        Citation      </th>
+      <th colspan="4" align="center">
+        Support&nbsp;in&nbsp;FOP      </th>
       <th rowspan="2">
-        Comments 
-      </th>
+        Comments      </th>
     </tr>
     <tr>
       <th align="center">
-        0.20.5 (previous)
-      </th>
+        0.20.5 (previous)      </th>
+      <th align="center">0.93 (stable) </th>
       <th align="center">
-        0.93 (stable)
-      </th>
+        0.94 (stable)      </th>
       <th align="center">
-        develop- ment
-      </th>
+        develop- ment      </th>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonaccess-section">Common Accessibility Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-accessibility-properties">&sect;7.4</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonaccess-section">Common Accessibility Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-accessibility-properties">&sect;7.4</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-source-document">source-document</a>
-      </td>
+        <a name="fo-property-source-document">source-document</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#source-document">&sect;7.4.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#source-document">&sect;7.4.1</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-role">role</a>
-      </td>
+        <a name="fo-property-role">role</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#role">&sect;7.4.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#role">&sect;7.4.2</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonabspos-section">Common Absolute Position Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-absolute-position-properties">&sect;7.5</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonabspos-section">Common Absolute Position Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-absolute-position-properties">&sect;7.5</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-absolute-position">absolute-position</a>
-      </td>
+        <a name="fo-property-absolute-position">absolute-position</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#absolute-position">&sect;7.5.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#absolute-position">&sect;7.5.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Use shorthand position="absolute" as a workaround.
-          </li>
+            [0.20.5] Use shorthand position="absolute" as a workaround.          </li>
           <li>
-            [0.93] No restrictions. The 0.20.5 work-around is not supported.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] No restrictions. The 0.20.5 work-around is not supported.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-top">top</a>
-      </td>
+        <a name="fo-property-top">top</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#top">&sect;7.5.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#top">&sect;7.5.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-right">right</a>
-      </td>
+        <a name="fo-property-right">right</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#right">&sect;7.5.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#right">&sect;7.5.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-bottom">bottom</a>
-      </td>
+        <a name="fo-property-bottom">bottom</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#bottom">&sect;7.5.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#bottom">&sect;7.5.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-left">left</a>
-      </td>
+        <a name="fo-property-left">left</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#left">&sect;7.5.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#left">&sect;7.5.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonaural-section">Common Aural Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-aural-properties">&sect;7.6</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonaural-section">Common Aural Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-aural-properties">&sect;7.6</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-azimuth">azimuth</a>
-      </td>
+        <a name="fo-property-azimuth">azimuth</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#azimuth">&sect;7.6.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#azimuth">&sect;7.6.1</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-cue-after">cue-after</a>
-      </td>
+        <a name="fo-property-cue-after">cue-after</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue-after">&sect;7.6.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue-after">&sect;7.6.2</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-cue-before">cue-before</a>
-      </td>
+        <a name="fo-property-cue-before">cue-before</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue-before">&sect;7.6.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue-before">&sect;7.6.3</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-elevation">elevation</a>
-      </td>
+        <a name="fo-property-elevation">elevation</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#elevation">&sect;7.6.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#elevation">&sect;7.6.4</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-pause-after">pause-after</a>
-      </td>
+        <a name="fo-property-pause-after">pause-after</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause-after">&sect;7.6.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause-after">&sect;7.6.5</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-pause-before">pause-before</a>
-      </td>
+        <a name="fo-property-pause-before">pause-before</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause-before">&sect;7.6.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause-before">&sect;7.6.6</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-pitch">pitch</a>
-      </td>
+        <a name="fo-property-pitch">pitch</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pitch">&sect;7.6.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pitch">&sect;7.6.7</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-pitch-range">pitch-range</a>
-      </td>
+        <a name="fo-property-pitch-range">pitch-range</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pitch-range">&sect;7.6.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pitch-range">&sect;7.6.8</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-play-during">play-during</a>
-      </td>
+        <a name="fo-property-play-during">play-during</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#play-during">&sect;7.6.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#play-during">&sect;7.6.9</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-richness">richness</a>
-      </td>
+        <a name="fo-property-richness">richness</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#richness">&sect;7.6.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#richness">&sect;7.6.10</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-speak">speak</a>
-      </td>
+        <a name="fo-property-speak">speak</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak">&sect;7.6.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak">&sect;7.6.11</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-speak-header">speak-header</a>
-      </td>
+        <a name="fo-property-speak-header">speak-header</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-header">&sect;7.6.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-header">&sect;7.6.12</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-speak-numeral">speak-numeral</a>
-      </td>
+        <a name="fo-property-speak-numeral">speak-numeral</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-numeral">&sect;7.6.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-numeral">&sect;7.6.13</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-speak-punctuation">speak-punctuation</a>
-      </td>
+        <a name="fo-property-speak-punctuation">speak-punctuation</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-punctuation">&sect;7.6.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speak-punctuation">&sect;7.6.14</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-speech-rate">speech-rate</a>
-      </td>
+        <a name="fo-property-speech-rate">speech-rate</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speech-rate">&sect;7.6.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#speech-rate">&sect;7.6.15</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-stress">stress</a>
-      </td>
+        <a name="fo-property-stress">stress</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#stress">&sect;7.6.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#stress">&sect;7.6.16</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-voice-family">voice-family</a>
-      </td>
+        <a name="fo-property-voice-family">voice-family</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#voice-family">&sect;7.6.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#voice-family">&sect;7.6.17</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-volume">volume</a>
-      </td>
+        <a name="fo-property-volume">volume</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#volume">&sect;7.6.18</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#volume">&sect;7.6.18</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonenv-section">Common Border, Padding, and Background Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-border-padding-and-background-properties">&sect;7.7</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonenv-section">Common Border, Padding, and Background Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-border-padding-and-background-properties">&sect;7.7</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-attachment">background-attachment</a>
-      </td>
+        <a name="fo-property-background-attachment">background-attachment</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-attachment">&sect;7.7.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-attachment">&sect;7.7.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-color">background-color</a>
-      </td>
+        <a name="fo-property-background-color">background-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-color">&sect;7.7.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-color">&sect;7.7.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.93] not yet implemented for table-column, table-body, table-header and table-footer.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] not yet implemented for table-column, table-body, table-header and table-footer.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-image">background-image</a>
-      </td>
+        <a name="fo-property-background-image">background-image</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-image">&sect;7.7.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-image">&sect;7.7.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.93] not yet implemented for table-column, table-body, table-header and table-footer.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] not yet implemented for table-column, table-body, table-header and table-footer.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-repeat">background-repeat</a>
-      </td>
+        <a name="fo-property-background-repeat">background-repeat</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-repeat">&sect;7.7.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-repeat">&sect;7.7.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-position-horizontal">background-position-horizontal</a>
-      </td>
+        <a name="fo-property-background-position-horizontal">background-position-horizontal</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position-horizontal">&sect;7.7.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position-horizontal">&sect;7.7.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-position-vertical">background-position-vertical</a>
-      </td>
+        <a name="fo-property-background-position-vertical">background-position-vertical</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position-vertical">&sect;7.7.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position-vertical">&sect;7.7.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-before-color">border-before-color</a>
-      </td>
+        <a name="fo-property-border-before-color">border-before-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-color">&sect;7.7.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-color">&sect;7.7.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-before-style">border-before-style</a>
-      </td>
+        <a name="fo-property-border-before-style">border-before-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-style">&sect;7.7.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-style">&sect;7.7.8</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-before-width">border-before-width</a>
-      </td>
+        <a name="fo-property-border-before-width">border-before-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-width">&sect;7.7.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-width">&sect;7.7.9</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-after-color">border-after-color</a>
-      </td>
+        <a name="fo-property-border-after-color">border-after-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-color">&sect;7.7.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-color">&sect;7.7.10</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-after-style">border-after-style</a>
-      </td>
+        <a name="fo-property-border-after-style">border-after-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-style">&sect;7.7.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-style">&sect;7.7.11</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-after-width">border-after-width</a>
-      </td>
+        <a name="fo-property-border-after-width">border-after-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-width">&sect;7.7.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-width">&sect;7.7.12</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-start-color">border-start-color</a>
-      </td>
+        <a name="fo-property-border-start-color">border-start-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-color">&sect;7.7.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-color">&sect;7.7.13</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-start-style">border-start-style</a>
-      </td>
+        <a name="fo-property-border-start-style">border-start-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-style">&sect;7.7.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-style">&sect;7.7.14</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-start-width">border-start-width</a>
-      </td>
+        <a name="fo-property-border-start-width">border-start-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-width">&sect;7.7.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-width">&sect;7.7.15</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-end-color">border-end-color</a>
-      </td>
+        <a name="fo-property-border-end-color">border-end-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-color">&sect;7.7.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-color">&sect;7.7.16</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-end-style">border-end-style</a>
-      </td>
+        <a name="fo-property-border-end-style">border-end-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-style">&sect;7.7.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-style">&sect;7.7.17</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-end-width">border-end-width</a>
-      </td>
+        <a name="fo-property-border-end-width">border-end-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-width">&sect;7.7.18</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-width">&sect;7.7.18</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-top-color">border-top-color</a>
-      </td>
+        <a name="fo-property-border-top-color">border-top-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-color">&sect;7.7.19</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-color">&sect;7.7.19</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-top-style">border-top-style</a>
-      </td>
+        <a name="fo-property-border-top-style">border-top-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-style">&sect;7.7.20</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-style">&sect;7.7.20</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-top-width">border-top-width</a>
-      </td>
+        <a name="fo-property-border-top-width">border-top-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-width">&sect;7.7.21</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top-width">&sect;7.7.21</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-bottom-color">border-bottom-color</a>
-      </td>
+        <a name="fo-property-border-bottom-color">border-bottom-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-color">&sect;7.7.22</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-color">&sect;7.7.22</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-bottom-style">border-bottom-style</a>
-      </td>
+        <a name="fo-property-border-bottom-style">border-bottom-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-style">&sect;7.7.23</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-style">&sect;7.7.23</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-bottom-width">border-bottom-width</a>
-      </td>
+        <a name="fo-property-border-bottom-width">border-bottom-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-width">&sect;7.7.24</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom-width">&sect;7.7.24</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-left-color">border-left-color</a>
-      </td>
+        <a name="fo-property-border-left-color">border-left-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-color">&sect;7.7.25</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-color">&sect;7.7.25</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-left-style">border-left-style</a>
-      </td>
+        <a name="fo-property-border-left-style">border-left-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-style">&sect;7.7.26</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-style">&sect;7.7.26</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-left-width">border-left-width</a>
-      </td>
+        <a name="fo-property-border-left-width">border-left-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-width">&sect;7.7.27</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left-width">&sect;7.7.27</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-right-color">border-right-color</a>
-      </td>
+        <a name="fo-property-border-right-color">border-right-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-color">&sect;7.7.28</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-color">&sect;7.7.28</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-right-style">border-right-style</a>
-      </td>
+        <a name="fo-property-border-right-style">border-right-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-style">&sect;7.7.29</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-style">&sect;7.7.29</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-right-width">border-right-width</a>
-      </td>
+        <a name="fo-property-border-right-width">border-right-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-width">&sect;7.7.30</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right-width">&sect;7.7.30</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-before">padding-before</a>
-      </td>
+        <a name="fo-property-padding-before">padding-before</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-before">&sect;7.7.31</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-before">&sect;7.7.31</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only one value allowed
-          </li>
+            [0.20.5] only one value allowed          </li>
           <li>
-            [0.20.5] only implemented for blocks
-          </li>
+            [0.20.5] only implemented for blocks          </li>
           <li>
-            [0.20.5] can't be used to make extra space (use indents + spaces instead)
-          </li>
+            [0.20.5] can't be used to make extra space (use indents + spaces instead)          </li>
           <li>
-            [0.20.5] can be used to control how much the background-color extends beyond the content rectangle
-          </li>
-        </ul>
-      </td>
+            [0.20.5] can be used to control how much the background-color extends beyond the content rectangle          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-after">padding-after</a>
-      </td>
+        <a name="fo-property-padding-after">padding-after</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-after">&sect;7.7.32</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-after">&sect;7.7.32</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-start">padding-start</a>
-      </td>
+        <a name="fo-property-padding-start">padding-start</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-start">&sect;7.7.33</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-start">&sect;7.7.33</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-end">padding-end</a>
-      </td>
+        <a name="fo-property-padding-end">padding-end</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-end">&sect;7.7.34</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-end">&sect;7.7.34</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-top">padding-top</a>
-      </td>
+        <a name="fo-property-padding-top">padding-top</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-top">&sect;7.7.35</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-top">&sect;7.7.35</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-bottom">padding-bottom</a>
-      </td>
+        <a name="fo-property-padding-bottom">padding-bottom</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-bottom">&sect;7.7.36</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-bottom">&sect;7.7.36</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-left">padding-left</a>
-      </td>
+        <a name="fo-property-padding-left">padding-left</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-left">&sect;7.7.37</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-left">&sect;7.7.37</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding-right">padding-right</a>
-      </td>
+        <a name="fo-property-padding-right">padding-right</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-right">&sect;7.7.38</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding-right">&sect;7.7.38</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] same limitations as padding-before
-          </li>
-        </ul>
-      </td>
+            [0.20.5] same limitations as padding-before          </li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonfont-section">Common Font Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-font-properties">&sect;7.8</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonfont-section">Common Font Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-font-properties">&sect;7.8</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-family">font-family</a>
-      </td>
+        <a name="fo-property-font-family">font-family</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-family">&sect;7.8.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-family">&sect;7.8.2</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] font-family lists are not supported, use a single font-family name
-          </li>
+            [0.20.5] font-family lists are not supported, use a single font-family name          </li>
           <li>
-            [0.93] font-family lists are allowed but glyph based font selection is not supported
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] font-family lists are allowed but glyph based font selection is not supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-selection-strategy">font-selection-strategy</a>
-      </td>
+        <a name="fo-property-font-selection-strategy">font-selection-strategy</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-selection-strategy">&sect;7.8.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-selection-strategy">&sect;7.8.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-size">font-size</a>
-      </td>
+        <a name="fo-property-font-size">font-size</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-size">&sect;7.8.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-size">&sect;7.8.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "smaller" and "larger" not implemented
-          </li>
-        </ul>
-      </td>
+            [0.20.5] "smaller" and "larger" not implemented          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-stretch">font-stretch</a>
-      </td>
+        <a name="fo-property-font-stretch">font-stretch</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-stretch">&sect;7.8.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-stretch">&sect;7.8.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-size-adjust">font-size-adjust</a>
-      </td>
+        <a name="fo-property-font-size-adjust">font-size-adjust</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-size-adjust">&sect;7.8.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-size-adjust">&sect;7.8.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-style">font-style</a>
-      </td>
+        <a name="fo-property-font-style">font-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-style">&sect;7.8.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-style">&sect;7.8.7</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "normal" is not supported
-          </li>
-        </ul>
-      </td>
+            [0.20.5] "normal" is not supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-variant">font-variant</a>
-      </td>
+        <a name="fo-property-font-variant">font-variant</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-variant">&sect;7.8.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-variant">&sect;7.8.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font-weight">font-weight</a>
-      </td>
+        <a name="fo-property-font-weight">font-weight</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-weight">&sect;7.8.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font-weight">&sect;7.8.9</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "normal", "bolder" and "lighter" are not supported
-          </li>
+            [0.20.5] "normal", "bolder" and "lighter" are not supported          </li>
           <li>
-            [0.93] TODO &lt;relative&gt; font weights
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] TODO &lt;relative&gt; font weights          </li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonhyphen-section">Common Hyphenation Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-hyphenation-properties">&sect;7.9</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonhyphen-section">Common Hyphenation Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-hyphenation-properties">&sect;7.9</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-country">country</a>
-      </td>
+        <a name="fo-property-country">country</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#country">&sect;7.9.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#country">&sect;7.9.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-language">language</a>
-      </td>
+        <a name="fo-property-language">language</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#language">&sect;7.9.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#language">&sect;7.9.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-script">script</a>
-      </td>
+        <a name="fo-property-script">script</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#script">&sect;7.9.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#script">&sect;7.9.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenate">hyphenate</a>
-      </td>
+        <a name="fo-property-hyphenate">hyphenate</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenate">&sect;7.9.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenate">&sect;7.9.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenation-character">hyphenation-character</a>
-      </td>
+        <a name="fo-property-hyphenation-character">hyphenation-character</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-character">&sect;7.9.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-character">&sect;7.9.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenation-push-character-count">hyphenation-push-character-count</a>
-      </td>
+        <a name="fo-property-hyphenation-push-character-count">hyphenation-push-character-count</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-push-character-count">&sect;7.9.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-push-character-count">&sect;7.9.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenation-remain-character-count">hyphenation-remain-character-count</a>
-      </td>
+        <a name="fo-property-hyphenation-remain-character-count">hyphenation-remain-character-count</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-remain-character-count">&sect;7.9.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-remain-character-count">&sect;7.9.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonmarginblock-section">Common Margin Properties - Block</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-margin-properties-block">&sect;7.10</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonmarginblock-section">Common Margin Properties - Block</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-margin-properties-block">&sect;7.10</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-margin-top">margin-top</a>
-      </td>
+        <a name="fo-property-margin-top">margin-top</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-top">&sect;7.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-top">&sect;7.10.1</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only on pages and regions
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only on pages and regions          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-margin-bottom">margin-bottom</a>
-      </td>
+        <a name="fo-property-margin-bottom">margin-bottom</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-bottom">&sect;7.10.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-bottom">&sect;7.10.2</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only on pages and regions
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only on pages and regions          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-margin-left">margin-left</a>
-      </td>
+        <a name="fo-property-margin-left">margin-left</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-left">&sect;7.10.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-left">&sect;7.10.3</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only on pages and regions
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only on pages and regions          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-margin-right">margin-right</a>
-      </td>
+        <a name="fo-property-margin-right">margin-right</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-right">&sect;7.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin-right">&sect;7.10.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only on pages and regions
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only on pages and regions          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-space-before">space-before</a>
-      </td>
+        <a name="fo-property-space-before">space-before</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-before">&sect;7.10.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-before">&sect;7.10.5</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] space-before.optimum supported
-          </li>
+            [0.20.5] space-before.optimum supported          </li>
           <li>
-            [0.93] Space adjustment may not fully work everywhere, yet.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Space adjustment may not fully work everywhere, yet.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-space-after">space-after</a>
-      </td>
+        <a name="fo-property-space-after">space-after</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-after">&sect;7.10.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-after">&sect;7.10.6</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] space-after.optimum supported
-          </li>
+            [0.20.5] space-after.optimum supported          </li>
           <li>
-            [0.93] Space adjustment may not fully work everywhere, yet.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Space adjustment may not fully work everywhere, yet.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-start-indent">start-indent</a>
-      </td>
+        <a name="fo-property-start-indent">start-indent</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#start-indent">&sect;7.10.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#start-indent">&sect;7.10.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-end-indent">end-indent</a>
-      </td>
+        <a name="fo-property-end-indent">end-indent</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#end-indent">&sect;7.10.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#end-indent">&sect;7.10.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonmargininline-section">Common Margin Properties - Inline</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-margin-properties-inline">&sect;7.11</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonmargininline-section">Common Margin Properties - Inline</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-margin-properties-inline">&sect;7.11</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-space-end">space-end</a>
-      </td>
+        <a name="fo-property-space-end">space-end</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-end">&sect;7.11.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-end">&sect;7.11.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no">no</td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-space-start">space-start</a>
-      </td>
+        <a name="fo-property-space-start">space-start</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-start">&sect;7.11.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#space-start">&sect;7.11.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no">no</td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-commonrelpos-section">Common Relative Position Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-relative-position-properties">&sect;7.12</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-commonrelpos-section">Common Relative Position Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#common-relative-position-properties">&sect;7.12</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-relative-position">relative-position</a>
-      </td>
+        <a name="fo-property-relative-position">relative-position</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#relative-position">&sect;7.12.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#relative-position">&sect;7.12.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no">no</td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-areaalign-section">Area Alignment Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#area-alignment">&sect;7.13</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-areaalign-section">Area Alignment Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#area-alignment">&sect;7.13</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-alignment-adjust">alignment-adjust</a>
-      </td>
+        <a name="fo-property-alignment-adjust">alignment-adjust</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#alignment-adjust">&sect;7.13.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#alignment-adjust">&sect;7.13.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-alignment-baseline">alignment-baseline</a>
-      </td>
+        <a name="fo-property-alignment-baseline">alignment-baseline</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#alignment-baseline">&sect;7.13.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#alignment-baseline">&sect;7.13.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-baseline-shift">baseline-shift</a>
-      </td>
+        <a name="fo-property-baseline-shift">baseline-shift</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#baseline-shift">&sect;7.13.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#baseline-shift">&sect;7.13.3</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Only values "super" and "sub" have been implemented.
-          </li>
-        </ul>
-      </td>
+            [0.20.5] Only values "super" and "sub" have been implemented.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-display-align">display-align</a>
-      </td>
+        <a name="fo-property-display-align">display-align</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#display-align">&sect;7.13.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#display-align">&sect;7.13.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Implemented only for table-cell and block-container.
-          </li>
+            [0.20.5] Implemented only for table-cell and block-container.          </li>
           <li>
-            [0.20.5] For table-cell, the "height" attribute must be set for the parent table-row; setting the height of the table or the table-cell results in vertical centering having no effect. 
-          </li>
+            [0.20.5] For table-cell, the "height" attribute must be set for the parent table-row; setting the height of the table or the table-cell results in vertical centering having no effect.          </li>
           <li>
-            [0.93] TODO Check e-g, i-f-o.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] TODO Check e-g, i-f-o.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-dominant-baseline">dominant-baseline</a>
-      </td>
+        <a name="fo-property-dominant-baseline">dominant-baseline</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#dominant-baseline">&sect;7.13.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#dominant-baseline">&sect;7.13.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-relative-align">relative-align</a>
-      </td>
+        <a name="fo-property-relative-align">relative-align</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#relative-align">&sect;7.13.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#relative-align">&sect;7.13.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-areadim-section">Area Dimension Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N36094-Area-Dimension-Properties">&sect;7.14</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-areadim-section">Area Dimension Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N36094-Area-Dimension-Properties">&sect;7.14</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-block-progression-dimension">block-progression-dimension</a>
-      </td>
+        <a name="fo-property-block-progression-dimension">block-progression-dimension</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#block-progression-dimension">&sect;7.14.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#block-progression-dimension">&sect;7.14.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-content-height">content-height</a>
-      </td>
+        <a name="fo-property-content-height">content-height</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-height">&sect;7.14.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-height">&sect;7.14.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-content-width">content-width</a>
-      </td>
+        <a name="fo-property-content-width">content-width</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-width">&sect;7.14.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-width">&sect;7.14.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-height">height</a>
-      </td>
+        <a name="fo-property-height">height</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#height">&sect;7.14.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#height">&sect;7.14.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-inline-progression-dimension">inline-progression-dimension</a>
-      </td>
+        <a name="fo-property-inline-progression-dimension">inline-progression-dimension</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#inline-progression-dimension">&sect;7.14.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#inline-progression-dimension">&sect;7.14.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-max-height">max-height</a>
-      </td>
+        <a name="fo-property-max-height">max-height</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#max-height">&sect;7.14.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#max-height">&sect;7.14.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-max-width">max-width</a>
-      </td>
+        <a name="fo-property-max-width">max-width</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#max-width">&sect;7.14.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#max-width">&sect;7.14.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-min-height">min-height</a>
-      </td>
+        <a name="fo-property-min-height">min-height</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#min-height">&sect;7.14.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#min-height">&sect;7.14.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-min-width">min-width</a>
-      </td>
+        <a name="fo-property-min-width">min-width</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#min-width">&sect;7.14.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#min-width">&sect;7.14.9</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-scaling">scaling</a>
-      </td>
+        <a name="fo-property-scaling">scaling</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#scaling">&sect;7.14.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#scaling">&sect;7.14.10</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-scaling-method">scaling-method</a>
-      </td>
+        <a name="fo-property-scaling-method">scaling-method</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#scaling-method">&sect;7.14.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#scaling-method">&sect;7.14.11</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-width">width</a>
-      </td>
+        <a name="fo-property-width">width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#width">&sect;7.14.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#width">&sect;7.14.12</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-blockandline-section">Block and Line-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N38191-Block-and-Line-related-Properties">&sect;7.15</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-blockandline-section">Block and Line-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N38191-Block-and-Line-related-Properties">&sect;7.15</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenation-keep">hyphenation-keep</a>
-      </td>
+        <a name="fo-property-hyphenation-keep">hyphenation-keep</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-keep">&sect;7.15.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-keep">&sect;7.15.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-hyphenation-ladder-count">hyphenation-ladder-count</a>
-      </td>
+        <a name="fo-property-hyphenation-ladder-count">hyphenation-ladder-count</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-ladder-count">&sect;7.15.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#hyphenation-ladder-count">&sect;7.15.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-last-line-end-indent">last-line-end-indent</a>
-      </td>
+        <a name="fo-property-last-line-end-indent">last-line-end-indent</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#last-line-end-indent">&sect;7.15.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#last-line-end-indent">&sect;7.15.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-line-height">line-height</a>
-      </td>
+        <a name="fo-property-line-height">line-height</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-height">&sect;7.15.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-height">&sect;7.15.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-line-height-shift-adjustment">line-height-shift-adjustment</a>
-      </td>
+        <a name="fo-property-line-height-shift-adjustment">line-height-shift-adjustment</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-height-shift-adjustment">&sect;7.15.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-height-shift-adjustment">&sect;7.15.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-line-stacking-strategy">line-stacking-strategy</a>
-      </td>
+        <a name="fo-property-line-stacking-strategy">line-stacking-strategy</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-stacking-strategy">&sect;7.15.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#line-stacking-strategy">&sect;7.15.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.93] value "line-height" not supported
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] value "line-height" not supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-linefeed-treatment">linefeed-treatment</a>
-      </td>
+        <a name="fo-property-linefeed-treatment">linefeed-treatment</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#linefeed-treatment">&sect;7.15.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#linefeed-treatment">&sect;7.15.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="left">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="left">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-white-space-treatment">white-space-treatment</a>
-      </td>
+        <a name="fo-property-white-space-treatment">white-space-treatment</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-treatment">&sect;7.15.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-treatment">&sect;7.15.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.93] inline elements may interfere with correct handling of this property
-            in some cases
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] inline elements may interfere with correct handling of this property
+            in some cases          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-align">text-align</a>
-      </td>
+        <a name="fo-property-text-align">text-align</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-align">&sect;7.15.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-align">&sect;7.15.9</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            Only start, end, center and justify are supported
-          </li>
-        </ul>
-      </td>
+            Only start, end, center and justify are supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-align-last">text-align-last</a>
-      </td>
+        <a name="fo-property-text-align-last">text-align-last</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-align-last">&sect;7.15.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-align-last">&sect;7.15.10</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            Only start, end, center and justify are supported
-          </li>
-        </ul>
-      </td>
+            Only start, end, center and justify are supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-indent">text-indent</a>
-      </td>
+        <a name="fo-property-text-indent">text-indent</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-indent">&sect;7.15.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-indent">&sect;7.15.11</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-white-space-collapse">white-space-collapse</a>
-      </td>
+        <a name="fo-property-white-space-collapse">white-space-collapse</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">&sect;7.15.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">&sect;7.15.12</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-wrap-option">wrap-option</a>
-      </td>
+        <a name="fo-property-wrap-option">wrap-option</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#wrap-option">&sect;7.15.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#wrap-option">&sect;7.15.13</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.93] Only supported on fo:block.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Only supported on fo:block.          </li>
+        </ul>      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-char-section">Character Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N40545-Character-Properties">&sect;7.16</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-char-section">Character Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N40545-Character-Properties">&sect;7.16</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-character">character</a>
-      </td>
+        <a name="fo-property-character">character</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#character">&sect;7.16.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#character">&sect;7.16.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-letter-spacing">letter-spacing</a>
-      </td>
+        <a name="fo-property-letter-spacing">letter-spacing</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#letter-spacing">&sect;7.16.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#letter-spacing">&sect;7.16.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-suppress-at-line-break">suppress-at-line-break</a>
-      </td>
+        <a name="fo-property-suppress-at-line-break">suppress-at-line-break</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#suppress-at-line-break">&sect;7.16.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#suppress-at-line-break">&sect;7.16.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-decoration">text-decoration</a>
-      </td>
+        <a name="fo-property-text-decoration">text-decoration</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-decoration">&sect;7.16.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-decoration">&sect;7.16.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-shadow">text-shadow</a>
-      </td>
+        <a name="fo-property-text-shadow">text-shadow</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-shadow">&sect;7.16.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-shadow">&sect;7.16.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-transform">text-transform</a>
-      </td>
+        <a name="fo-property-text-transform">text-transform</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-transform">&sect;7.16.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-transform">&sect;7.16.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-treat-as-word-space">treat-as-word-space</a>
-      </td>
+        <a name="fo-property-treat-as-word-space">treat-as-word-space</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#treat-as-word-space">&sect;7.16.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#treat-as-word-space">&sect;7.16.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-word-spacing">word-spacing</a>
-      </td>
+        <a name="fo-property-word-spacing">word-spacing</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#word-spacing">&sect;7.16.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#word-spacing">&sect;7.16.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-color-section">Color-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N42081-Color-related-Properties">&sect;7.17</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-color-section">Color-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N42081-Color-related-Properties">&sect;7.17</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-color">color</a>
-      </td>
+        <a name="fo-property-color">color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#color">&sect;7.17.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#color">&sect;7.17.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-color-profile-name">color-profile-name</a>
-      </td>
+        <a name="fo-property-color-profile-name">color-profile-name</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#color-profile-name">&sect;7.17.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#color-profile-name">&sect;7.17.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-rendering-intent">rendering-intent</a>
-      </td>
+        <a name="fo-property-rendering-intent">rendering-intent</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rendering-intent">&sect;7.17.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rendering-intent">&sect;7.17.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-float-section">Float-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N42546-Float-related-Properties">&sect;7.18</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-float-section">Float-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N42546-Float-related-Properties">&sect;7.18</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-clear">clear</a>
-      </td>
+        <a name="fo-property-clear">clear</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#clear">&sect;7.18.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#clear">&sect;7.18.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-float">float</a>
-      </td>
+        <a name="fo-property-float">float</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#float">&sect;7.18.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#float">&sect;7.18.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-intrusion-displace">intrusion-displace</a>
-      </td>
+        <a name="fo-property-intrusion-displace">intrusion-displace</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#intrusion-displace">&sect;7.18.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#intrusion-displace">&sect;7.18.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-keepsbreaks-section">Keeps and Breaks Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N43268-Keeps-and-Breaks-Properties">&sect;7.19</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-keepsbreaks-section">Keeps and Breaks Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N43268-Keeps-and-Breaks-Properties">&sect;7.19</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-break-after">break-after</a>
-      </td>
+        <a name="fo-property-break-after">break-after</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#break-after">&sect;7.19.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#break-after">&sect;7.19.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-break-before">break-before</a>
-      </td>
+        <a name="fo-property-break-before">break-before</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#break-before">&sect;7.19.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#break-before">&sect;7.19.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-keep-together">keep-together</a>
-      </td>
+        <a name="fo-property-keep-together">keep-together</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-together">&sect;7.19.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-together">&sect;7.19.3</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] works only in table rows
-          </li>
+            [0.20.5] works only in table rows          </li>
           <li>
-            [0.93] works on all implemented block-level FOs, but not on inline-level FOs.
-          </li>
+            [0.93] works on all implemented block-level FOs, but not on inline-level FOs.          </li>
           <li>
-            [0.93] &lt;integer&gt; values are not supported.
-          </li>
-          <li>
-            [Dev] &lt;integer&gt; values are not supported.
+            [0.93 and later] &lt;integer&gt; values are not supported.
           </li>
         </ul>
       </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-keep-with-next">keep-with-next</a>
-      </td>
+        <a name="fo-property-keep-with-next">keep-with-next</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-with-next">&sect;7.19.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-with-next">&sect;7.19.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] works only in table rows
-          </li>
+            [0.20.5] works only in table rows          </li>
           <li>
-            [0.93] works on all implemented block-level FOs, but not on inline-level FOs.
-          </li>
+            [0.93 and later] works on all implemented block-level FOs, but not on inline-level FOs.          </li>
           <li>
-            [0.93] &lt;integer&gt; values are not supported.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] &lt;integer&gt; values are not supported.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-keep-with-previous">keep-with-previous</a>
-      </td>
+        <a name="fo-property-keep-with-previous">keep-with-previous</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-with-previous">&sect;7.19.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#keep-with-previous">&sect;7.19.5</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
-          <li>
-            [0.20.5] works only in table rows
-          </li>
-          <li>
-            [0.93] works on all implemented FOs, except list- and table-related and inline-level FOs.
-          </li>
-          <li>
-            [0.93] &lt;integer&gt; values are not supported.
-          </li>
-        </ul>
-      </td>
+          <li>[0.20.5] works only in table rows</li>
+          <li>[0.93 and later] works on all implemented FOs, except list- and
+            table-related and inline-level FOs.</li>
+          <li>[0.93 and later] &lt;integer&gt; values are not supported.</li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-orphans">orphans</a>
-      </td>
+        <a name="fo-property-orphans">orphans</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#orphans">&sect;7.19.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#orphans">&sect;7.19.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-widows">widows</a>
-      </td>
+        <a name="fo-property-widows">widows</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#widows">&sect;7.19.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#widows">&sect;7.19.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-layout-section">Layout-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N44408-Layout-related-Properties">&sect;7.20</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-layout-section">Layout-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N44408-Layout-related-Properties">&sect;7.20</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-clip">clip</a>
-      </td>
+        <a name="fo-property-clip">clip</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#clip">&sect;7.20.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#clip">&sect;7.20.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-overflow">overflow</a>
-      </td>
+        <a name="fo-property-overflow">overflow</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#overflow">&sect;7.20.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#overflow">&sect;7.20.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-reference-orientation">reference-orientation</a>
-      </td>
+        <a name="fo-property-reference-orientation">reference-orientation</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#reference-orientation">&sect;7.20.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#reference-orientation">&sect;7.20.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Workaround for page-orientation (portrait vs. landscape) is to swap the page-width and page-height properties.
-          </li>
+            [0.20.5] Workaround for page-orientation (portrait vs. landscape) is to swap the page-width and page-height properties.          </li>
           <li>
-            [0.20.5] Workaround for block-container is to use SVG.
-          </li>
-        </ul>
-      </td>
+            [0.20.5] Workaround for block-container is to use SVG.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-span">span</a>
-      </td>
+        <a name="fo-property-span">span</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#span">&sect;7.20.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#span">&sect;7.20.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-leader-section">Leader and Rule Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N45132-Leader-and-Rule-Properties">&sect;7.21</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-leader-section">Leader and Rule Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N45132-Leader-and-Rule-Properties">&sect;7.21</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-leader-alignment">leader-alignment</a>
-      </td>
+        <a name="fo-property-leader-alignment">leader-alignment</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-alignment">&sect;7.21.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-alignment">&sect;7.21.1</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] not value "page"
-          </li>
+            [0.20.5] not value "page"          </li>
           <li>
-            [0.93] Not supported
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Not supported          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-leader-pattern">leader-pattern</a>
-      </td>
+        <a name="fo-property-leader-pattern">leader-pattern</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-pattern">&sect;7.21.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-pattern">&sect;7.21.2</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] not value "use-content"
-          </li>
+            [0.20.5] not value "use-content"          </li>
           <li>
-            [0.93] Value "use-content" does not work in all circumstances.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Value "use-content" does not work in all circumstances.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-leader-pattern-width">leader-pattern-width</a>
-      </td>
+        <a name="fo-property-leader-pattern-width">leader-pattern-width</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-pattern-width">&sect;7.21.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-pattern-width">&sect;7.21.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="left">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="left">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-leader-length">leader-length</a>
-      </td>
+        <a name="fo-property-leader-length">leader-length</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-length">&sect;7.21.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#leader-length">&sect;7.21.4</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] leader-length.minimum is not used at all
-          </li>
-        </ul>
-      </td>
+            [0.20.5] leader-length.minimum is not used at all          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-rule-style">rule-style</a>
-      </td>
+        <a name="fo-property-rule-style">rule-style</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rule-style">&sect;7.21.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rule-style">&sect;7.21.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="left">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="left">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-rule-thickness">rule-thickness</a>
-      </td>
+        <a name="fo-property-rule-thickness">rule-thickness</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rule-thickness">&sect;7.21.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#rule-thickness">&sect;7.21.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="left">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="left">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-dynamiceffects-section">Properties for Dynamic Effects Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N46115-Properties-for-Dynamic-Effects-Formatting-Objects">&sect;7.22</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-dynamiceffects-section">Properties for Dynamic Effects Formatting Objects</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N46115-Properties-for-Dynamic-Effects-Formatting-Objects">&sect;7.22</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-active-state">active-state</a>
-      </td>
+        <a name="fo-property-active-state">active-state</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#active-state">&sect;7.22.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#active-state">&sect;7.22.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-auto-restore">auto-restore</a>
-      </td>
+        <a name="fo-property-auto-restore">auto-restore</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#auto-restore">&sect;7.22.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#auto-restore">&sect;7.22.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-case-name">case-name</a>
-      </td>
+        <a name="fo-property-case-name">case-name</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#case-name">&sect;7.22.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#case-name">&sect;7.22.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-case-title">case-title</a>
-      </td>
+        <a name="fo-property-case-title">case-title</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#case-title">&sect;7.22.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#case-title">&sect;7.22.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-destination-placement-offset">destination-placement-offset</a>
-      </td>
+        <a name="fo-property-destination-placement-offset">destination-placement-offset</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#destination-placement-offset">&sect;7.22.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#destination-placement-offset">&sect;7.22.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-external-destination">external-destination</a>
-      </td>
+        <a name="fo-property-external-destination">external-destination</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#external-destination">&sect;7.22.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#external-destination">&sect;7.22.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-indicate-destination">indicate-destination</a>
-      </td>
+        <a name="fo-property-indicate-destination">indicate-destination</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#indicate-destination">&sect;7.22.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#indicate-destination">&sect;7.22.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-internal-destination">internal-destination</a>
-      </td>
+        <a name="fo-property-internal-destination">internal-destination</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#internal-destination">&sect;7.22.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#internal-destination">&sect;7.22.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-show-destination">show-destination</a>
-      </td>
+        <a name="fo-property-show-destination">show-destination</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#show-destination">&sect;7.22.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#show-destination">&sect;7.22.9</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-starting-state">starting-state</a>
-      </td>
+        <a name="fo-property-starting-state">starting-state</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#starting-state">&sect;7.22.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#starting-state">&sect;7.22.10</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>[0.93 and later] support for starting-state on <a href="#fo-bookmark">fo:bookmark</a></li>
-        </ul>
-      </td>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-switch-to">switch-to</a>
-      </td>
+        <a name="fo-property-switch-to">switch-to</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#switch-to">&sect;7.22.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#switch-to">&sect;7.22.11</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-target-presentation-context">target-presentation-context</a>
-      </td>
+        <a name="fo-property-target-presentation-context">target-presentation-context</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-presentation-context">&sect;7.22.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-presentation-context">&sect;7.22.12</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-target-processing-context">target-processing-context</a>
-      </td>
+        <a name="fo-property-target-processing-context">target-processing-context</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-processing-context">&sect;7.22.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-processing-context">&sect;7.22.13</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-target-stylesheet">target-stylesheet</a>
-      </td>
+        <a name="fo-property-target-stylesheet">target-stylesheet</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-stylesheet">&sect;7.22.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#target-stylesheet">&sect;7.22.14</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-markers-section">Properties for Markers</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N48193-Properties-for-Markers">&sect;7.23</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-markers-section">Properties for Markers</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N48193-Properties-for-Markers">&sect;7.23</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-marker-class-name">marker-class-name</a>
-      </td>
+        <a name="fo-property-marker-class-name">marker-class-name</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#marker-class-name">&sect;7.23.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#marker-class-name">&sect;7.23.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-retrieve-class-name">retrieve-class-name</a>
-      </td>
+        <a name="fo-property-retrieve-class-name">retrieve-class-name</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-class-name">&sect;7.23.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-class-name">&sect;7.23.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-retrieve-position">retrieve-position</a>
-      </td>
+        <a name="fo-property-retrieve-position">retrieve-position</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-position">&sect;7.23.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-position">&sect;7.23.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-retrieve-boundary">retrieve-boundary</a>
-      </td>
+        <a name="fo-property-retrieve-boundary">retrieve-boundary</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-boundary">&sect;7.23.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#retrieve-boundary">&sect;7.23.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-numberstring-section">Properties for Number to String Conversion</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N48804-Properties-for-Number-to-String-Conversion">&sect;7.24</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-numberstring-section">Properties for Number to String Conversion</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N48804-Properties-for-Number-to-String-Conversion">&sect;7.24</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-format">format</a>
-      </td>
+        <a name="fo-property-format">format</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#format">&sect;7.24.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#format">&sect;7.24.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-grouping-separator">grouping-separator</a>
-      </td>
+        <a name="fo-property-grouping-separator">grouping-separator</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#grouping-separator">&sect;7.24.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#grouping-separator">&sect;7.24.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-grouping-size">grouping-size</a>
-      </td>
+        <a name="fo-property-grouping-size">grouping-size</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#grouping-size">&sect;7.24.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#grouping-size">&sect;7.24.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-letter-value">letter-value</a>
-      </td>
+        <a name="fo-property-letter-value">letter-value</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#letter-value">&sect;7.24.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#letter-value">&sect;7.24.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-pagination-section">Pagination and Layout Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N49321-Pagination-and-Layout-Properties">&sect;7.25</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-pagination-section">Pagination and Layout Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N49321-Pagination-and-Layout-Properties">&sect;7.25</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-blank-or-not-blank">blank-or-not-blank</a>
-      </td>
+        <a name="fo-property-blank-or-not-blank">blank-or-not-blank</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#blank-or-not-blank">&sect;7.25.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#blank-or-not-blank">&sect;7.25.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-column-count">column-count</a>
-      </td>
+        <a name="fo-property-column-count">column-count</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-count">&sect;7.25.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-count">&sect;7.25.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-column-gap">column-gap</a>
-      </td>
+        <a name="fo-property-column-gap">column-gap</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-gap">&sect;7.25.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-gap">&sect;7.25.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-extent">extent</a>
-      </td>
+        <a name="fo-property-extent">extent</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#extent">&sect;7.25.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#extent">&sect;7.25.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-flow-name">flow-name</a>
-      </td>
+        <a name="fo-property-flow-name">flow-name</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#flow-name">&sect;7.25.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#flow-name">&sect;7.25.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-force-page-count">force-page-count</a>
-      </td>
+        <a name="fo-property-force-page-count">force-page-count</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#force-page-count">&sect;7.25.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#force-page-count">&sect;7.25.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-initial-page-number">initial-page-number</a>
-      </td>
+        <a name="fo-property-initial-page-number">initial-page-number</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#initial-page-number">&sect;7.25.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#initial-page-number">&sect;7.25.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-master-name">master-name</a>
-      </td>
+        <a name="fo-property-master-name">master-name</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#master-name">&sect;7.25.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#master-name">&sect;7.25.8</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-master-reference">master-reference</a>
-      </td>
+        <a name="fo-property-master-reference">master-reference</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#master-reference">&sect;7.25.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#master-reference">&sect;7.25.9</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-maximum-repeats">maximum-repeats</a>
-      </td>
+        <a name="fo-property-maximum-repeats">maximum-repeats</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#maximum-repeats">&sect;7.25.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#maximum-repeats">&sect;7.25.10</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-media-usage">media-usage</a>
-      </td>
+        <a name="fo-property-media-usage">media-usage</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#media-usage">&sect;7.25.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#media-usage">&sect;7.25.11</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-odd-or-even">odd-or-even</a>
-      </td>
+        <a name="fo-property-odd-or-even">odd-or-even</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#odd-or-even">&sect;7.25.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#odd-or-even">&sect;7.25.12</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-height">page-height</a>
-      </td>
+        <a name="fo-property-page-height">page-height</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-height">&sect;7.25.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-height">&sect;7.25.13</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-position">page-position</a>
-      </td>
+        <a name="fo-property-page-position">page-position</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-position">&sect;7.25.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-position">&sect;7.25.14</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "last" isn't implemented!
-          </li>
-        </ul>
-      </td>
+            [0.20.5] "last" isn't implemented!          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-width">page-width</a>
-      </td>
+        <a name="fo-property-page-width">page-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-width">&sect;7.25.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-width">&sect;7.25.15</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-precedence">precedence</a>
-      </td>
+        <a name="fo-property-precedence">precedence</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#precedence">&sect;7.25.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#precedence">&sect;7.25.16</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-region-name">region-name</a>
-      </td>
+        <a name="fo-property-region-name">region-name</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#region-name">&sect;7.25.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#region-name">&sect;7.25.17</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-table-section">Table Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N52000-Table-Properties">&sect;7.26</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-table-section">Table Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N52000-Table-Properties">&sect;7.26</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-after-precedence">border-after-precedence</a>
-      </td>
+        <a name="fo-property-border-after-precedence">border-after-precedence</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-precedence">&sect;7.26.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-after-precedence">&sect;7.26.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-before-precedence">border-before-precedence</a>
-      </td>
+        <a name="fo-property-border-before-precedence">border-before-precedence</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-precedence">&sect;7.26.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-before-precedence">&sect;7.26.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-collapse">border-collapse</a>
-      </td>
+        <a name="fo-property-border-collapse">border-collapse</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-collapse">&sect;7.26.3</a>
-      </td>
-      <td class="partial">
-        partial
-      </td>
-      <td class="partial">
-        partial
-      </td>
-      <td class="partial">
-        partial
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-collapse">&sect;7.26.3</a>      </td>
+      <td class="partial">partial</td>
+      <td class="no">no</td>
+      <td class="yes">yes</td>
+      <td class="yes">yes</td>
       <td align="left">
         <ul>
-          <li>
-            Implementation of collapsed table model not complete.
-          </li>
+          <li>[0.94 and later] Some small limitations</li>
         </ul>
       </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-end-precedence">border-end-precedence</a>
-      </td>
+        <a name="fo-property-border-end-precedence">border-end-precedence</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-precedence">&sect;7.26.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-end-precedence">&sect;7.26.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-separation">border-separation</a>
-      </td>
+        <a name="fo-property-border-separation">border-separation</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-separation">&sect;7.26.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-separation">&sect;7.26.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-start-precedence">border-start-precedence</a>
-      </td>
+        <a name="fo-property-border-start-precedence">border-start-precedence</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-precedence">&sect;7.26.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-start-precedence">&sect;7.26.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-caption-side">caption-side</a>
-      </td>
+        <a name="fo-property-caption-side">caption-side</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#caption-side">&sect;7.26.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#caption-side">&sect;7.26.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-column-number">column-number</a>
-      </td>
+        <a name="fo-property-column-number">column-number</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-number">&sect;7.26.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-number">&sect;7.26.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-column-width">column-width</a>
-      </td>
+        <a name="fo-property-column-width">column-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-width">&sect;7.26.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#column-width">&sect;7.26.9</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "percentage" not implemented. Workaround is to use the XSL-FO "proportional-column-width" function.
-          </li>
-        </ul>
-      </td>
+            [0.20.5] "percentage" not implemented. Workaround is to use the XSL-FO "proportional-column-width" function.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-empty-cells">empty-cells</a>
-      </td>
+        <a name="fo-property-empty-cells">empty-cells</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#empty-cells">&sect;7.26.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#empty-cells">&sect;7.26.10</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-ends-row">ends-row</a>
-      </td>
+        <a name="fo-property-ends-row">ends-row</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#ends-row">&sect;7.26.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#ends-row">&sect;7.26.11</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-number-columns-repeated">number-columns-repeated</a>
-      </td>
+        <a name="fo-property-number-columns-repeated">number-columns-repeated</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-columns-repeated">&sect;7.26.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-columns-repeated">&sect;7.26.12</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-number-columns-spanned">number-columns-spanned</a>
-      </td>
+        <a name="fo-property-number-columns-spanned">number-columns-spanned</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-columns-spanned">&sect;7.26.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-columns-spanned">&sect;7.26.13</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-number-rows-spanned">number-rows-spanned</a>
-      </td>
+        <a name="fo-property-number-rows-spanned">number-rows-spanned</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-rows-spanned">&sect;7.26.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#number-rows-spanned">&sect;7.26.14</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-starts-row">starts-row</a>
-      </td>
+        <a name="fo-property-starts-row">starts-row</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#starts-row">&sect;7.26.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#starts-row">&sect;7.26.15</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-table-layout">table-layout</a>
-      </td>
+        <a name="fo-property-table-layout">table-layout</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-layout">&sect;7.26.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-layout">&sect;7.26.16</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-table-omit-footer-at-break">table-omit-footer-at-break</a>
-      </td>
+        <a name="fo-property-table-omit-footer-at-break">table-omit-footer-at-break</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-omit-footer-at-break">&sect;7.26.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-omit-footer-at-break">&sect;7.26.17</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-table-omit-header-at-break">table-omit-header-at-break</a>
-      </td>
+        <a name="fo-property-table-omit-header-at-break">table-omit-header-at-break</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-omit-header-at-break">&sect;7.26.18</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#table-omit-header-at-break">&sect;7.26.18</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-writingmode-section">Writing-mode-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#writing-mode-related">&sect;7.27</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-writingmode-section">Writing-mode-related Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#writing-mode-related">&sect;7.27</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-direction">direction</a>
-      </td>
+        <a name="fo-property-direction">direction</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#direction">&sect;7.27.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#direction">&sect;7.27.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-glyph-orientation-horizontal">glyph-orientation-horizontal</a>
-      </td>
+        <a name="fo-property-glyph-orientation-horizontal">glyph-orientation-horizontal</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#glyph-orientation-horizontal">&sect;7.27.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#glyph-orientation-horizontal">&sect;7.27.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-glyph-orientation-vertical">glyph-orientation-vertical</a>
-      </td>
+        <a name="fo-property-glyph-orientation-vertical">glyph-orientation-vertical</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#glyph-orientation-vertical">&sect;7.27.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#glyph-orientation-vertical">&sect;7.27.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-altitude">text-altitude</a>
-      </td>
+        <a name="fo-property-text-altitude">text-altitude</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-altitude">&sect;7.27.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-altitude">&sect;7.27.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-text-depth">text-depth</a>
-      </td>
+        <a name="fo-property-text-depth">text-depth</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-depth">&sect;7.27.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#text-depth">&sect;7.27.5</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-unicode-bidi">unicode-bidi</a>
-      </td>
+        <a name="fo-property-unicode-bidi">unicode-bidi</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#unicode-bidi">&sect;7.27.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#unicode-bidi">&sect;7.27.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-writing-mode">writing-mode</a>
-      </td>
+        <a name="fo-property-writing-mode">writing-mode</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#writing-mode">&sect;7.27.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#writing-mode">&sect;7.27.7</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-misc-section">Miscellaneous Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N56509-Miscellaneous-Properties">&sect;7.28</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-misc-section">Miscellaneous Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N56509-Miscellaneous-Properties">&sect;7.28</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-content-type">content-type</a>
-      </td>
+        <a name="fo-property-content-type">content-type</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-type">&sect;7.28.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#content-type">&sect;7.28.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-id">id</a>
-      </td>
+        <a name="fo-property-id">id</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#id">&sect;7.28.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#id">&sect;7.28.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
-          <li>[0.93] IDs on table-header, table-footer, table-body, table-row, table-and-caption, table-caption, inline-container and bidi-override are not available, yet.</li>
-        </ul>
-      </td>
+          <li>[0.93 and later] IDs on table-header, table-footer, table-body, table-row, table-and-caption, table-caption, inline-container and bidi-override are not available, yet.</li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-provisional-label-separation">provisional-label-separation</a>
-      </td>
+        <a name="fo-property-provisional-label-separation">provisional-label-separation</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#provisional-label-separation">&sect;7.28.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#provisional-label-separation">&sect;7.28.3</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-provisional-distance-between-starts">provisional-distance-between-starts</a>
-      </td>
+        <a name="fo-property-provisional-distance-between-starts">provisional-distance-between-starts</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#provisional-distance-between-starts">&sect;7.28.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#provisional-distance-between-starts">&sect;7.28.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-ref-id">ref-id</a>
-      </td>
+        <a name="fo-property-ref-id">ref-id</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#ref-id">&sect;7.28.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#ref-id">&sect;7.28.5</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-score-spaces">score-spaces</a>
-      </td>
+        <a name="fo-property-score-spaces">score-spaces</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#score-spaces">&sect;7.28.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#score-spaces">&sect;7.28.6</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-src">src</a>
-      </td>
+        <a name="fo-property-src">src</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#src">&sect;7.28.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#src">&sect;7.28.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-visibility">visibility</a>
-      </td>
+        <a name="fo-property-visibility">visibility</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#visibility">&sect;7.28.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#visibility">&sect;7.28.8</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-z-index">z-index</a>
-      </td>
+        <a name="fo-property-z-index">z-index</a>      </td>
       <td class="extended">
-        Extended
-      </td>
+        Extended      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#z-index">&sect;7.28.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#z-index">&sect;7.28.9</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-property-shorthand-section">Shorthand Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N57854-Shorthand-Properties">&sect;7.29</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-property-shorthand-section">Shorthand Properties</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#section-N57854-Shorthand-Properties">&sect;7.29</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background">background</a>
-      </td>
+        <a name="fo-property-background">background</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background">&sect;7.29.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background">&sect;7.29.1</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-background-position">background-position</a>
-      </td>
+        <a name="fo-property-background-position">background-position</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position">&sect;7.29.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#background-position">&sect;7.29.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border">border</a>
-      </td>
+        <a name="fo-property-border">border</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border">&sect;7.29.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border">&sect;7.29.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-bottom">border-bottom</a>
-      </td>
+        <a name="fo-property-border-bottom">border-bottom</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom">&sect;7.29.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-bottom">&sect;7.29.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-color">border-color</a>
-      </td>
+        <a name="fo-property-border-color">border-color</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-color">&sect;7.29.5</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-color">&sect;7.29.5</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only one value allowed
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only one value allowed          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-left">border-left</a>
-      </td>
+        <a name="fo-property-border-left">border-left</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left">&sect;7.29.6</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-left">&sect;7.29.6</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-right">border-right</a>
-      </td>
+        <a name="fo-property-border-right">border-right</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right">&sect;7.29.7</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-right">&sect;7.29.7</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-style">border-style</a>
-      </td>
+        <a name="fo-property-border-style">border-style</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-style">&sect;7.29.8</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-style">&sect;7.29.8</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only "solid" works
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only "solid" works          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-spacing">border-spacing</a>
-      </td>
+        <a name="fo-property-border-spacing">border-spacing</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-spacing">&sect;7.29.9</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-spacing">&sect;7.29.9</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-top">border-top</a>
-      </td>
+        <a name="fo-property-border-top">border-top</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top">&sect;7.29.10</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-top">&sect;7.29.10</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-border-width">border-width</a>
-      </td>
+        <a name="fo-property-border-width">border-width</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-width">&sect;7.29.11</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#border-width">&sect;7.29.11</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-cue">cue</a>
-      </td>
+        <a name="fo-property-cue">cue</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue">&sect;7.29.12</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#cue">&sect;7.29.12</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-font">font</a>
-      </td>
+        <a name="fo-property-font">font</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font">&sect;7.29.13</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#font">&sect;7.29.13</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="center">
         <ul>
           <li>
-            [0.93] Enum values other than "inherit" not yet supported.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Enum values other than "inherit" not yet supported.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-margin">margin</a>
-      </td>
+        <a name="fo-property-margin">margin</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin">&sect;7.29.14</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#margin">&sect;7.29.14</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only on pages and regions
-          </li>
-        </ul>
-      </td>
+            [0.20.5] only on pages and regions          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-padding">padding</a>
-      </td>
+        <a name="fo-property-padding">padding</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding">&sect;7.29.15</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#padding">&sect;7.29.15</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] only one value allowed
-          </li>
+            [0.20.5] only one value allowed          </li>
           <li>
-            [0.20.5] only implemented for blocks
-          </li>
+            [0.20.5] only implemented for blocks          </li>
           <li>
-            [0.20.5] can't be used to make extra space (use indents + spaces instead)
-          </li>
+            [0.20.5] can't be used to make extra space (use indents + spaces instead)          </li>
           <li>
-            [0.20.5] can be used to control how much the background-color extends beyond the content rectangle
-          </li>
-        </ul>
-      </td>
+            [0.20.5] can be used to control how much the background-color extends beyond the content rectangle          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-break-after">page-break-after</a>
-      </td>
+        <a name="fo-property-page-break-after">page-break-after</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-after">&sect;7.29.16</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-after">&sect;7.29.16</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-break-before">page-break-before</a>
-      </td>
+        <a name="fo-property-page-break-before">page-break-before</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-before">&sect;7.29.17</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-before">&sect;7.29.17</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-page-break-inside">page-break-inside</a>
-      </td>
+        <a name="fo-property-page-break-inside">page-break-inside</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-inside">&sect;7.29.18</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#page-break-inside">&sect;7.29.18</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-pause">pause</a>
-      </td>
+        <a name="fo-property-pause">pause</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause">&sect;7.29.19</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#pause">&sect;7.29.19</a>      </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
+      <td class="na"> na </td>
       <td class="na">
-        na
-      </td>
+        na      </td>
       <td class="na">
-        na
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        na      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-position">position</a>
-      </td>
+        <a name="fo-property-position">position</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#position">&sect;7.29.20</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#position">&sect;7.29.20</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] "inherit" not handled
-          </li>
-        </ul>
-      </td>
+            [0.20.5] "inherit" not handled          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-size">size</a>
-      </td>
+        <a name="fo-property-size">size</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#size">&sect;7.29.21</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#size">&sect;7.29.21</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-vertical-align">vertical-align</a>
-      </td>
+        <a name="fo-property-vertical-align">vertical-align</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#vertical-align">&sect;7.29.22</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#vertical-align">&sect;7.29.22</a>      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
+      <td class="partial"> partial </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td class="partial">
-        partial
-      </td>
+        partial      </td>
       <td align="left">
         <ul>
           <li>
-            [0.20.5] Only works as a shorthand for baseline-shift property.
-          </li>
+            [0.20.5] Only works as a shorthand for baseline-shift property.          </li>
           <li>
-            [0.93] Percentages are not supported, yet.
-          </li>
-        </ul>
-      </td>
+            [0.93 and later] Percentages are not supported, yet.          </li>
+        </ul>      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-white-space">white-space</a>
-      </td>
+        <a name="fo-property-white-space">white-space</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space">&sect;7.29.23</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space">&sect;7.29.23</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-property-xml:lang">xml:lang</a>
-      </td>
+        <a name="fo-property-xml:lang">xml:lang</a>      </td>
       <td class="complete">
-        Complete
-      </td>
+        Complete      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#xml:lang">&sect;7.29.24</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#xml:lang">&sect;7.29.24</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
   </table>
-  <h1><a name="fo-function-core-library-section">XSL-FO Core Function Library Support Table</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8434-Core-Function-Library">&sect;5.10</a>)</h1>
+<h1><a name="fo-function-core-library-section">XSL-FO Core Function Library Support Table</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8434-Core-Function-Library">&sect;5.10</a>)</h1>
   <p>
     The following is a summary of FOP's current support for the XSL-FO Core Function Library.
   </p>
   <table border="1">
     <tr>
       <th rowspan="2">
-        Function Name
-      </th>
+        Function Name      </th>
       <th rowspan="2" align="center">
-        XSL-FO Conformance Level
-      </th>
+        XSL-FO Conformance Level      </th>
       <th rowspan="2" align="center">
-        Citation 
-      </th>
-      <th colspan="3" align="center">
-        Support&nbsp;in&nbsp;FOP
-      </th>
+        Citation      </th>
+      <th colspan="4" align="center">
+        Support&nbsp;in&nbsp;FOP      </th>
       <th rowspan="2">
-        Comments 
-      </th>
+        Comments      </th>
     </tr>
     <tr>
       <th align="center">
-        0.20.5 (previous)
-      </th>
+        0.20.5 (previous)      </th>
       <th align="center">
-        0.93 (stable)
-      </th>
+        0.93 (stable)      </th>
+      <th align="center"> 0.94 (stable) </th>
       <th align="center">
-        develop- ment
-      </th>
+        develop- ment      </th>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-function-number-section">Number Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-function-number-section">Number Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-floor">floor</a>
-      </td>
+        <a name="fo-function-floor">floor</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-ceiling">ceiling</a>
-      </td>
+        <a name="fo-function-ceiling">ceiling</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-round">round</a>
-      </td>
+        <a name="fo-function-round">round</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-min">min</a>
-      </td>
+        <a name="fo-function-min">min</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-max">max</a>
-      </td>
+        <a name="fo-function-max">max</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-abs">abs</a>
-      </td>
+        <a name="fo-function-abs">abs</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8438-Number-Functions">&sect;5.10.1</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-function-color-section">Color Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-function-color-section">Color Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-rgb">rgb</a>
-      </td>
+        <a name="fo-function-rgb">rgb</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-rgb-icc">rgb-icc</a>
-      </td>
+        <a name="fo-function-rgb-icc">rgb-icc</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-system-color">system-color</a>
-      </td>
+        <a name="fo-function-system-color">system-color</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#expr-color-functions">&sect;5.10.2</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-function-font-section">Font Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8601-Font-Functions">&sect;5.10.3</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-function-font-section">Font Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8601-Font-Functions">&sect;5.10.3</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-system-font">system-font</a>
-      </td>
+        <a name="fo-function-system-font">system-font</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8601-Font-Functions">&sect;5.10.3</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8601-Font-Functions">&sect;5.10.3</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no">no</td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
-      <td class="category" colspan="7">
-        <a name="fo-function-property-value-section">Property Value Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>)
-      </td>
+      <td class="category" colspan="8">
+        <a name="fo-function-property-value-section">Property Value Functions</a> (<a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>)      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-inherited-property-value">inherited-property-value</a>
-      </td>
+        <a name="fo-function-inherited-property-value">inherited-property-value</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-label-end">label-end</a>
-      </td>
+        <a name="fo-function-label-end">label-end</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-body-start">body-start</a>
-      </td>
+        <a name="fo-function-body-start">body-start</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-from-parent">from-parent</a>
-      </td>
+        <a name="fo-function-from-parent">from-parent</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-from-nearest-specified-value">from-nearest-specified-value</a>
-      </td>
+        <a name="fo-function-from-nearest-specified-value">from-nearest-specified-value</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-from-table-column">from-table-column</a>
-      </td>
+        <a name="fo-function-from-table-column">from-table-column</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-proportional-column-width">proportional-column-width</a>
-      </td>
+        <a name="fo-function-proportional-column-width">proportional-column-width</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
       <td class="yes">
-        yes
-      </td>
+        yes      </td>
+      <td class="yes"> yes </td>
       <td class="yes">
-        yes
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        yes      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
     <tr>
       <td>
-        <a name="fo-function-merge-property-values">merge-property-values</a>
-      </td>
+        <a name="fo-function-merge-property-values">merge-property-values</a>      </td>
       <td class="basic">
-        Basic
-      </td>
+        Basic      </td>
       <td align="center">
-        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>
-      </td>
+        <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8624-Property-Value-Functions">&sect;5.10.4</a>      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
       <td class="no">
-        no
-      </td>
+        no      </td>
+      <td class="no"> no </td>
       <td class="no">
-        no
-      </td>
-      <td align="center">
-        &nbsp;
-      </td>
+        no      </td>
+      <td align="center">&nbsp;      </td>
     </tr>
   </table>
 </body>
diff --git a/src/documentation/content/xdocs/dev/design/configuration.xml b/src/documentation/content/xdocs/dev/design/configuration.xml
index 886a2fdde..43d8ebe61 100644
--- a/src/documentation/content/xdocs/dev/design/configuration.xml
+++ b/src/documentation/content/xdocs/dev/design/configuration.xml
@@ -47,30 +47,30 @@ settings for entries that you wish to use.  Be sure to follow any
 instructions, including comments which specify the value range.  Also,
 since the configuration file is XML, be sure to keep it
 well-formed.</p>
-	</section>
+    </section>
 
-	<section id="general-available">
-	  <title>Making Configuration Available to FOP</title>
-	  <p>After creating your configuration file, you must tell FOP how
+    <section id="general-available">
+      <title>Making Configuration Available to FOP</title>
+      <p>After creating your configuration file, you must tell FOP how
 to find it.</p> 
 
-	  <section id="command-line">
-		<title>From the Command Line</title>
-		<p>When you run FOP from the command-line, use the
+      <section id="command-line">
+        <title>From the Command Line</title>
+        <p>When you run FOP from the command-line, use the
 &ldquo;<code>-c</code>&rdquo; command-line option with the path to the
 configuration file as the option value.</p>
-	  </section>
+      </section>
 
-	  <section id="embedded-file">
-		<title>A Configuration File in an Embedded Application</title>
-		<p>FOP uses the Avalon framework configuration package
+      <section id="embedded-file">
+        <title>A Configuration File in an Embedded Application</title>
+        <p>FOP uses the Avalon framework configuration package
 <code>org.apache.avalon.framework.configuration</code>. For detailed
 information, see the documentation of the package.</p>
-		<p>If you want to use a user configuration file with your
+        <p>If you want to use a user configuration file with your
 embedded program, you need to build an Avalon configuration 
 object from it, and register that with the user agent:</p>
 
-		<source>FOUserAgent foUserAgent;
+        <source>FOUserAgent foUserAgent;
 XMLReader parser;
 DefaultConfigurationBuilder configBuilder;
 File userConfigFile;
@@ -81,81 +81,81 @@ userConfigFile = new File("YourConfigFile.xml");
 userConfig = configBuilder.buildFromFile(userConfigFile);
 foUserAgent.setUserConfig(userConfig);
 </source>
-		<p>You can find example code in FOP's
+        <p>You can find example code in FOP's
 <code>apps.CommandLine</code> class, method
 <code>createUserConfig</code>.</p>
-	  </section>
+      </section>
 
-	  <section id="embedded-build">
-		<title>Programmatically Building the Configuration</title>
-		<p>You can also build the configuration object programmatically,
+      <section id="embedded-build">
+        <title>Programmatically Building the Configuration</title>
+        <p>You can also build the configuration object programmatically,
 instead of building it from an external file. Make sure that the
 configuration object is equivalent to a configuration object that
 would be obtained from a correct configuration file. Register the
 configuration object with the user agent as described above.</p>
-	  </section>
+      </section>
 
-	</section>
+    </section>
 
-	<section id="config-overview">
-	  <title>The Configuration File</title>
-	  <p>The top-level element is arbitrary. You may give it any name
+    <section id="config-overview">
+      <title>The Configuration File</title>
+      <p>The top-level element is arbitrary. You may give it any name
 that is useful for you, e.g. <code>&lt;fop-configuration
 version="2"></code>.</p>
-	  <p>Inside the top-level element the configuration may contain
+      <p>Inside the top-level element the configuration may contain
 three sections: <code>userAgent</code>, <code>renderers</code>,
 and <code>hyphenation</code>. At the moment of this writing the
 <code>userAgent</code> and <code>hyphenation</code> sections are
 not used by FOP.</p>
-	  <p>The <code>renderers</code> section has subsections called
+      <p>The <code>renderers</code> section has subsections called
 <code>renderer</code>. There may be one subsection for each type
 of renderer. The renderers are identified by their MIME type,
 which is given in the <code>mime</code> attribute. For example:
 <code>&lt;renderer mime="application/pdf"></code>. The content
 of each <code>renderer</code> subsection depends on the type of
 renderer.</p>
-	  <p>The PDF renderer (MIME type <code>application/pdf</code>) has
+      <p>The PDF renderer (MIME type <code>application/pdf</code>) has
 several options:</p>
-	  <dl>
-		<dt><code>filterList</code></dt>
-		<dd>Contains a number of <code>value</code> elements, whose
+      <dl>
+        <dt><code>filterList</code></dt>
+        <dd>Contains a number of <code>value</code> elements, whose
 content specify a filter which should be applied. Possible
 filters are: <code>flate</code>, <code>ascii-85</code>,
 <code>ascii-hex</code>. The <code>flate</code> filter is on by
 default.</dd>
-		<dt><code>fonts</code></dt>
-		<dd>Contains a number of <code>font</code> elements. Each
+        <dt><code>fonts</code></dt>
+        <dd>Contains a number of <code>font</code> elements. Each
 <code>font</code> element represents a font file,
 e.g. <code>arial.ttf</code>. It contains a number of
 <code>font-triplet</code> elements, defining the font triplets
 which are provided by this font file. See the example
 configuration file for details.</dd>
-	  </dl>
-	  <p>The example configuration file provides for details about the
+      </dl>
+      <p>The example configuration file provides for details about the
 other renderers.</p> 
-	</section>
+    </section>
 
     <section id="hyphenation-dir">
       <title>Hyphenation</title>
-	  <p>When FOP needs to load a hyphenation file for a certain
+      <p>When FOP needs to load a hyphenation file for a certain
 language and country combination, it follows these steps.</p> 
-	  <ol>
-		<li>FOP searches for the compiled hyphenation file (extension
+      <ol>
+        <li>FOP searches for the compiled hyphenation file (extension
 <code>hyp</code> in the directory <code>hyph</code> in the
 class path.</li> 
-		<li>FOP searches for the compiled or the XML hyphenation file
+        <li>FOP searches for the compiled or the XML hyphenation file
 in a user directory. At the time of this writing FOP does not
 read the configuration file for the user directory. It always
 uses the directory <code>/hyph</code>.</li>
-	  </ol>
-	  <p>It is possible to add user hyphenation files to FOP's
+      </ol>
+      <p>It is possible to add user hyphenation files to FOP's
 hyphenation directory when FOP is built. The directory
 containing user hyphenation files must be specified in the
 variable <code>user.hyph.dir</code> in the local build
 properties file. All hyphenation files in the directory are
 compiled, and the compiled files are added to the hyphenation
 directory in the build directory.</p>
-	  <p>See <link href="../hyphenation.html">FOP: Hyphenation</link> for
+      <p>See <link href="../hyphenation.html">FOP: Hyphenation</link> for
 more information on creating and modifying hyphenation within FOP.</p>
     </section>
 
@@ -168,24 +168,24 @@ especially the section entitled <link
 href="../fonts.html#register">Register Fonts with FOP</link>.</p>
     </section>
 
-	<section id="logging">
-	  <title>Logging</title>
-	  <p>FOP uses the Jakarta Commons logging package
+    <section id="logging">
+      <title>Logging</title>
+      <p>FOP uses the Jakarta Commons logging package
 <code>org.apache.commons.logging</code>. For detailed information, see
 the documentation of the package.</p>
-	  <p>Commons logging is entirely configured by the user, using
+      <p>Commons logging is entirely configured by the user, using
 Java system properties. Configuration happens in two stages.</p>
-		<p>First you configure which logging implementation you want
+        <p>First you configure which logging implementation you want
 to use. For example:</p>
-	  <source>org.apache.commons.logging.Log
+      <source>org.apache.commons.logging.Log
     =org.apache.commons.logging.impl.SimpleLog</source>
-	  <p><code>SimpleLog is the default logging package on most Java
+      <p><code>SimpleLog is the default logging package on most Java
 systems. On Java 1.4 systems JDK 1.4 is the default.</code></p>
-	  <p>Secondly, you configure the selected logging package. How
+      <p>Secondly, you configure the selected logging package. How
 this is done depends on the logging package. The most important
 feature is the log level. The default is level &ldquo;info&rdquo;. An
 example configuration file for SimpleLog is:</p>
-	  <source>
+      <source>
 # logging level for all loggers, default info
 org.apache.commons.logging.simplelog.defaultlog=info
 
@@ -193,7 +193,7 @@ org.apache.commons.logging.simplelog.defaultlog=info
 org.apache.commons.logging.simplelog.log.xxxxx=debug
 org.apache.commons.logging.simplelog.log.org.apache.fop.pdf=trace
 </source>
-	  <p>FOP uses several named loggers. When you set the logging level
+      <p>FOP uses several named loggers. When you set the logging level
 for all loggers to &ldquo;info&rdquo;, you get a decent small amount
 of information 
 about application progress. The debugging and especially the trace
@@ -201,7 +201,7 @@ levels produce a lot of output. If you need these logging levels,
 it is wise to switch them on for one or several specific loggers. The
 names of the loggers can be found in the source files. Many loggers
 bear the name of their package, their class or of a superclass.</p>
-	</section>
+    </section>
 
   </body>
 </document>
diff --git a/src/documentation/content/xdocs/dev/faq.xml b/src/documentation/content/xdocs/dev/faq.xml
index 2206f9f9d..bacc807ad 100644
--- a/src/documentation/content/xdocs/dev/faq.xml
+++ b/src/documentation/content/xdocs/dev/faq.xml
@@ -48,9 +48,9 @@
     <faq id="doc-mgt">
       <question>Where can I learn how the FOP docs and web site are built?</question>
       <answer>
-      	<p>
-      		See FOP <link href="doc.html">Doc Management</link>. ;-)
-      	</p>
+        <p>
+            See FOP <link href="doc.html">Doc Management</link>. ;-)
+        </p>
       </answer>
     </faq>
   </part>
diff --git a/src/documentation/content/xdocs/dev/release.xml b/src/documentation/content/xdocs/dev/release.xml
index 8785d8789..fa4dbfa37 100644
--- a/src/documentation/content/xdocs/dev/release.xml
+++ b/src/documentation/content/xdocs/dev/release.xml
@@ -37,18 +37,18 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         <li>Determine whether this is a Release Candidate or a Release.</li>
         <li>Determine whether further testing is required.</li>
         <li>Commit any outstanding changes</li>
-		<li>Create a branch called <code>branches/fop-v_vv</code></li>
-        <li>Edit release notes (README and status.xml in the root).</li>
-        <li>Update the index.xml and site.xml for the new version.</li>
+        <li>Create a branch called <code>branches/fop-v_vv</code></li>
+        <li>Edit release notes (<code>README</code> and <code>status.xml</code> in the root).</li>
+        <li>Update the <code>index.xml</code> and <code>site.xml</code> for the new version.</li>
         <li>Update the version numbers in the release column on the
-        compliance page; update the compliance in the release column
+        compliance page (<code>compliance.xml</code>); update the compliance in the release column
         to the current state (development column).</li>
-        <li>Update version number in build.xml (not to be merged back
+        <li>Update version number in <code>build.xml</code> (not to be merged back
         into trunk).</li>
         <li>Copy trunk documentation directory to a new directory with
         the version number, and update any links and the .htaccess
         file for redirections.</li>
-		<li>Copy <code>test/fotree/disabled-testcases.xml</code> and
+        <li>Copy <code>test/fotree/disabled-testcases.xml</code> and
         <code>test/layoutengine/disabled-testcases.xml</code> to the
         new version directory
         <code>&lt;version>/fotree/disabled-testcases.xml</code> and
@@ -56,40 +56,40 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         Copy <code>known-issues.xml</code> to the new version
         directory. Copy <code>knownissues-overview.xml</code> from the
         previous to the new version directory.</li>
-		<li>Delete the previous version directory.</li>
-		<li>Build the dist files (<code>build[.sh] dist</code>)
+        <li>Delete the previous version directory.</li>
+        <li>Build the dist files (<code>build[.sh] dist</code>)
         and upload them to your web directory on
         <code>people.apache.org</code></li>
-		<li>Ask on fop-dev to check the branch and the generated dist
+        <li>Ask on fop-dev to check the branch and the generated dist
         files for errors.</li>
-        <li>Tag the source tree with the release ID. For example, if the release is 0.93:
-          <code>svn copy https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_93 https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_93</code></li>
+        <li>Tag the source tree with the release ID. For example, if the release is 0.94:
+          <code>svn copy https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_94 https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94</code></li>
         <li>Make a fresh checkout with the just created tag:
-          <code>svn co https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_93</code></li>
+          <code>svn co https://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94</code></li>
         <li>Copy jimi and jai to lib/ (jimi-1.0.jar, jai_core.jar, jai_codec.jar)</li>
         <li>Copy jce-jdk13-119.jar from <link href="http://www.bouncycastle.org/latest_releases.html">
           from http://www.bouncycastle.org/latest_releases.html</link> to lib/</li>
-		<li>Copy the hyphenation patterns jar file
+        <li>Copy the hyphenation patterns jar file
         <code>fop-hyph.jar</code> to lib/ (e.g. from
         <code>http://sourceforge.net/projects/offo</code></li>
         <li>Alternatively, create a build-local.properties file that points to the above libs.</li>
         <li>Run build[.sh] dist. Do this once using Sun JDK 1.3.1_15 or later and once with Sun JDK 1.4.2_08 or later. A Forrest installation is needed.</li>
         <li>Create signatures. Don't forget to upload your KEY:
-          <code>gpg -a -b --force-v3-sigs fop-0.93-src.tar.gz</code> etc.</li>
+          <code>gpg -a -b --force-v3-sigs fop-0.94-src.tar.gz</code> etc.</li>
         <li>Upload the dist and signature files to your web directory
           on people.apache.org (An account on minotaur is needed):
-          <code>scp fop-0.93*.tar.gz*
+          <code>scp fop-0.94*.tar.gz*
           chrisg@people.apache.org:public_html/</code></li>
         <li>Check permissions:
           <code>chmod 664 ... ; chgrp xmlgraphics ...</code></li>
-        <li>Add MD5 sums: <code>md5 fop-0.93-src.tar.gz &gt;
-          fop-0.93-src.tar.gz.md5</code> etc.</li>
+        <li>Add MD5 sums: <code>md5 fop-0.94-src.tar.gz &gt;
+          fop-0.94-src.tar.gz.md5</code> etc.</li>
         <li>Make a test download.</li>
-		<li>Start a vote for the release on
+        <li>Start a vote for the release on
         <code>general@xmlgraphics.a.o</code>. The message should point
         to the release files and list the MD5 sums (<code>cat
         *.md5</code>). The vote is open for 72hrs.</li>
-		<li>When the release is accepted, copy the release files,
+        <li>When the release is accepted, copy the release files,
         their md5 sum files and the signature files to
         /www/www.apache.org/dist/xmlgraphics/fop/ in the
         subdirectories <code>source</code> and
@@ -98,10 +98,10 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         the previous version.</li>
         <li>Update HEADER.html and README.html in people.apache.org:/www/www.apache.org/dist/xmlgraphics/fop/</li>
         <li>Wait 24 hours (for the mirrors to catch up).</li>
-		<li>Merge the changes of the subversion release branch back
+        <li>Merge the changes of the subversion release branch back
         into trunk (not the version number in the build file) and
         delete the branch.</li>
-		<li>Deploy the updated documentation to the FOP website.</li>
+        <li>Deploy the updated documentation to the FOP website.</li>
         <li>Post announcements on fop-dev and fop-user and other related mailing lists.</li>
         <li>Ask a Bugzilla admin (Christian Geisert) to add a bugzilla
         entry for the new release id, or create an issue at
@@ -131,7 +131,7 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         <li>general@xmlgraphics.apache.org</li>
         <li>general@xml.apache.org</li>
         <li>announce@apache.org (from your apache.org address)</li>
-		<li>xsl-list@lists.mulberrytech.com (subscriber-only)</li>
+        <li>xsl-list@lists.mulberrytech.com (subscriber-only)</li>
         <li>XSL-FO@yahoogroups.com (subscriber-only)</li>
         <li>www-xsl-fo@w3.org</li>
         <li>docbook-apps@lists.oasis-open.org (subscriber-only)</li>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index 53b698854..40e42236b 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -56,13 +56,6 @@
     <section id="source">
       <title>Source Download</title>
       <p>
-        You must first determine which of the two main development branches you wish 
-        to download, "maintenance" or "redesign". See 
-        <link href="dev/index.html">Development Introduction</link> for more details 
-        on the choices, and for the CVS tags to use when downloading the "maintenance" 
-        branch.
-      </p>
-      <p>
         There are several ways to obtain a source distribution. Please note that they 
         are listed from least current to most current:
       </p>
@@ -70,8 +63,7 @@
         <li>
           Download a released version from a 
           <link href="http://www.apache.org/dyn/closer.cgi/xmlgraphics/fop">FOP Distribution mirror</link>.
-          Source distributions include "-src" in their names. Please note that official 
-          releases currently are <em>only</em> made from the "maintenance" branch.
+          Source distributions include "-src" in their names.
         </li>
         <!--li>
           Download a CVS snapshot from the cvs files 
@@ -92,40 +84,21 @@
       <p/>
       <table>
         <tr>
-          <th colspan="2">Old Maintenance Branch (for 0.20.5)</th>
-        </tr>
-        <tr>
-          <td>Repository URL</td>
-          <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain/</code>
-            </link>
-          </td>
-        </tr>
-        <tr>
-          <td>Web view</td>
-          <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_20_2-maintain/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/branches/fop-0_20_2-maintain/</code>
-            </link>
-          </td>
-        </tr>
-        <tr>
           <th colspan="2">Latest Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_93/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_93/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_93/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_93/</code>
+            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
diff --git a/src/documentation/content/xdocs/examples.xml b/src/documentation/content/xdocs/examples.xml
index c8d4a5dde..3af9e8455 100644
--- a/src/documentation/content/xdocs/examples.xml
+++ b/src/documentation/content/xdocs/examples.xml
@@ -44,9 +44,9 @@
       </tr>
     </table>
     <p>Other basic examples on the use of XSL-FO can be found in the FOP distribution in
-       the subdirectory xml-fop/examples/fo. You can start transformation of all fo files into pdf
-       files by starting xml-fop/examples/fo/runtests (only source distribution). The resulting test
-       files can be found in xml-fop/examples/fo/tests
+       the subdirectory examples/fo. You can start transformation of all fo files into pdf
+       files by running ant in this directory (only source distribution). The resulting test
+       files can be found in examples/fo/tests
     </p>
     <p>At the moment the following files are part of the distribution:</p>
     <ul>
@@ -85,7 +85,7 @@
 Developers will find the first steps to a test suite for all implemented
 formatting objects and properties in xml-fop/test/xml/.
       </p>
-	</section>
+    </section>
           <section>
             <title>Images Examples</title>
             <p>
diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 2197947e4..5c99fbd3a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -70,9 +70,9 @@
           for XSL (FO) documents.
         </p>
         <p>
-          <link href="http://xml.apache.org/batik">Batik</link> can be used with
+          <link href="http://xmlgraphics.apache.org/batik">Batik</link> can be used with
           FOP to <link
-          href="http://xml.apache.org/batik/svgrasterizer.html">transcode an SVG
+          href="http://xmlgraphics.apache.org/batik/svgrasterizer.html">transcode an SVG
           image</link> into a PDF document.
         </p>
       </answer>
@@ -83,7 +83,7 @@
         <p>
           XSL is a W3C standard concerned with publishing XML documents. It
           consists of two parts: <link href="#XSLT">XSLT</link> and <link
-          href="#XSLFO">XSLFO</link>. The acronym expands to
+          href="#XSLFO">XSL-FO</link>. The acronym expands to
           e<strong>X</strong>tensible <strong>S</strong>tylesheet
           <strong>L</strong>anguage.
         </p>
@@ -138,10 +138,10 @@
         <p>
           When it's ready and the committers have enough time to go through 
           the time-consuming process of creating a release. We
-          released version 0.93 on 9 January 2007, and intend to
-          release version 1.0 later in 2007. If you
-        	want to speed up the process, consider to
-        	<link href="dev/index.html#involved">contribute</link> to FOP.</p>
+          released version 0.94 on XX August 2007, and intend to
+          release version 1.0 later in late 2007 or early 2008. If you
+          want to speed up the process, consider
+          <link href="dev/index.html#involved">contributing</link> to FOP.</p>
       </answer>
     </faq>
     <faq id="redesign">
@@ -170,13 +170,13 @@
     <title>Problems running FOP</title>
     <faq id="no-page-master">
       <question>I get the error: [ERROR]: 'master-reference' for
-      'fo:page-sequence'matches no 'simple-page-master' or
+      'fo:page-sequence' matches no 'simple-page-master' or
       'page-sequence-master'</question>
       <answer>
         <p>
           FOP was changed to be in accordance with the latest standard (see
-          <link href="resources.html#w3-xsl">XSL standard</link>).The page
-          master for a fo:page-sequence is now refereced by the
+          <link href="resources.html#specs-xslfo">XSL standard</link>).The page
+          master for a fo:page-sequence is now referenced by the
           master-reference attribute. Replace the master-name attributes of
           your fo:page-sequence elements by master-reference attributes. You
           have to do this also for fo:single-page-master-reference,
@@ -211,7 +211,7 @@
           If you run FOP embedded in your servlet, web application or
           other Java application, check the classpath of the
           application. Check the also the information pertaining to <link
-          href="0.93/servlets.html#servlet-engine">servlet engines</link>
+          href="0.94/servlets.html#servlet-engine">servlet engines</link>
           for further hints.
         </p>
         <p>
@@ -241,7 +241,7 @@
       <question>I get an OutOfMemoryException.</question>
       <answer>
         <p>
-          See <link href="0.93/running.html#memory">FOP Memory</link>.
+          See <link href="0.94/running.html#memory">FOP Memory</link>.
         </p>
       </answer>
     </faq>
@@ -295,14 +295,14 @@
           whether you got them right.
         </p>
         <p>
-          You may find it helpful to use the <link href="#FO-validate">validation tools</link> to validate your
+          You may find it helpful to use the <link href="#fo-validate">validation tools</link> to validate your
           FO document. This will catch most problems, but should not be
           relied upon to catch all.
         </p>
         <p>
           If you use XSLT, problems in your style sheet and in your
           source XML also can produce a NullPointerException. <link
-          href="0.93/running.html#check-input">Run the transformation
+          href="0.94/running.html#check-input">Run the transformation
           separately</link> to check for this, usually you'll get a
           detailed error message from the XSLT processor.
         </p>
@@ -336,7 +336,7 @@
         </p>
         <p>
           If you called the FOP command line application from some other
-          programm, for example from Java using Runtime.exec(), it may hang
+          program, for example from Java using Runtime.exec(), it may hang
           while trying to write log entries to the output pipe. You have to read
           the FOP output regularly to empty the pipe buffer. It is best to avoid
           exec'ing FOP, use the library interface instead.
@@ -368,8 +368,8 @@
       <question>FOP does not find my fonts.</question>
       <answer>
         <p>
-          Did you get: &#171;Failed to read font metrics file C:\foo\arial.xml
-          : File "C:\foo\arial.xml" not found&#187;? The value for the
+          Did you get: &#8220;Failed to read font metrics file C:\foo\arial.xml
+          : File "C:\foo\arial.xml" not found&#8221;? The value for the
           metrics-file attribute in the user config file is actually an URL, not
           a file name. Use "file:///C:/foo/arial.xml" instead.
         </p>
@@ -380,7 +380,7 @@
         </p>
         <p>
           Try also setting the <link
-          href="0.93/configuration.html#general-elements">font-base
+          href="0.94/configuration.html#general-elements">font-base
           configuration</link>.
         </p>
       </answer>
@@ -389,7 +389,7 @@
   <part id="part-output">
     <title>Problems with FOP output</title>
     <faq id="leader-expansion">
-      <question>Leaders don't work anymore in 0.93. Instead of
+      <question>Leaders don't work anymore in 0.94. Instead of
       filling the line, only three dots or a short ruler is
       output.</question>
       <answer>
@@ -410,7 +410,7 @@
           The new implementation uses leader-length.optimum to
           determine where to break the line, and expands the leader
           only further if the line should be filled, as indicated by
-          the text-aling and text-align-last properties.
+          the text-align and text-align-last properties.
         </p>
         <p>
           Actually due to the fuzzyness of the specification both the
@@ -432,7 +432,7 @@
         </p>
         <p>
           The <link
-          href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#force-page-count">force-page-count
+          href="http://www.w3.org/TR/xsl11/#force-page-count">force-page-count
           property</link> controls how a FO processor pads page sequences in
           order to get certain page counts or last page numbers. The default is
           "<code>auto</code>". With this setting, if the next page sequence
@@ -470,7 +470,7 @@ Check the following:</p>
         <p>Other possibilities:</p>
         <ul>
           <li>The image format is not supported or not supported completely.
-          See <link href="0.93/graphics.html">FOP Graphics Formats</link> for a
+          See <link href="0.94/graphics.html">FOP Graphics Formats</link> for a
           list of supported formats and related issues.</li>
           <li>The graphic may be too large to fit into the intended space.</li>
           <li>There may be something (static content) that is obscuring the
@@ -482,14 +482,14 @@ Check the following:</p>
     <faq id="png-fails">
       <question>My graphical images do not work properly.</question>
       <answer>
-        <p>See <link href="0.93/graphics.html">FOP Graphics Formats</link> for a
+        <p>See <link href="0.94/graphics.html">FOP Graphics Formats</link> for a
         list of supported graphics formats and related issues.</p>
       </answer>
     </faq>
     <faq id="graphic-resolution">
       <question>Why is my graphic rendered at a different resolution than it was created?</question>
       <answer>
-        <p>See <link href="0.93/graphics.html#resolution">Graphics Resolution</link>.</p>
+        <p>See <link href="0.94/graphics.html#resolution">Graphics Resolution</link>.</p>
       </answer>
     </faq>
     <faq id="keep-with">
@@ -582,9 +582,9 @@ Check the following:</p>
       <answer>
         <p>
           This is usually caused by setting a "height" on a table-row or table-cell and when
-          the content is higher that the specified height. By setting "height" (a so-called 
+          the content is higher than the specified height. By setting "height" (a so-called 
           corresponding property) you 
-          <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N6057-Height,-and-Width-Properties">implicitely set</link>
+          <link href="http://www.w3.org/TR/xsl11/#d0e4413">implicitely set</link>
           block-progression-dimension.minimum, block-progression-dimension.optimum and 
           block-progression-dimension.maximum to the same value. You'll get some information 
           about that in the warning message. Look for something like: 
@@ -592,10 +592,10 @@ Check the following:</p>
         </p>
         <p>
           Assuming you set the height on the table-row to 14pt and your content is 75pt high,
-          a constraint (maximum=14pt) is violated. Normally, you just want want to make sure
+          a constraint (maximum=14pt) is violated. Normally, you just want to make sure
           with the "height" property that the row has a minimum height. If that is so, the
           right solution is to specify block-progression-dimension.minimum="14pt" instead of
-          heigth="14pt".
+          height="14pt".
         </p>
       </answer>
     </faq>
@@ -621,7 +621,7 @@ Check the following:</p>
       <answer>
         <p>Make sure you have set the language and optionally the country attributes for an appropriate XSL-FO element (fo:page-sequence, fo:block or fo:character):</p>
         <source><![CDATA[<fo:page-sequence language="fi">]]></source>
-        <p>See <link href="0.93/hyphenation.html#support">Hyphenation Support</link> for details and instructions on using hyphenation with FOP.</p>
+        <p>See <link href="0.94/hyphenation.html#support">Hyphenation Support</link> for details and instructions on using hyphenation with FOP.</p>
         <p>Explicitly enable hyphenation for an appropriate XSL-FO element (fo:block, fo:character):</p>
         <source><![CDATA[<fo:block hyphenate="true">]]></source>
       </answer>
@@ -652,7 +652,7 @@ Check the following:</p>
       <question>How do I use FOP in a servlet?</question>
       <answer>
         <p>
-          See <link href="0.93/servlets.html">Using FOP in a Servlet</link>.
+          See <link href="0.94/servlets.html">Using FOP in a Servlet</link>.
         </p>
       </answer>
     </faq>
@@ -661,7 +661,7 @@ Check the following:</p>
       transformation?</question>
       <answer>
         <p>
-          See <link href="0.93/servlets.html#xslt">Using FOP in a Servlet with XSLT Transformation</link>.
+          See <link href="0.94/servlets.html#xslt">Using FOP in a Servlet with XSLT Transformation</link>.
         </p>
       </answer>
     </faq>
@@ -669,7 +669,7 @@ Check the following:</p>
       <question>How do I pass parameters to the XSLT transformation?</question>
       <answer>
         <p>
-          See <link href="0.93/servlets.html#xslt">Using FOP in a Servlet with XSLT Transformation</link>.
+          See <link href="0.94/servlets.html#xslt">Using FOP in a Servlet with XSLT Transformation</link>.
         </p>
       </answer>
     </faq>
@@ -687,7 +687,7 @@ Check the following:</p>
       <question>How do I set the baseDir property in a servlet environment?</question>
       <answer>
         <p>
-          See <link href="0.93/embedding.html#config-internal">Setting the Configuration Programmatically</link>.
+          See <link href="0.94/embedding.html#config-internal">Setting the Configuration Programmatically</link>.
         </p>
       </answer>
     </faq>
@@ -695,7 +695,7 @@ Check the following:</p>
       <question>How do I use a user configuration file from a servlet?</question>
       <answer>
         <p>
-          See <link href="0.93/embedding.html#config-external">Using a Configuration File in an Embedded App</link>.
+          See <link href="0.94/embedding.html#config-external">Using a Configuration File in an Embedded App</link>.
         </p>
       </answer>
     </faq>
@@ -704,7 +704,7 @@ Check the following:</p>
         get FOP working for various servlet engines?</question>
       <answer>
         <p>
-          See <link href="0.93/servlets.html#servlet-engine">Servlet Engines</link>.
+          See <link href="0.94/servlets.html#servlet-engine">Servlet Engines</link>.
         </p>
       </answer>
     </faq>
@@ -712,7 +712,7 @@ Check the following:</p>
       <question>Can FOP be used in multithreaded environments?</question>
       <answer>
         <p>
-          See <link href="0.93/embedding.html#multithreading">Multithreading FOP</link>.
+          See <link href="0.94/embedding.html#multithreading">Multithreading FOP</link>.
         </p>
       </answer>
     </faq>
@@ -723,13 +723,13 @@ Check the following:</p>
       <question>The rendering of SVG text in my PDF is of poor quality.
 Can I control this?</question>
       <answer>
-        <p>See <link href="0.93/graphics.html#svg-pdf-text">Placing SVG Text into PDF</link>.</p>
+        <p>See <link href="0.94/graphics.html#svg-pdf-text">Placing SVG Text into PDF</link>.</p>
       </answer>
     </faq>
     <faq id="svg-headless">
       <question>How do I use FOP with SVG on headless servers?</question>
       <answer>
-        <p>See <link href="0.93/graphics.html#batik">FOP: Graphics (Batik)</link>.</p>
+        <p>See <link href="0.94/graphics.html#batik">FOP: Graphics (Batik)</link>.</p>
       </answer>
     </faq>
     <faq id="svghangs">
@@ -792,7 +792,7 @@ Can I control this?</question>
     <faq id="svg-scaling">
       <question>Why is my SVG rendered at a size different from that specified in my fo:external-graphic element?</question>
       <answer>
-        <p>See <link href="0.93/graphics.html#svg-scaling">SVG Scaling</link>.</p>
+        <p>See <link href="0.94/graphics.html#svg-scaling">SVG Scaling</link>.</p>
       </answer>
     </faq>
     <faq id="svg-attribute-required">
@@ -825,7 +825,7 @@ Can I control this?</question>
       <question>How do I embed fonts in PDF?</question>
       <answer>
         <p>
-          See the <link href="0.93/fonts.html">Fonts</link> page for information
+          See the <link href="0.94/fonts.html">Fonts</link> page for information
           about embedding fonts.
         </p>
       </answer>
@@ -844,7 +844,7 @@ Can I control this?</question>
           set. For a variety of reasons, even those are not completely
           guaranteed to work, for example you can't use the fi
           ligature from the standard serif font. Check the <link
-          href="0.93/output.html#pdf-fonts">overview</link> for the default
+          href="0.94/output.html#pdf-fonts">overview</link> for the default
           PDF fonts.
         </p>
         <p>
@@ -852,7 +852,7 @@ Can I control this?</question>
           the desired character. Furthermore the font must be
           available on the machine where the PDF is viewed or it must
           have been embedded in the PDF file. See <link
-          href="0.93/fonts.html">embedding fonts</link>.
+          href="0.94/fonts.html">embedding fonts</link>.
         </p>
         <p>
           For most symbols, it is better to select the symbol font
@@ -870,7 +870,7 @@ Can I control this?</question>
     <faq id="pdf-postprocess">
       <question>What tools are available for post-processing my PDF document?</question>
       <answer>
-        <p>See <link href="0.93/output.html#pdf-postprocess">PDF Post-processing</link>.</p>
+        <p>See <link href="0.94/output.html#pdf-postprocess">PDF Post-processing</link>.</p>
       </answer>
     </faq>
     <faq id="pdf-security">
@@ -878,8 +878,8 @@ Can I control this?</question>
       to my PDF document?</question>
       <answer>
         <p>
-          See <link href="0.93/pdfencryption.html">PDF Encryption</link>.
-          See also <link href="0.93/output.html#pdf-postprocess">PDF Post-processing</link>.
+          See <link href="0.94/pdfencryption.html">PDF Encryption</link>.
+          See also <link href="0.94/output.html#pdf-postprocess">PDF Post-processing</link>.
         </p>
       </answer>
     </faq>
@@ -887,13 +887,13 @@ Can I control this?</question>
       <question>How do I add document properties (title, author, etc.) to my
       PDF document?</question>
       <answer>
-        <p>See <link href="0.93/output.html#pdf-postprocess">PDF Post-processing</link>.</p>
+        <p>See <link href="0.94/output.html#pdf-postprocess">PDF Post-processing</link>.</p>
       </answer>
     </faq>
     <faq id="pdf-watermark">
       <question>How do I add watermarks to my PDF document?</question>
       <answer>
-        <p>See <link href="0.93/output.html#pdf-watermark">PDF Watermarks</link>.</p>
+        <p>See <link href="0.94/output.html#pdf-watermark">PDF Watermarks</link>.</p>
       </answer>
     </faq>
     <faq id="pdf-print-contortion">
@@ -912,11 +912,6 @@ Can I control this?</question>
       <question>How do I control the Acrobat bookmark display?</question>
       <answer>
         <p>
-          FOP 0.20.5 does not support this feature. Possible workarounds
-          include those mentioned in the <link href="0.93/output.html#pdf-postprocess">PDF
-            Post-Processing FAQ</link>.
-        </p>
-        <p>
           FOP versions 0.93 and later support the starting-state property of the XSL 1.1
           <link href="http://www.w3.org/TR/xsl11/#fo_bookmark">fo:bookmark</link>
           element which can be used for this. The color, font-style and 
@@ -934,7 +929,7 @@ Can I control this?</question>
       <answer>
         <p>
           This is a problem of Internet Explorer requesting the content several
-          times. Please see the <link href="0.93/servlets.html#ie">notes on Internet Explorer</link>
+          times. Please see the <link href="0.94/servlets.html#ie">notes on Internet Explorer</link>
           for more information.
         </p>
       </answer>
@@ -955,7 +950,7 @@ Can I control this?</question>
           For the second task, you can use some client side script to start
           Acrobat Reader in print mode, or use a Java applet based on the FOP
           print servlet. This depends heavily on the client installation and
-          should not relied on except in tightly controlled environments.
+          should not be relied on except in tightly controlled environments.
         </p>
         <p>
           See also <link href="http://marc.theaimsgroup.com/?l=fop-dev&amp;m=101065988325115&amp;w=2">http://marc.theaimsgroup.com/?l=fop-dev&amp;m=101065988325115&amp;w=2</link>
@@ -1114,21 +1109,21 @@ Can I control this?</question>
       <question>Can I use FOP to convert XHTML or HTML files to PDF?</question>
       <answer>
         <p>
-        	You will get better results if you transform your source
-			XML directly into XSLFO. It is tempting to use the
-			XML-&gt;XHTML-&gt;XSLFO approach, because this apparently means
-			there's only one transformation to maintain, but XHTML
-			and publishing grade PDF are dissimilar enough that an
-			"generic" XHTML-&gt;XSLFO(PDF) usually wont cut it, because
-			the XHTML already lacks information from the original XML.
-			It may be worthwhile to go from the source XML to an
-			intermediate custom XML which on one hand is close enough
-			to representation to allow simple transformation to either
-			XHTML or XSLFO for most of the structure, but on the other
-			hand retains enough semantic from the original XML that
-			elements which must be handled differently in the two
-			representations can be handled differently. Setting this
-			up requires experience and most likely extensive prototyping.
+          You will get better results if you transform your source
+          XML directly into XSLFO. It is tempting to use the
+          XML-&gt;XHTML-&gt;XSLFO approach, because this apparently means
+          there's only one transformation to maintain, but XHTML
+          and publishing grade PDF are dissimilar enough that an
+          "generic" XHTML-&gt;XSLFO(PDF) usually wont cut it, because
+          the XHTML already lacks information from the original XML.
+          It may be worthwhile to go from the source XML to an
+          intermediate custom XML which on one hand is close enough
+          to representation to allow simple transformation to either
+          XHTML or XSLFO for most of the structure, but on the other
+          hand retains enough semantic from the original XML that
+          elements which must be handled differently in the two
+          representations can be handled differently. Setting this
+          up requires experience and most likely extensive prototyping.
         </p>
       </answer>
     </faq>
@@ -1136,11 +1131,11 @@ Can I control this?</question>
       <question>I know it may be a bad idea to use FOP to convert XHTML or HTML files to PDF, but I want to do it anyway. Are there any tools available to help me?</question>
       <answer>
         <p>
-        	The <link href="resources.html">FOP Resources page</link> has links
-        	to a tool called <link href="http://html2fo.sourceforge.net/">html2fo</link>
-        	which can be used to make such a transformation. In addition, there
-        	are tools on the Antenna House <link href="http://www.antennahouse.com/XSLsample/XSLsample.htm">XSL-FO Tutorial and Sample</link>
-			page.
+          The <link href="resources.html">FOP Resources page</link> has links
+          to a tool called <link href="http://html2fo.sourceforge.net/">html2fo</link>
+          which can be used to make such a transformation. In addition, there
+          are tools on the Antenna House <link href="http://www.antennahouse.com/XSLsample/XSLsample.htm">XSL-FO Tutorial and Sample</link>
+          page.
         </p>
       </answer>
     </faq>
@@ -1150,9 +1145,9 @@ Can I control this?</question>
     <faq id="doc-mgt">
       <question>Where can I learn how the FOP docs and web site are built?</question>
       <answer>
-      	<p>
-      		See FOP <link href="dev/doc.html">Doc Management</link>. ;-)
-      	</p>
+        <p>
+          See FOP <link href="dev/doc.html">Doc Management</link>. ;-)
+        </p>
       </answer>
     </faq>
   </part>
@@ -1196,7 +1191,7 @@ Can I control this?</question>
           <li>
             In the case where something works properly with another formatter,
             (AntennaHouse, PassiveTex, etc.) but doesn't work with FOP, please
-            check the <link href="relnotes.html">Release Notes</link>, the
+            check the <!--link href="relnotes.html"-->Release Notes<!--/link-->, the
             <link href="compliance.html">FOP Standards Compliance</link> document,
             and the remaining FAQ in this document. If not found there, look at the
             list of <link href="bugs.html#issues_existing">Bugs Already Reported</link>.
diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml
index 62d7a63df..5ab95fe8d 100644
--- a/src/documentation/content/xdocs/fo.xml
+++ b/src/documentation/content/xdocs/fo.xml
@@ -31,7 +31,7 @@
         FOP uses XSL-FO as input.
 It is the responsibility of the user to make sure that the XSL-FO submitted to FOP is correct.
 The tutorial items presented here are not comprehensive, but are of the FAQ variety. Another 
-good FAQ is <fork href="http://www.dpawson.co.uk/xsl/xslfaq.html">Dave Pawson's XSL FAQ</fork>.
+good FAQ is <fork href="http://www.dpawson.co.uk/xsl/">Dave Pawson's XSL FAQ</fork>.
       </p>
     </section>
     <section id="xml">
@@ -92,7 +92,7 @@ It is not necessary everywhere, but it is wise to do so anyway, just to be sure.
       <section id="xml-encoding">
         <title>Encoding Issues</title>
         <p>
-          If the parser complains about illegal bytes or characters in the input, or there are unexpected characters in the output, this is usually is the result of a character encoding problem.
+          If the parser complains about illegal bytes or characters in the input, or there are unexpected characters in the output, this is usually the result of a character encoding problem.
 See the <link href="http://www.dpawson.co.uk/xsl">XSL FAQ</link> for additional information.
 Many software packages that produce XML, including XSLT processors, use UTF-8 encoding as a default.
 If you view their output with something not aware of the encoding, like Notepad for Win95/98/ME/NT, funny characters are displayed. A &#197; is a giveaway.
@@ -350,13 +350,14 @@ Omit your normal headers and footers, and use (for example) an extended header t
       <section id="fo-preformat">
         <title>Preformatting Content</title>
         <p>
-          Sometimes it is desirable to retain linebreaks and hard spaces, and to get preformatted text to pass through without being changed.
-The XSL-FO specification provides some properties for this: <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">white-space-collapse</link> and <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#linefeed-treatment">linefeed-treatment</link>.
-In FOP, use white-space-collapse="false" on an enclosing block.
+          Sometimes it is desirable to retain linebreaks and hard spaces, and to get
+          preformatted text to pass through without being changed. The XSL-FO
+          specification provides some properties for this: <link
+            href="http://www.w3.org/TR/xsl11/#white-space-collapse">white-space-collapse</link>
+          and <link
+            href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">linefeed-treatment</link>.
+          In FOP, use white-space-collapse="false" on an enclosing block.
         </p>
-        <warning>
-          Due to a bug in FOP 0.20.5, setting white-space-collapse="false" will also preserve line breaks in the text. Do not rely on this behavior, as it is non-conformant and has changed in FOP 0.93.
-        </warning>
       </section>
       <section id="fo-total-pages">
         <title>Total Document Pages</title>
@@ -447,7 +448,7 @@ This applies similarly to the extent of the after region and the bottom margin o
         </p>
         <ul>
           <li>
-            Horizontal lines can be drawn using <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_leader">fo:leader</link>.
+            Horizontal lines can be drawn using <link href="http://www.w3.org/TR/xsl11/#fo_leader">fo:leader</link>.
           </li>
           <li>
             Use a solid border on a suitable fo:block. This will work for horizontal and vertical lines only.
@@ -463,9 +464,12 @@ This applies similarly to the extent of the after region and the bottom margin o
           <link href="http://www.renderx.com">RenderX</link> has provided an <link href="http://www.renderx.com/Tests/validator/fo.dtd.html">Unofficial DTD for FO Documents</link>, which may be helpful in validating general FO issues.
         </p>
         <p>
-          FOP also maintains an <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/foschema/fop.xsd?view=co">Unofficial FOP Schema</link> in the FOP CVS Repository.
-This document can be used either to validate against the FO standard, or against the actual FOP implementation.
-See the notes near the beginning of the document for instructions on how to use it.
+          FOP also maintains an <link
+            href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/foschema/fop.xsd?view=co">Unofficial
+            FOP Schema</link> in the FOP Subversion Repository. This document can be used
+          either to validate against the FO standard, or against the actual FOP
+          implementation. See the notes near the beginning of the document for
+          instructions on how to use it.
           </p>
       </section>
       <section id="landscape">
@@ -484,8 +488,8 @@ See the notes near the beginning of the document for instructions on how to use
       </section>
       <section id="external-resources">
         <title>External Resources</title>
-        <p>Resources needed by an XSL-FO file that are external to it (graphics, for example), are defined in the XSL-FO standard as being of type "uri-specification". This is defined in the standard at <jump href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice5.html#section-N8794-Property-Datatypes">Section 5.11 Property Datatypes</jump>, which includes a link to the URI standard itself. Refer to the XSL-FO and URI standards themselves for more detailed instructions.</p>
-        <p>URIs may be either absolute or relative to a base URI. (See <link href="0.20.5/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p>
+        <p>Resources needed by an XSL-FO file that are external to it (graphics, for example), are defined in the XSL-FO standard as being of type "uri-specification". This is defined in the standard at <jump href="http://www.w3.org/TR/xsl11/#datatype">Section 5.11 Property Datatypes</jump>, which includes a link to the URI standard itself. Refer to the XSL-FO and URI standards themselves for more detailed instructions.</p>
+        <p>URIs may be either absolute or relative to a base URI. (See <link href="0.94/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p>
         <source><![CDATA[<fo:external-graphic src="url('images/logo.jpg')"/>]]></source>
         <p>Here is an example referencing an external-graphic that is an absolute URI on a local filesystem:</p>
         <source><![CDATA[fo:external-graphic src="url('file:d:///images/logo.jpg')"/>]]></source>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 72ff065f7..b0f44fac3 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -26,25 +26,19 @@
   <body>
     <section id="intro">
       <title>Introduction</title>
-    <p>Apache FOP (Formatting Objects Processor) is the world's first print formatter driven by XSL formatting
-       objects (XSL-FO) and the world's first output independent formatter. It is a
-       Java application that reads a formatting object (FO) tree and
-       renders the resulting pages to a specified output. <link href="0.20.5/output.html">Output formats</link>
-       currently supported include PDF, PCL, PS, SVG, XML (area tree representation),
-       Print, AWT, MIF and TXT.
-       The primary output target is PDF.
-    </p>
+      <p>Apache FOP (Formatting Objects Processor) is a print formatter driven by XSL
+        formatting objects (XSL-FO) and an output independent formatter. It is a Java
+        application that reads a formatting object (FO) tree and renders the resulting
+        pages to a specified output. <link href="0.94/output.html">Output formats</link>
+        currently supported include PDF, PS, PCL, AFP, XML (area tree representation),
+        Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary output target is PDF.
+      </p>
         <figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" />
     <p>
-      The previous version of FOP (<link href="0.20.5/">0.20.5</link>) is a partial implementation of the
-      <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/">XSL-FO Version 1.0
-      W3C Recommendation</link>.
-    </p>
-    <p>
-      The latest stable version of FOP (<link href="0.93/">0.93</link>) is the first stable release 
-      after a large redesign effort and implements a larger subset than 0.20.5 of the 
-      <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/">XSL-FO Version 1.0 W3C Recommendation</link>
-      as well as some parts of the <link href="http://www.w3.org/TR/xsl11">XSL-FO Version 1.1 Working Draft</link>.
+      The latest stable version of FOP (<link href="0.94/">0.94</link>) is the second
+      stable release after a large redesign effort and implements a large subset of the
+      <link href="http://www.w3.org/TR/xsl11/">XSL-FO Version 1.1 W3C
+        Recommendation</link>.
     </p>
     <p>
       Support for each of the standard's objects and properties is detailed in <link href="compliance.html">FOP Compliance</link>.
@@ -63,22 +57,21 @@ is formatted into the two pages on the right. The document contains static areas
 </p>
 <p>
 FOP uses the standard XSL-FO file format as input, lays the content out into pages, then renders it to the requested output.
-One great advantage to using XSL-FO as input is that XSL-FO is itself an XML file, which means that it can be conveniently created from a variety of sources.
+One great advantage of using XSL-FO as input is that XSL-FO is itself an XML file, which means that it can be conveniently created from a variety of sources.
 The most common method is to convert semantic XML to XSL-FO, using an XSLT transformation.</p>
   </section>
   <section id="objectives">
     <title>FOP Objectives</title>
-    <p>The goals of the Apache FOP project are to deliver an XSL-FO to PDF formatter that is compliant to at least the Basic
-       conformance level described in the W3C Recommendation from 15 October 2001, and that complies with the 11 March 1999 Portable Document
-       Format Specification (Version 1.3) from Adobe Systems.
+    <p>The goals of the Apache FOP project are to deliver an XSL-FO to PDF formatter that
+      is compliant to at least the Basic conformance level described in the W3C
+      Recommendation from 05 December 2006, and that complies with the November 2001
+      Portable Document Format Specification (Version 1.4) from Adobe Systems.
     </p>
 
     <p>Conformance to the XML 1.0 Recommendation, XSLT 1.0 Recommendation and the XML Namespaces Recommendation is
        understood. Other relevant documents, such as the XPath and XLink Working Drafts, are referenced as necessary. The FOP
        Project will attempt to use the latest version of evolving specifications.
     </p>
-
-   <p>The FOP layout system is currently being rewritten to better support the XSL-FO standard.</p>
   </section>
   <note>
     The PDF files on this site are created using Apache FOP.
diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml
index ac98024a7..23cdad106 100644
--- a/src/documentation/content/xdocs/maillist.xml
+++ b/src/documentation/content/xdocs/maillist.xml
@@ -78,7 +78,11 @@ href="dev/index.html#mail-fop-dev">Development pages</link>.</note>
           <li>Have you read <link href="#general">Mailing List General Information</link>? If not please do so before proceeding.</li>
           <li>Have you stated the version of FOP you are using? Please do so. Usually, it's a good idea to state the JDK/JRE version and the operating system you're using, too.</li>
           <li>Have you included any detailed error messages? Please do so.</li>
-          <li>Does a proper understanding of your question require inclusion of XSLT code, DocBook source, or other semantic XML? If so, the question is <em>almost certainly not appropriate to this list</em>. In general, the only input documents that are appropriate on this list are XSL-FO snippets. See <link href="0.20.5/running.html#running_xalan">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li>
+          <li>Does a proper understanding of your question require inclusion of XSLT code, DocBook
+            source, or other semantic XML? If so, the question is <em>almost certainly not
+              appropriate to this list</em>. In general, the only input documents that are
+            appropriate on this list are XSL-FO snippets. See <link
+              href="0.94/running.html#check-input">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li>
           <li>If you are providing one or more XSL-FO snippets:
             <ul>
               <li>Have you reduced them to the shortest possible complete, <strong>self-contained</strong> document that demonstrates the problem? Please do so.</li>
diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml
index efa380bb4..9f84de273 100644
--- a/src/documentation/content/xdocs/news.xml
+++ b/src/documentation/content/xdocs/news.xml
@@ -26,18 +26,26 @@
   </header>
   <body>
     <section>
+      <title>XX August 2007 - Apache FOP 0.94 Released</title>
+      <p>The Apache FOP team is pleased to present you the second production
+        grade release of the new FOP codebase. This release contains many bug
+        fixes and new features. See the <a
+          href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
+        the most important changes.</p>
+    </section>
+    <section>
       <title>26 January 2007 - New Committer</title>
       <p>Welcome Jay Bryant!</p>
     </section>
-	<section>
-	  <title>9 January 2007 - Apache FOP 0.93 released</title>
+    <section>
+      <title>9 January 2007 - Apache FOP 0.93 released</title>
       <p>
         The Apache FOP team is proud to present to you the first
         production grade release of the new FOP codebase. This release
         has the new API first introduced in release 0.92 beta. It
         contains again many bug fixes and new features.
       </p>
-	</section>
+    </section>
     <section>
       <title>16 October 2006 - New Committer</title>
       <p>Welcome Vincent Hennebert!</p>
@@ -71,8 +79,8 @@
       </p>
       <p>
         Please see also the 
-        <link href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</link>
-        and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.
+        <link href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</link>.
+        <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
       </p>
     </section>
     <section>
@@ -83,7 +91,7 @@
       <title>20 October 2004 - Creation of the Apache XML Graphics project</title>
       <p>
         The Apache Board of Directors agreed to the creation of the 
-        <link href="http://xmlgrapics.apache.org">Apache XML Graphics</link>
+        <link href="http://xmlgraphics.apache.org">Apache XML Graphics</link>
         project which will be comprised of Batik and FOP. Both former 
         Apache XML subprojects are in this way complying with the Board's desire
         to improve project oversight. Both project teams also see additional
@@ -137,7 +145,8 @@
       <p>
       See also the full text of the
       <link href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=6067">
-      announcement</link> and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.
+        announcement</link>.
+      <!-- TODO re-enable  and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
       </p>
     </section>
     <section>
diff --git a/src/documentation/content/xdocs/relnotes.xml b/src/documentation/content/xdocs/relnotes.xml
index 8499d674b..0037817bd 100644
--- a/src/documentation/content/xdocs/relnotes.xml
+++ b/src/documentation/content/xdocs/relnotes.xml
@@ -44,11 +44,11 @@
     </li>
     <li>
       The API has changed between 0.91beta this release.
-      Please consult the <a href="0.93/upgrading.html">"Upgrading"</a> page for details.
+      Please consult the <a href="0.94/upgrading.html">"Upgrading"</a> page for details.
     </li>
     <li>
       You may experience different behaviour compared to version 0.20.5.
-      Please consult the <a href="0.93/upgrading.html">"Upgrading"</a> page for details.
+      Please consult the <a href="0.94/upgrading.html">"Upgrading"</a> page for details.
     </li>
   </ul>
   <p>Known Issues:</p>
@@ -177,7 +177,7 @@
     </li>
     <li>
       You may experience different behaviour compared to version 0.20.5.
-      Please consult the <a href="0.93/upgrading.html">"Upgrading"</a> page indicated above for details.
+      Please consult the <a href="0.94/upgrading.html">"Upgrading"</a> page indicated above for details.
     </li>
   </ul>
   <p>Known Issues:</p>
@@ -318,7 +318,7 @@
     </li>
     <li>
       You may experience different behaviour compared to version 0.20.5.
-      Please consult the <a href="0.93/upgrading.html">"Upgrading"</a> page indicated above for details.
+      Please consult the <a href="0.94/upgrading.html">"Upgrading"</a> page indicated above for details.
     </li>
   </ul>
   <p>Known Issues:</p>
@@ -430,7 +430,7 @@
 </section>
 <section>
   <title>FOP 0.20.5</title>
-  <p>This is the last planned release in the 0.20.x series (aka maintenance branch).</p>
+  <p>This was the last release in the 0.20.x series (aka maintenance branch).</p>
   <p>Important changes since the last release (0.20.4):</p>
   <ul>
     <li>Some hyphenation patterns (cs, da, de, de_DR, el, en, en_US, fr, nl,
@@ -461,7 +461,8 @@
     <li>Links in PDF won't generate multiple link rectangles anymore. If this causes
         a problem you can set the system property "links.merge" to "no".
     </li>
-    <li>FOP has been compiled with cryptography support. See <a href="0.20.5/pdfencryption.html">
+    <li>FOP has been compiled with cryptography support. See 
+      <a href="0.94/pdfencryption.html">
       PDF encryption</a> for details about installation and usage.
     </li>
     <li>The behaviour of leader has changed. See
@@ -496,7 +497,7 @@
         support for additional truetype fonts in AWT Viewer.
       </li>
       <li>Logging has been changed from LogKit to Avalon's Logger Interface.
-        (see <a href="0.20.5/embedding.html">Embedding</a> for details).
+        (see <a href="0.94/embedding.html">Embedding</a> for details).
       </li>
       <li>Building under JDK 1.4:
          You need to add a method in
diff --git a/src/documentation/content/xdocs/resources.xml b/src/documentation/content/xdocs/resources.xml
index 44aef321c..f4bfc45f7 100644
--- a/src/documentation/content/xdocs/resources.xml
+++ b/src/documentation/content/xdocs/resources.xml
@@ -30,7 +30,7 @@
       <section id="specs-xslfo">
         <title>XSL-FO</title>
         <ul>
-          <li><jump href="http://www.w3.org/TR/2001/REC-xsl-20011015/">XSL-FO Recommendation (15 October 2001)</jump></li>
+          <li><jump href="http://www.w3.org/TR/xsl11/">XSL-FO Recommendation (05 December 2006)</jump></li>
           <li><jump href="http://www.renderx.com/Tests/validator/fo.dtd.html">Unofficial DTD for the XSL-FO Recommendation</jump> provided by N. Grigoriev from RenderX.</li>
         </ul>
       </section>
@@ -87,7 +87,6 @@
           <li>[online article] <jump href="http://www.xml.com/pub/a/2001/01/17/xsl-fo/index.html">Using XSL Formatting Objects</jump>, by J. David Eisenberg.</li>
           <li>[online reference] <jump href="http://zvon.org/xxl/xslfoReference/Output/index.html">XSL FO reference</jump>, by Miloslav Nic.</li>
           <li>[online reference] <jump href="http://www.dpawson.co.uk/xsl/sect3/index.html">Dave Pawson's XSL-FO FAQ</jump>.</li>
-          <li>[online book] <jump href="http://www.dpawson.co.uk/xsl/sect3/bk/index.html">An introduction to XSL Formatting Objects</jump>, by Dave Pawson. See hardcopy version below.</li>
           <li>[book] <jump href="http://www.oreilly.com/catalog/xslfo">XSL-FO</jump>, by Dave Pawson, O'Reilly &amp; Associates, 2002, ISBN 0-596-00355-2. See online version above.</li>
           <li>[book] <jump href="http://www.phptr.com/browse/product.asp?product_id={CEA527AF-412D-49DA-8C1F-46E0A519B8D8}">Definitive XSL-FO</jump>, by G. Ken Holman, Prentice Hall PTR, 2003, ISBN 0-131-40374-5.</li>
           <li>[book] <jump href="http://www.sams.com/catalog/product.asp?product_id={F7ADFA46-6AF1-497C-9163-0D6337F727B3}">XSL Formatting Objects Developer's Handbook</jump>, by Doug Lovell, Sams, 2002, ISBN 0-672-32281-1.</li>
@@ -101,7 +100,7 @@
           <li>[book] <jump href="http://wrox.com/books/1861005067.htm">XSLT Programmer's Reference</jump>, by Michael H. Kay, Wrox Press, ISBN 1-861-00506-7.</li>
           <li>[book] <jump href="http://www.oreilly.com/catalog/xslt">XSLT</jump>, by Doug Tidwell, O'Reilly &amp; Associates, 2001, ISBN 0-596-00053-7.</li>
           <li>[book] <jump href="http://www.oreilly.com/catalog/xsltckbk">XSLT Cookbook</jump>, by Sal Mangano, O'Reilly &amp; Associates, 2002, ISBN 0-596-00372-2.</li>
-          <li>[article] <jump href="http://www.dpawson.co.uk/xsl/xslfaq.html">Dave Pawson's XSL FAQ</jump>.</li>
+          <li>[article] <jump href="http://www.dpawson.co.uk/xsl/index.html">Dave Pawson's XSL FAQ</jump>.</li>
          <li>[book] <jump href="http://www.oreilly.com/catalog/xpathpointer">XPath and XPointer: Locating Content in XML Documents</jump>, by John E. Simpson, O'Reilly &amp; Associates, 2002, ISBN 0-596-00291-2.</li>
           <li>[book] <jump href="http://www.wiley.com/cda/product/0,,0471416207,00.html">XSL Essentials</jump>, by Michael Fitzgerald, John Wiley &amp; Sons, 2001, ISBN 0-471-41620-7.</li>
           <li>[book] <jump href="http://www.oreilly.com/catalog/javaxslt">Java and XSLT</jump>, by Eric M. Burke, O'Reilly &amp; Associates, 2001, ISBN 0-596-00143-6.</li>
@@ -221,7 +220,6 @@
           <li>[software] <jump href="http://www.scriptura-xsl.com">Scriptura</jump> by Inventive Designers (commercial)</li>
           <li>[software] <jump href="http://www.xslfast.com">XSLfast</jump> by jCatalog Software AG (commercial)</li>
           <li>[software] <jump href="http://www.metafocus.no/en/xultation_designer.php">Xultation Designer</jump> by Metafocus (commercial)</li>
-          <li>[software] <jump href="http://www.cambridgedocs.com/products/downloads/WordFODesigner.htm">Word FO Designer</jump> by CambridgeDocs (commercial)</li>
           <li>[software] <jump href="http://web.assentis.com/products/products.php?navi=Products&amp;product_id=7">Assentis:DocDesign</jump> by Assentis Technologies (commercial)</li>
         </ul>
       </section>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index f1e4c4960..a41b8a639 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -55,11 +55,15 @@
   -->
 
   <!--
-  BEGIN Version 0.20.5 tab
+  BEGIN Version 0.93 documentation tab
   -->
-  <v0205 label="Version 0.20.5" href="0.20.5/" tab="maintenanceversion">
+  <trunk label="FOP 0.93" href="0.93/" tab="oldstableversion">
     <about label="About" href="index.html"/>
-  
+    <release label="Release Notes" href="releaseNotes_0.93.html"/>
+    <changes label="Changes" href="changes_0.93.html"/>
+    <knownissues label="Known Issues" href="knownissues_overview.html"/>
+    <upgrading label="Upgrading" href="upgrading.html"/>
+    
     <using label="Using FOP">
       <build label="Build" href="compiling.html"/>
       <config label="Configure" href="configuration.html"/>
@@ -68,29 +72,31 @@
       <servlet label="Servlets" href="servlets.html"/>
       <ant label="Ant Task" href="anttask.html"/>
     </using>
-    
+
     <features label="Features">
       <output label="Output Targets" href="output.html"/>
+      <if label="Intermediate Format" href="intermediate.html"/>
       <pdfencryption label="PDF Encryption" href="pdfencryption.html"/>
+      <pdfa label="PDF/A" href="pdfa.html"/>
+      <pdfx label="PDF/X" href="pdfx.html"/>
       <graphics label="Graphics" href="graphics.html"/>
       <fonts label="Fonts" href="fonts.html"/>
       <hyphenation label="Hyphenation" href="hyphenation.html"/>    
       <extensions label="Extensions" href="extensions.html"/>
     </features>
     
-  </v0205>
-  
+  </trunk>
   <!--
-  END Version 0.20.5 tab
+  END Version 0.93 documentation tab
   -->
   
   <!--
-  BEGIN Version 0.93 documentation tab
+  BEGIN Version 0.94 documentation tab
   -->
-  <trunk label="FOP 0.93" href="0.93/" tab="stableversion">
+  <trunk label="FOP 0.94" href="0.94/" tab="stableversion">
     <about label="About" href="index.html"/>
-    <release label="Release Notes" href="releaseNotes_0.93.html"/>
-    <changes label="Changes" href="changes_0.93.html"/>
+    <release label="Release Notes" href="releaseNotes_0.94.html"/>
+    <changes label="Changes" href="changes_0.94.html"/>
     <knownissues label="Known Issues" href="knownissues_overview.html"/>
     <upgrading label="Upgrading" href="upgrading.html"/>
     
@@ -117,7 +123,7 @@
     
   </trunk>
   <!--
-  END Version 0.93 documentation tab
+  END Version 0.94 documentation tab
   -->
   
   <!--
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 3765889c2..cb2c4aa0b 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,21 +33,21 @@
         This is the development status of Apache FOP. Development on
         the maintenance branch where FOP 0.20.5 came from has been
         halted. The code base has been largely redesigned. The new
-        code base has reached release 0.93.
+        code base has reached release 0.94.
       </p>
     </section>
     <section>
       <title>Development Status</title>
-	  <p>The FOP code base has been largely rewritten, to address
+      <p>The FOP code base has been largely rewritten, to address
         design issues for layout and performance. The new design makes
         it better possible to be conformant to the spec and be able to
         handle large documents.</p>
       <p>The redesign of the code base has largely been completed. The
-	    new code reached production quality with release 0.93. In the
-	    course of 2007 we plan to release version 1.0.</p>
+        new code reached production quality with release 0.93. In the
+        course of 2007 we plan to release version 1.0.</p>
       <p>
         If you're looking for a long-term road-map we have to disappoint you. This is Open
-        Source and we're mostly voluteers working in their free time. What we have
+        Source and we're mostly volunteers working in their free time. What we have
         is an idea where we want to go. How fast we get there depends on the 
         available time, on how well our ideas work out while developing and on you!
         There's a <a href="http://wiki.apache.org/xmlgraphics-fop/RoadMap">document in the Wiki</a>
@@ -134,11 +134,9 @@
     <section>
       <title>Maintenance Status</title>
       <p>
-        The latest release of the maintenance branch is FOP 0.20.5,
-        released on July 18th, 2003.  See <a
-        href="relnotes.html">release notes</a> for more details.  The
-        maintenance branch has been frozen in 2004 so the team can
-        concentrate on the new code base.
+        The latest release of the maintenance branch is FOP 0.20.5, released on July 18th, 2003.
+        The maintenance branch has been frozen in 2004 so the team can concentrate on the new code
+        base.
       </p>
     </section>
     <!--section id="stats">
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index c54eac7a7..bb2fd7e72 100644
--- a/src/documentation/content/xdocs/tabs.xml
+++ b/src/documentation/content/xdocs/tabs.xml
@@ -21,8 +21,8 @@
     
 <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.20.5" dir="0.20.5/"/>
   <tab label="Version 0.93" dir="0.93/"/>
+  <tab label="Version 0.94" dir="0.94/"/>
   <tab label="FOP Trunk" dir="trunk/"/>
   <tab label="Development" dir="dev/"/>
   <!--
diff --git a/src/documentation/content/xdocs/trunk/compiling.xml b/src/documentation/content/xdocs/trunk/compiling.xml
index 76d7b214f..c6c17a3c0 100644
--- a/src/documentation/content/xdocs/trunk/compiling.xml
+++ b/src/documentation/content/xdocs/trunk/compiling.xml
@@ -59,7 +59,7 @@
         <p>
           The build script uses <a href="ext:ant">Apache Ant</a>, a popular 
           Java-based build tool, which usually requires that the environment variable JAVA_HOME point to 
-          your local JDK root directory. This is true even if you use JDK 1.2 or above, which normally 
+          your local JDK root directory. This is true even if you use JDK 1.3 or above, which normally 
           does not need this setting.
         </p>
       </section>
@@ -103,7 +103,8 @@
           needed, but may be helpful if you are having problems with the build process itself.
         </li>
         <li>
-          <strong>javadocs</strong>: Generates javadocs. This creates the FOP API documentation.
+          <strong>javadocs</strong>: Creates the FOP API documentation.
+          <note>A minimum JDK version of 1.4.2 is required for generating the javadocs.</note>
         </li>
       </ul>
       <p>To run the build:</p>
diff --git a/src/documentation/content/xdocs/trunk/configuration.xml b/src/documentation/content/xdocs/trunk/configuration.xml
index b7984e773..410b17098 100644
--- a/src/documentation/content/xdocs/trunk/configuration.xml
+++ b/src/documentation/content/xdocs/trunk/configuration.xml
@@ -78,7 +78,7 @@
         <td>URL or directory</td>
         <td>Specifies the base URL based on which relative font URLs will be resolved.
         </td>
-	<td>base URL/directory (above)</td>
+        <td>base URL/directory (above)</td>
       </tr>
       <tr>
         <td>hyphenation-base</td>
@@ -112,10 +112,10 @@
         <td>strict-configuration</td>
         <td>Boolean (true, false)</td>
         <td>
-	  Setting this option to 'true' will cause FOP to strictly verify the contents of the
-	  FOP configuration file to ensure that defined resources (such as fonts and base
-	  URLs/directories) are valid and available to FOP.  Any errors found will cause FOP to
-	  immediately raise an exception.</td>
+          Setting this option to 'true' will cause FOP to strictly verify the contents of the
+          FOP configuration file to ensure that defined resources (such as fonts and base
+          URLs/directories) are valid and available to FOP.  Any errors found will cause FOP to
+          immediately raise an exception.</td>
         <td>false</td>
       </tr>
       <tr>
@@ -125,7 +125,7 @@
           Setting this option to 'false' causes FOP to be more forgiving about XSL-FO validity, 
           for example, you're allowed to specify a border on a region-body which is supported 
           by some FO implementations but is non-standard. Note that such a border would 
-	  currently have no effect in Apache FOP.</td>
+          currently have no effect in Apache FOP.</td>
         <td>true</td>
       </tr>
       <tr>
@@ -173,7 +173,7 @@
         <td>renderers</td>
         <td>(see text below)</td>
         <td>Contains the configuration for each renderer. See below.</td>
-	<td>N/A</td>
+        <td>N/A</td>
       </tr>
     </table>
     <p>
@@ -311,7 +311,7 @@
         offered by Java.
       </p>
       <p>
-        Additionally, there are certain settings that control who the renderer handles various elements.
+        Additionally, there are certain settings that control how the renderer handles various elements.
       </p>
 <source><![CDATA[<renderer mime="application/vnd.hp-PCL">
   <rendering>quality</rendering>
@@ -333,10 +333,10 @@
     </section>
   </section>
 
-	<section>
-	  <title>When it does not work</title>
+        <section>
+          <title>When it does not work</title>
 
-	  <p>FOP searches the configuration file for the information it
+          <p>FOP searches the configuration file for the information it
 expects, at the position it expects. When that information is not
 present, FOP will not complain, it will just continue. When there is
 other information in the file, FOP will not complain, it will just
@@ -344,14 +344,14 @@ ignore it. That means that when your configuration information is in
 the file but in a different XML element, or in a different XML path,
 than FOP expects, it will be silently ignored.</p>
 
-	  <p>Check the following possibilities:</p>
+          <p>Check the following possibilities:</p>
 
-	  <ul>
-		<li>The format of the configuration file has changed
+          <ul>
+            <li>The format of the configuration file has changed
 considerably between FOP 0.20.5 and FOP 1.0 and its beta versions. Did
 you convert your file to the new format?</li>
 
-		<li>The FOP distribution contains a schema for configuration
+            <li>The FOP distribution contains a schema for configuration
 files, at src/foschema/fop-configuration.xsd. Did you validate your
 configuration file against it? Add the following schema location to
 the <code>schema</code> element:
@@ -366,13 +366,13 @@ and run the configuration file through a validating schema
 parser. Note that the schema cannot detect all errors, and that it is
 stricter about the order of some elements than FOP itself is.</li>
 
-		<li>Run FOP in debug mode (command line option
+            <li>Run FOP in debug mode (command line option
 <code>-d</code>). This makes FOP report which configuration
 information it finds. Check if FOP finds what you expect.</li>
 
-	  </ul>
+          </ul>
 
-	</section>
+        </section>
   </body>
 </document>
 
diff --git a/src/documentation/content/xdocs/trunk/extensions.xml b/src/documentation/content/xdocs/trunk/extensions.xml
index 0c22ca123..dd4a79535 100644
--- a/src/documentation/content/xdocs/trunk/extensions.xml
+++ b/src/documentation/content/xdocs/trunk/extensions.xml
@@ -34,7 +34,7 @@
       to you. If you wish to add an extension of your own to FOP, please see the 
       <a href="../dev/extensions.html">Developers' Extension Page</a>.
     </p>
-    <note>All extensions required the correct use of an appropriate namespace in your input document.</note>
+    <note>All extensions require the correct use of an appropriate namespace in your input document.</note>
     <section id="svg">
       <title>SVG</title>
       <p>
@@ -52,10 +52,6 @@
         </p>
         <source><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
-        <note>
-          Currently, no extension elements are implemented in FOP Trunk which use the 
-          FOP extension namespace.
-        </note>
       </section>
       <section id="bookmarks">
         <title>PDF Bookmarks</title>
diff --git a/src/documentation/content/xdocs/trunk/fonts.xml b/src/documentation/content/xdocs/trunk/fonts.xml
index 2ee297ba0..61d7d7e6a 100644
--- a/src/documentation/content/xdocs/trunk/fonts.xml
+++ b/src/documentation/content/xdocs/trunk/fonts.xml
@@ -262,8 +262,8 @@ It will display all of the font names and exit with an Exception.</p>
             See <a href="configuration.html">FOP: Configuration</a> for more information.
           </li>
           <li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
-          <li>The font "kerning" attribute is optional. Kerning is currently not used at all.</li>
-	      <li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
+          <li>The font "kerning" attribute is optional.</li>
+          <li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
           <li>When setting the "embed-url" attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
           <li>The fonts "directory" tag can be used to register fonts contained within a single or list of directory paths.  The "recursive" attribute can be specified to recursively add fonts from all sub directories.</li>
           <li>The fonts "auto-detect" tag can be used to automatically register fonts that are found to be installed on the native operating system.</li>
@@ -291,14 +291,8 @@ If you don't specify the embed-url attribute the font will not be embedded, but
         <p>When FOP embeds a font, it adds a prefix to the fontname to ensure that the name will not match the fontname of an installed font.
 This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</p>
         <p>When embedding PostScript fonts, the entire font is always embedded.</p>
-        <p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the original font, containing only the glyphs used, is embedded in the output document.
-Currently, this embedded font contains only the minimum data needed to be embedded in a pdf document, and does not contain any codepage information.
-The PDF document contains indexes to the glyphs in the font instead of to encoded characters.
-While the document will be displayed correctly, the net effect of this is that searching, indexing, and cut-and-paste will not work properly.</p>
-        <p>One workaround for this behavior is to use the "-enc ansi" option when generating metrics with TTFReader.
-This will cause the whole font to be embedded in the pdf document.
-Characters will be WinAnsi encoded (as specified in the PDF spec), so you lose the ability to use characters from other character sets.
-See <a href="#ttf-encoding">Table of TTF Encoding Options</a> for more details.</p>
+        <p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
+          original font, containing only the glyphs used, is embedded in the output document.</p>
       </section>
       <section id="embedding-base14">
         <title>Explicitly embedding the base 14 fonts</title>
diff --git a/src/documentation/content/xdocs/trunk/graphics.xml b/src/documentation/content/xdocs/trunk/graphics.xml
index fb0a393f3..164069733 100644
--- a/src/documentation/content/xdocs/trunk/graphics.xml
+++ b/src/documentation/content/xdocs/trunk/graphics.xml
@@ -155,7 +155,6 @@ Then, copy the file "JimiProClasses.zip" from the archive to {fop-install-dir}/l
       </section>
       <section id="jai">
         <title>JAI (Java Advanced Imaging API)</title>
-        <warning>JAI support is available for Release 0.20.5 and later. The comments in this section do not apply to releases earlier than 0.20.5.</warning>
         <p>
           FOP has been compiled with JAI support, but JAI is not included in the FOP distribution.
 To use it, install <a href="http://java.sun.com/products/java-media/jai">JAI</a>, then copy the jai_core.jar and the jai_codec.jar files to {fop-install-dir}/lib.
diff --git a/src/documentation/content/xdocs/trunk/output.xml b/src/documentation/content/xdocs/trunk/output.xml
index e769a3d4b..21743519f 100644
--- a/src/documentation/content/xdocs/trunk/output.xml
+++ b/src/documentation/content/xdocs/trunk/output.xml
@@ -635,6 +635,9 @@ out = proc.getOutputStream();]]></source>
     possible. The RTF output follows Microsoft's RTF specifications
     and produces best results on Microsoft Word.
   </p>
+  <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>
 </section>
 <section id="xml">
   <title>XML (Area Tree XML)</title>
diff --git a/src/documentation/content/xdocs/trunk/pdfencryption.xml b/src/documentation/content/xdocs/trunk/pdfencryption.xml
index f68eae437..c8cdbb29c 100644
--- a/src/documentation/content/xdocs/trunk/pdfencryption.xml
+++ b/src/documentation/content/xdocs/trunk/pdfencryption.xml
@@ -29,10 +29,6 @@
   <body>
     <section>
       <title>Overview</title>
-      <warning>
-        PDF Encryption is available in Release 0.20.5 and later. The comments on this page do 
-        not apply to releases earlier than 0.20.5.
-      </warning>
       <p>
         FOP supports encryption of PDF output, thanks to Patrick
         C. Lankswert. This feature is commonly used to prevent
diff --git a/src/documentation/content/xdocs/trunk/running.xml b/src/documentation/content/xdocs/trunk/running.xml
index 74284d6d0..a3d2dd0d2 100644
--- a/src/documentation/content/xdocs/trunk/running.xml
+++ b/src/documentation/content/xdocs/trunk/running.xml
@@ -180,7 +180,7 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
   Fop foo.fo -awt]]></source>
       <p>
         PDF encryption is only available if FOP was compiled with encryption support 
-        <strong>and</strong> if compatible encryption support is availabe at run time. 
+        <strong>and</strong> if compatible encryption support is available at run time. 
         Currently, only the JCE is supported. Check the <a href="pdfencryption.html">Details</a>.
       </p>
       </section>
@@ -214,37 +214,37 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
       directory in a single directory. If you use hyphenation, you
       must also put <code>fop-hyph.jar</code> in that directory.</p>
 
-		<p>In both cases the arguments consist of the options and
+    <p>In both cases the arguments consist of the options and
         infile and outfile specifications as shown above for the
         standard scripts.</p>
       </section>
       <section id="dynamical-classpath">
-		<title>FOP's dynamical classpath construction</title>
+        <title>FOP's dynamical classpath construction</title>
 
-		<p>If FOP is started without a proper classpath, it tries to
-		add its dependencies dynamically. If the system property
-		<code>fop.home</code> contains the name of a directory, then
-		FOP uses that directory as the base directory for its
-		search. Otherwise the current working directory is the base
-		directory. If the base directory is called <code>build</code>,
-		then its parent directory becomes the base directory.</p>
+        <p>If FOP is started without a proper classpath, it tries to
+          add its dependencies dynamically. If the system property
+          <code>fop.home</code> contains the name of a directory, then
+          FOP uses that directory as the base directory for its
+          search. Otherwise the current working directory is the base
+          directory. If the base directory is called <code>build</code>,
+          then its parent directory becomes the base directory.</p>
 
         <p>FOP expects to find <code>fop.jar</code> in the
-		<code>build</code> subdirectory of the base directory, and
-		adds it to the classpath. Subsequently FOP adds all
-		<code>jar</code> files in the lib directory to the
-		classpath. The lib directory is either the <code>lib</code>
-		subdirectory of the base directory, or, if that does not
-		exist, the base directory itself.</p>
+          <code>build</code> subdirectory of the base directory, and
+          adds it to the classpath. Subsequently FOP adds all
+          <code>jar</code> files in the lib directory to the
+          classpath. The lib directory is either the <code>lib</code>
+          subdirectory of the base directory, or, if that does not
+          exist, the base directory itself.</p>
 
         <p>If the system property <code>fop.optional.lib</code>
-		contains the name of a directory, then all <code>jar</code>
-		files in that directory are also added to the classpath. See
-		the methods <code>getJARList</code> and
-		<code>checkDependencies</code> in
-		<code>org.apache.fop.cli.Main</code>.</p>
+          contains the name of a directory, then all <code>jar</code>
+          files in that directory are also added to the classpath. See
+          the methods <code>getJARList</code> and
+          <code>checkDependencies</code> in
+          <code>org.apache.fop.cli.Main</code>.</p>
 
-	  </section>
+      </section>
     </section>
     <section id="check-input">
       <title>Using Xalan to Check XSL-FO Input</title>
@@ -339,11 +339,6 @@ Fop [options] [-fo|-xml] infile [-xsl file] [-awt|-pdf|-mif|-rtf|-tiff|-png|-pcl
           This can be substantial if the page sequence contains lots of FO elements.
         </li>
       </ul>
-      <p>
-        One of FOP's stated design goals is to be able to process input of arbitrary size.
-        Addressing this goal is one of the prime motivations behind the 
-        <a href="../dev/index.html">FOP Redesign</a>.
-      </p>
     </section>
     <section id="problems">
       <title>Problems</title>
diff --git a/src/documentation/content/xdocs/trunk/upgrading.xml b/src/documentation/content/xdocs/trunk/upgrading.xml
index 46c9cff3b..25e63ace8 100644
--- a/src/documentation/content/xdocs/trunk/upgrading.xml
+++ b/src/documentation/content/xdocs/trunk/upgrading.xml
@@ -31,7 +31,10 @@
       </p>
       <ul>
         <li>
-          More than half of the codebase has been rewritten over the last three years. With version 0.93 the code has reached <strong>production level</strong>.
+          More than half of the codebase has been rewritten over the
+          last three years. With version 0.93 the code has reached
+          <strong>production level</strong>, and continues to improve with
+          version 0.94.
         </li>
         <li>
           The API of FOP has changed considerably and is not
@@ -51,7 +54,7 @@
           an example configuration file. A XML Schema file can be found under
           src/foschema/fop-configuration.xsd.
         </li>
-		<li>
+        <li>
           If you are using font metrics files for version 0.20.5 or
           0.92 or earlier, you have to regenerate them in the new
           format. The new format is characterized by a version
@@ -76,18 +79,13 @@
         </li>
         <li>
           Extensions and Renderers written for version 0.20.5 will not work with the new code! The new FOP 
-          extension for <a href="http://barcode4j.krysalis.org">Barcode4J</a> will be available in 
+          extension for <a href="http://barcode4j.krysalis.org">Barcode4J</a> is available since 
           January 2007.
         </li>
         <li>
-          The PCL Renderer and the MIF Handler have not been resurrected, yet! They are currently non-functional
+          The SVG Renderer and the MIF Handler have not been resurrected, yet! They are currently non-functional
           and hope for someone to step up and reimplement them.
         </li>
-        <li>
-          By looking at the <a href="../compliance.html">Compliance page</a> you might get the impression
-          that the new code is much more advanced than version 0.20.5. That's true but there may still
-          be a few things that may not be handled as gracefully by the new code as by version 0.20.5.
-        </li>
       </ul>
     </section>
     <section id="issues">
author	Vincent Hennebert <vhennebert@apache.org>	2007-08-23 18:30:05 +0000
committer	Vincent Hennebert <vhennebert@apache.org>	2007-08-23 18:30:05 +0000
commit	99cfed96f71c2deff9afdf30c71f93c2ca30d005 (patch)
tree	960682f0658c15dcddf2ec5f615c7c0f179ee7f1 /src/documentation/content
parent	aa33ef3ebb6e48dae2da620f596d34d7548bf402 (diff)
download	xmlgraphics-fop-99cfed96f71c2deff9afdf30c71f93c2ca30d005.tar.gz xmlgraphics-fop-99cfed96f71c2deff9afdf30c71f93c2ca30d005.zip