You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by bu...@apache.org on 2015/06/03 17:12:22 UTC

svn commit: r953690 [4/5] - in /websites/staging/xmlgraphics/trunk/content: ./ fop/ fop/0.95/ fop/1.0/ fop/1.1/ fop/2.0/ fop/dev/ fop/dev/design/ fop/trunk/

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/faq.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/faq.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/faq.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/index.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/release.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/release.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/release.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/download.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/download.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/download.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/examples.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/examples.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/examples.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/faq.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/faq.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/faq.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/fo.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/fo.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/fo.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/fop-pdf-images.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/fop-pdf-images.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/fop-pdf-images.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/gethelp.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/gethelp.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/gethelp.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/index.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/knownissues.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/knownissues.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/knownissues.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/license.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/license.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/license.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/maillist.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/maillist.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/maillist.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/news.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/news.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/news.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/resources.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/resources.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/resources.html Wed Jun  3 15:12:19 2015
@@ -119,6 +119,45 @@
 </ul>
 </li>
 <li>
+<h2 id="fop-20">FOP 2.0</h2>
+<ul>
+<li><a href="/fop/2.0/">FOP 2.0 Overview</a></li>
+<li><a href="/fop/2.0/releaseNotes_2.0.html">Release Notes</a></li>
+<li><a href="/fop/2.0/changes_2.0.html">Changes (2.0)</a></li>
+<li><a href="/fop/2.0/knownissues_overview.html">Known Issues</a></li>
+<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
+<li>
+<h3 id="using-apache-fop-20">Using Apache FOP 2.0</h3>
+<ul>
+<li><a href="/fop/2.0/compiling.html">Build</a></li>
+<li><a href="/fop/2.0/configuration.html">Configure</a></li>
+<li><a href="/fop/2.0/running.html">Run</a></li>
+<li><a href="/fop/2.0/embedding.html">Embed</a></li>
+<li><a href="/fop/2.0/servlets.html">Servlets</a></li>
+<li><a href="/fop/2.0/anttask.html">Ant Task</a></li>
+</ul>
+</li>
+<li>
+<h3 id="features_1">Features</h3>
+<ul>
+<li><a href="/fop/2.0/accessibility.html">Accessibility</a></li>
+<li><a href="/fop/2.0/complexscripts.html">Complex Scripts</a></li>
+<li><a href="/fop/2.0/events.html">Events</a></li>
+<li><a href="/fop/2.0/extensions.html">Extensions</a></li>
+<li><a href="/fop/2.0/fonts.html">Fonts</a></li>
+<li><a href="/fop/2.0/graphics.html">Graphics</a></li>
+<li><a href="/fop/2.0/hyphenation.html">Hyphenation</a></li>
+<li><a href="/fop/2.0/intermediate.html">Intermediate Format</a></li>
+<li><a href="/fop/2.0/metadata.html">Metadata</a></li>
+<li><a href="/fop/2.0/output.html">Output Targets</a></li>
+<li><a href="/fop/2.0/pdfa.html">PDF/A</a></li>
+<li><a href="/fop/2.0/pdfx.html">PDF/X</a></li>
+<li><a href="/fop/2.0/pdfencryption.html">PDF Encryption</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li>
 <h2 id="fop-11">FOP 1.1</h2>
 <ul>
 <li><a href="/fop/1.1/">FOP 1.1 Overview</a></li>
@@ -138,7 +177,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_1">Features</h3>
+<h3 id="features_2">Features</h3>
 <ul>
 <li><a href="/fop/1.1/accessibility.html">Accessibility</a></li>
 <li><a href="/fop/1.1/complexscripts.html">Complex Scripts</a></li>
@@ -177,7 +216,7 @@
 </ul>
 </li>
 <li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_3">Features</h3>
 <ul>
 <li><a href="/fop/1.0/output.html">Output Targets</a></li>
 <li><a href="/fop/1.0/intermediate.html">Intermediate Format</a></li>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org