xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r825815 [6/6] - in /websites/staging/xmlgraphics/trunk/content: ./ batik/ batik/dev/ batik/tools/ batik/using/ batik/using/scripting/ commons/ fop/ fop/0.95/ fop/1.0/ fop/dev/ fop/dev/design/ fop/trunk/
Date Sun, 15 Jul 2012 01:50:18 GMT
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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Configuration</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Configuration</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1302518 $</version></p>
@@ -658,17 +662,20 @@ and run the configuration file through a
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Embedding</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Embedding</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><subtitle>How to Embed FOP in a Java application</subtitle><version>$Revision: 1298724 $</version></p>
@@ -665,17 +669,20 @@ For this example we've created two class
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Events/Processing Feedback</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Events/Processing Feedback</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -562,17 +566,20 @@ producer.complain(this, "I'm tired", 23)
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Standard Apache™ FOP Extensions</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Standard Apache™ FOP Extensions</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -505,17 +509,20 @@ Those extensions have been implemented i
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Fonts</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Fonts</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="" name="Jeremias Märki"></person><person email="" name="Tore Engvig"></person><person email="" name="Adrian Cumiskey"></person><person email="" name="Max Berger"></person></authors></p>
@@ -766,17 +770,20 @@ At the moment, you can only match fonts 
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Graphics Formats</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Graphics Formats</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -655,17 +659,20 @@ Batik's SVG Rasterizer utility may also 
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Hyphenation</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Hyphenation</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -474,17 +478,20 @@ Note that the algorithm that uses this d
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

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 Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP Trunk (Development code)</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP Trunk (Development code)</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -375,17 +379,20 @@ $(document).ready(function () {
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Intermediate Format</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Intermediate Format</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version>
@@ -502,17 +506,20 @@ This example simply reads an intermediat
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/metadata.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/metadata.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/metadata.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Metadata</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Metadata</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><h1 id="overview">Overview</h1>
@@ -484,17 +488,20 @@ $(document).ready(function () {
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/output.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/output.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/output.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP Output Formats</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP Output Formats</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1325409 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person><person email="" name="Art Welch"></person></authors></p>
@@ -1141,17 +1145,20 @@ This format creates an SVG document that
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfa.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfa.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfa.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: PDF/A (ISO 19005)</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: PDF/A (ISO 19005)</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="jeremias@apache.org" name="Jeremias Märki"></person></authors></p>
@@ -431,17 +435,20 @@ There are additional requirements if you
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfencryption.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfencryption.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfencryption.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: PDF encryption.</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: PDF encryption.</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="pietsch@apache.org" name="J.Pietschmann"></person><person email="jeremias@apache.org" name="Jeremias Märki"></person></authors></p>
@@ -573,17 +577,20 @@ then you don't have the needed infrastru
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfx.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfx.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfx.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: PDF/X (ISO 15930)</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: PDF/X (ISO 15930)</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="jeremias@apache.org" name="Jeremias Märki"></person></authors></p>
@@ -409,17 +413,20 @@ Fop fop = fopFactory.newFop(MimeConstant
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/running.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/running.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/running.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Running Apache™ FOP</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Running Apache™ FOP</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1308679 $</version></p>
@@ -545,17 +549,20 @@ The -foout option works the same way as 
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/servlets.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/servlets.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/servlets.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Apache™ FOP: Servlets</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Apache™ FOP: Servlets</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><subtitle>How to use Apache™ FOP in a Servlet</subtitle><version>$Revision: 1298724 $</version></p>
@@ -520,17 +524,20 @@ transformer.setURIResolver(this.uriResol
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/upgrading.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/upgrading.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/upgrading.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Upgrading from an Earlier Version of Apache™ FOP</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
+	  <a href="/"><img src="/images/apache-fop-logo.jpg" alt="The Apache FOP Project" width="120" height="65" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; FOP Project</h2>
+	</div><!-- <h1>Upgrading from an Earlier Version of Apache™ FOP</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -415,17 +419,20 @@ While FOP 0.20.5 allowed you to have emp
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/index.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1></h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1></h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><p>The Apache XML Graphics Project is responsible for software licensed to the Apache Software Foundation intended for the creation &amp; maintenance of:</p>
@@ -412,17 +416,20 @@ $(document).ready(function () {
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/legal.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/legal.html (original)
+++ websites/staging/xmlgraphics/trunk/content/legal.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>The Apache™ XML Graphics Project - Legal Stuff</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1>The Apache™ XML Graphics Project - Legal Stuff</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><p><notice></notice><abstract></abstract></p>
@@ -385,17 +389,20 @@ $(document).ready(function () {
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/mail.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/mail.html (original)
+++ websites/staging/xmlgraphics/trunk/content/mail.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>The Apache™ XML Graphics Project - Mailing Lists</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1>The Apache™ XML Graphics Project - Mailing Lists</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><h1 id="mailing-lists">Mailing Lists</h1>
@@ -508,17 +512,20 @@ It is usually a good idea to state the F
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/repo.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/repo.html (original)
+++ websites/staging/xmlgraphics/trunk/content/repo.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>The Apache™ XML Graphics Project - Code Repositories</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1>The Apache™ XML Graphics Project - Code Repositories</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><h1 id="web-access">Web Access to the Repositories</h1>
@@ -400,17 +404,20 @@ Committers need to replace " <code>http<
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>

Modified: websites/staging/xmlgraphics/trunk/content/sitemap.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/sitemap.html (original)
+++ websites/staging/xmlgraphics/trunk/content/sitemap.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>Sitemap</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1>Sitemap</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><ul>
@@ -407,18 +411,21 @@ $(document).ready(function () {
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>
 

Modified: websites/staging/xmlgraphics/trunk/content/team.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/team.html (original)
+++ websites/staging/xmlgraphics/trunk/content/team.html Sun Jul 15 01:50:14 2012
@@ -35,11 +35,12 @@
   </head>
 
   <body>
-	  <div id="banner">&nbsp;
-	  </div>
 
-	  <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>
+	<div id="banner">&nbsp;
+	</div>
+
+	<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="apachewzxhzdk3-xml-graphics">Apache&trade; XML Graphics</h1>
 <ul>
 <li>
@@ -353,12 +354,15 @@ $(document).ready(function () {
   });
 })
 </script>
-	  </div>
-	
-	  <div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
-        <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache XML Graphics Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
-        <h2>The Apache&trade; XML Graphics Project</h2>
-      </div><!-- <h1>The Apache™ XML Graphics Project - Community</h1> -->
+	</div>
+
+	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 60px;">
+	  <a href="/"><img src="/images/apache-xml-graphics.gif" alt="The Apache FOP Project" width="226" height="51" style="float:left; margin-right: 15px;" /></a>
+	  <h2>The Apache&trade; XML Graphics Project</h2>
+	</div><!-- <h1>The Apache™ XML Graphics Project - Community</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><h1 id="WhoWeAre">Who We Are</h1>
@@ -414,17 +418,20 @@ If you need to get into contact with the
 		<div class="copyright">
 		  <div style="float:left; padding: 7px;">
 			<a title="Apache Software Foundation" href="http://www.apache.org"><img id="asf-feather-logo" alt="Apache Software Foundation" src="/images/feather-small.gif" width="100" /></a>
-          </div>
+        </div>
 		  <p>
-			Copyright &copy; 2011 The Apache Software Foundation, Licensed under
+			Copyright &copy; 2012 The Apache Software Foundation, Licensed under
 			the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.
 			<br />
-			Apache, Apache XML Graphics, the Apache feather logo, and the Apache XML Graphics logos are
-			trademarks of <a href="http://www.apache.org">The Apache Software Foundation</a>. All other
-			marks mentioned may be trademarks or registered trademarks of their respective owners.
+			Apache, Apache XML Graphics, Apache FOP, Apache Batik, the Apache feather logo, and the
+			Apache XML Graphics logos are trademarks of <a href="http://www.apache.org">The Apache
+			Software Foundation</a>. All other marks mentioned may be trademarks or registered
+			trademarks of their respective owners.
 			<br />
 		  </p>
 		</div> 
 	  </div>
+	
+
   </body>
 </html>



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


Mime
View raw message