xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r953682 [8/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/
Date Wed, 03 Jun 2015 15:00:56 GMT
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: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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/maillist.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/maillist.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/maillist.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/news.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/news.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/news.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/quickstartguide.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/resources.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/resources.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/resources.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/status.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/status.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/status.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/team.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/team.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/team.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/accessibility.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/anttask.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/complexscripts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/configuration.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/events.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/events.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/events.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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/graphics.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/graphics.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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/trunk/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/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&trade; FOP</h1>
+<h1 id="apachewzxhzdk3-fop">Apache&trade; 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&trade; FOP</h3>
+<h3 id="using-apachewzxhzdk5-fop">Using Apache&trade; 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&trade; 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&trade; XML Graphics</h1>
+<h1 id="apachewzxhzdk4-xml-graphics">Apache&trade; 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


Mime
View raw message