You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by bu...@apache.org on 2012/07/15 03:50:18 UTC

svn commit: r825815 [4/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/

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/releaseNotes_1.0.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/releaseNotes_1.0.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/releaseNotes_1.0.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>Release Notes for Apache FOP 1.0</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>Release Notes for Apache FOP 1.0</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/1.0/">1.0</a></div> -->
       	<div class="section-content"><h1 id="version_1.0">Major Changes in Version 1.0</h1>
@@ -413,17 +417,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/1.0/running.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -538,17 +542,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/1.0/servlets.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/servlets.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/upgrading.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/upgrading.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -418,17 +422,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/fop/bugs.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/bugs.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/bugs.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: Bugs and Other Trackable Issues</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: Bugs and Other Trackable Issues</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -397,17 +401,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/changes.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/changes.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/changes.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>History of Changes</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>History of Changes</h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a></div> -->
       	<div class="section-content"><p><a href="changes.rss"></a> </p>
@@ -2170,17 +2174,20 @@ Committed by AD.</p>
 		<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/compliance.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/compliance.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/compliance.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: 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></h1> -->
+
+
+      
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a></div> -->
       	<div class="section-content"><!--<meta content="HTML Tidy, see www.w3.org" name="generator"></meta>-->
@@ -2433,17 +2437,20 @@ Adobe's browser plugin, for example, ign
 		<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/dev/conventions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.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 Development: Coding Conventions</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 Development: Coding Conventions</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -532,17 +536,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/dev/design/areas.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.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 Design: Area Tree</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 Design: Area Tree</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -438,17 +442,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/dev/design/breakpos.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.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 Design: Layout Managers</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 Design: Layout Managers</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><subtitle>Break Possibility Proposal</subtitle><version>$Revision: 1298724 $</version><authors><person email="klease@club-internet.fr" name="Karen Lease"></person></authors></p>
@@ -407,17 +411,20 @@ So the Line LM will ask its child LM(s) 
 		<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/dev/design/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/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 Design: Embedding Apache� FOP in Other Applications</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 Design: Embedding Apache� FOP in Other Applications</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -469,17 +473,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/dev/design/extending.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.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 Design: 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>Apache™ FOP Design: 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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -424,17 +428,20 @@ to result in a text box referencing 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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html 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 Design: FO Tree</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 Design: FO Tree</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -453,17 +457,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/dev/design/images.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html 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 Design: Images</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 Design: Images</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -416,17 +420,20 @@ The renderer uses the url to retrieve th
 		<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/dev/design/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html 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 Design: Introduction</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 Design: Introduction</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors>
@@ -496,17 +500,20 @@ The articles in this section pertain mai
 		<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/dev/design/layout.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html 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 Design: Layout</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 Design: Layout</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -602,17 +606,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/dev/design/optimise.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html 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 Design: Optimisations</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 Design: Optimisations</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -378,17 +382,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/dev/design/parsing.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html 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 Design: Input Parsing</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 Design: Input Parsing</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -408,17 +412,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/dev/design/pdf-library.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html 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 Design: PDF Library</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 Design: PDF Library</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -394,17 +398,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/dev/design/properties.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/properties.html 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 Design: Properties</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 Design: Properties</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="" name="Karen Lease"></person></authors></p>
@@ -510,17 +514,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/dev/design/renderers.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html 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 Design: Renderers</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 Design: Renderers</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -541,17 +545,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/dev/design/startup.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html 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 Design: Startup, Environment, Control</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 Design: Startup, Environment, Control</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -398,17 +402,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/dev/design/svg.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html 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 Design: SVG</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 Design: SVG</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -394,17 +398,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/dev/design/useragent.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html 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 Design: User Agent</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 Design: User Agent</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
@@ -502,17 +506,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/dev/doc.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/doc.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 Development: Managing Documentation</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 Development: Managing Documentation</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
@@ -480,17 +484,20 @@ Please make sure you always have <strong
 		<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