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:00:56 UTC
svn commit: r953682 [1/9] - 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/
Author: buildbot
Date: Wed Jun 3 15:00:54 2015
New Revision: 953682
Log:
Staging update by buildbot for xmlgraphics
Modified:
websites/staging/xmlgraphics/trunk/content/ (props changed)
websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95beta.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfencryption.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfx.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/releaseNotes_0.95.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/running.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/servlets.html
websites/staging/xmlgraphics/trunk/content/fop/0.95/upgrading.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/accessibility.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/anttask.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/changes_1.0.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/compiling.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/configuration.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/events.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/fonts.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/graphics.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/hyphenation.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/index.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/intermediate.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/knownissues_overview.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/metadata.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/output.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfa.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfencryption.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/releaseNotes_1.0.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/servlets.html
websites/staging/xmlgraphics/trunk/content/fop/1.0/upgrading.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/accessibility.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/anttask.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/changes_1.1.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/compiling.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/complexscripts.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/configuration.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/events.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/fonts.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/graphics.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/hyphenation.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/index.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/intermediate.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/knownissues_overview.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/metadata.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/output.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfa.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfencryption.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfx.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/releaseNotes_1.1.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/running.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/servlets.html
websites/staging/xmlgraphics/trunk/content/fop/1.1/upgrading.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/accessibility.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/anttask.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/compiling.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/complexscripts.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/configuration.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/events.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/fonts.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/graphics.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/hyphenation.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/index.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/intermediate.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/metadata.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/output.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/pdfa.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/pdfencryption.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/pdfx.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/releaseNotes_2.0.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/running.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/servlets.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/upgrading.html
websites/staging/xmlgraphics/trunk/content/fop/2.0/whitespacemanagement.html
websites/staging/xmlgraphics/trunk/content/fop/bugs.html
websites/staging/xmlgraphics/trunk/content/fop/changes.html
websites/staging/xmlgraphics/trunk/content/fop/compliance.html
websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html
websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html
websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html
websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/dev/faq.html
websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html
websites/staging/xmlgraphics/trunk/content/fop/dev/index.html
websites/staging/xmlgraphics/trunk/content/fop/dev/release.html
websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html
websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html
websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html
websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html
websites/staging/xmlgraphics/trunk/content/fop/download.html
websites/staging/xmlgraphics/trunk/content/fop/examples.html
websites/staging/xmlgraphics/trunk/content/fop/faq.html
websites/staging/xmlgraphics/trunk/content/fop/fo.html
websites/staging/xmlgraphics/trunk/content/fop/fop-pdf-images.html
websites/staging/xmlgraphics/trunk/content/fop/gethelp.html
websites/staging/xmlgraphics/trunk/content/fop/index.html
websites/staging/xmlgraphics/trunk/content/fop/knownissues.html
websites/staging/xmlgraphics/trunk/content/fop/license.html
websites/staging/xmlgraphics/trunk/content/fop/maillist.html
websites/staging/xmlgraphics/trunk/content/fop/news.html
websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html
websites/staging/xmlgraphics/trunk/content/fop/resources.html
websites/staging/xmlgraphics/trunk/content/fop/status.html
websites/staging/xmlgraphics/trunk/content/fop/team.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/events.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/extensions.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/graphics.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/metadata.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/output.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfa.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfencryption.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfx.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/running.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/servlets.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/upgrading.html
websites/staging/xmlgraphics/trunk/content/fop/trunk/whitespacemanagement.html
Propchange: websites/staging/xmlgraphics/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 3 15:00:54 2015
@@ -1 +1 @@
-1683353
+1683354
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95beta.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95beta.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/changes_0.95beta.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html Wed Jun 3 15:00:54 2015
@@ -47,7 +47,7 @@
<div id="navigation">
<p><a href="/"><img alt="Apache XML Graphics Project Logo" src="/images/apache-xml-graphics.gif" title="Apache XML Graphics Project" /></a></p>
-<h1 id="apachewzxhzdk2-fop">Apache™ FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache™ FOP</h1>
<ul>
<li><a href="/fop/">FOP Home</a></li>
<li><a href="/fop/download.html">Download</a></li>
@@ -86,7 +86,7 @@
<li><a href="/fop/trunk/">Overview</a></li>
<li><a href="/fop/trunk/upgrading.html">Upgrading</a></li>
<li>
-<h3 id="using-apachewzxhzdk8-fop">Using Apache™ FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache™ FOP</h3>
<ul>
<li><a href="/fop/trunk/compiling.html">Build</a></li>
<li><a href="/fop/trunk/configuration.html">Configure</a></li>
@@ -119,44 +119,6 @@
</ul>
</li>
<li>
-<h2 id="fop-20">FOP 2.0</h2>
-<ul>
-<li><a href="/fop/2.0/">Overview</a></li>
-<li><a href="/fop/2.0/upgrading.html">Upgrading</a></li>
-<li>
-<h3 id="using-apachewzxhzdk7-fop">Using Apache™ FOP</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>
-<li><a href="/fop/fop-pdf-images.html">PDF Images</a></li>
-<li><a href="/fop/2.0/whitespacemanagement.html">Whitespace Management</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>
@@ -176,7 +138,7 @@
</ul>
</li>
<li>
-<h3 id="features_2">Features</h3>
+<h3 id="features_1">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>
@@ -215,7 +177,7 @@
</ul>
</li>
<li>
-<h3 id="features_3">Features</h3>
+<h3 id="features_2">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>
@@ -312,7 +274,7 @@
</ul>
</li>
</ul>
-<h1 id="apachewzxhzdk3-xml-graphics">Apache™ XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache™ XML Graphics</h1>
<ul>
<li>
<h2 id="project-overview">Project Overview</h2>
@@ -336,7 +298,7 @@
<li><a href="/commons/">Apache XML Graphics Commons</a></li>
</ul>
<h3 id="search-apache-xml-graphics">Search Apache XML Graphics</h3>
-<form name="search" id="search" action="https://www.google.com/search" method="get">
+<form name="search" id="search" action="http://www.google.com/search" method="get">
<input value="xmlgraphics.apache.org" name="sitesearch" type="hidden"/>
<input type="text" name="q" id="query" />
<input type="submit" id="submit" value="Search" />
@@ -347,8 +309,12 @@
<ul>
<li><strong><a href="http://na.apachecon.com/">ApacheCon NA</a></strong></li>
</ul>
+<p>Hope to see you there!</p>
<h3 id="apachecon-europe">ApacheCon Europe</h3>
-<p><a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="//www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a></p>
+<!--
+<a href="http://apachecon.eu/" title="ApacheCon Europe"><img alt="ApacheCon Europe" src="http://www.apache.org/ads/ApacheCon/2014-eu-234x60.png" width="225" /></a>
+-->
+
<ul>
<li><strong><a href="http://apachecon.eu/">ApacheCon Europe</a></strong></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org