xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835093 [3/3] - in /websites/staging/xmlgraphics/trunk/content: ./ commons/ fop/ fop/0.95/ fop/1.0/ fop/dev/ fop/dev/design/ fop/trunk/
Date Mon, 15 Oct 2012 03:56:40 GMT
Modified: websites/staging/xmlgraphics/trunk/content/fop/license.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/license.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/license.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP License</title>
+    <title>Apache&amp;trade; FOP License</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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 License</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP License</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="License">License</h1>
-<p>All new Apache™ FOP releases will be licensed under the <strong>Apache™ License, version 2.0</strong> . Releases until version 0.20.5 are released unter the Apache™ License, version 1.1.</p>
+<p>All new Apache&trade; FOP releases will be licensed under the <strong>Apache&trade; License, version 2.0</strong> . Releases until version 0.20.5 are released unter the Apache&trade; License, version 1.1.</p>
 <p>To inspect the license terms please consult the LICENSE and NOTICE files in the root directory of the distribution. The full license text can also be accessed via the web from the<jump href="http://www.apache.org/licenses/">Apache Licenses page</jump>.</p>
 <p>Apache FOP comes with a number of libraries all of which are currently coming from within the Apache Software Foundation. These libraries are all licensed under one of the Apache License versions. There is one exception which is "xml-apis.jar" which contains code licensed by the<fork href="http://www.w3.org">W3C</fork>. Please consult the license files included with the libraries in the "lib" directory for details.</p></div>
       </div>

Modified: websites/staging/xmlgraphics/trunk/content/fop/maillist.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/maillist.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/maillist.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Mailing List Resources</title>
+    <title>Apache&amp;trade; FOP: Mailing List Resources</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Mailing List Resources</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Mailing List Resources</h1> -->
 
 
       
@@ -347,7 +347,7 @@ $(document).ready(function () {
 </li>
 </ul>
 <p>For help in understanding email acronyms, see the<jump href="http://www.lingo2word.com/lists/acronym_listA.html">Lingo2Word Acronym List</jump>, or the<jump href="http://www.keno.org/web_design/acronyms.htm">Keno Internet Services Internet Glossary</jump>.</p>
-<h1 id="fop-user">Apache™ FOP Users Mailing List</h1>
+<h1 id="fop-user">Apache&trade; FOP Users Mailing List</h1>
 <p>Use this forum to discuss topics of interest to FOP users.</p>
 <h2 id="fop-user-archive">Archives</h2>
 <p>To review the archives, you have several options:</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/news.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/news.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/news.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP News</title>
+    <title>Apache&amp;trade; FOP News</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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 News</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP News</h1> -->
 
 
       
@@ -339,21 +339,21 @@ Welcome Glenn Adams!
 <p><item date="2011-11-17" title="New committer">
 Welcome Mehdi Houshmand!
 </item></p>
-<h1 id="news-2010-07-21">21 Jul 2010: Apache™ FOP 1.0 Released</h1>
-<p><item date="2010-07-21" title="Apache™ FOP 1.0 Released">
-The Apache™ FOP team is delighted to present you a production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="1.0/releaseNotes_1.0.html">Release Notes</a> for a list of the most important changes.
+<h1 id="news-2010-07-21">21 Jul 2010: Apache&trade; FOP 1.0 Released</h1>
+<p><item date="2010-07-21" title="Apache&trade; FOP 1.0 Released">
+The Apache&trade; FOP team is delighted to present you a production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="1.0/releaseNotes_1.0.html">Release Notes</a> for a list of the most important changes.
 </item></p>
 <h1 id="news-2009-12-14">14 Dec 2009: New committer</h1>
 <p><item date="2009-12-14" title="New committer">
 Welcome Pascal Sancho!
 </item></p>
-<h1 id="news-2008-08-05">5 Aug 2008: Apache™ FOP 0.95 Released</h1>
-<p><item date="2008-08-05" title="Apache™ FOP 0.95 Released">
-The Apache™ FOP team is delighted to present you a production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="0.95/releaseNotes_0.95.html">Release Notes</a> for a list of the most important changes.
-</item></p>
-<h1 id="news-2008-03-16">16 Mar 2008: Apache™ FOP 0.95beta Released</h1>
-<p><item date="2008-03-16" title="Apache™ FOP 0.95beta Released">
-The Apache™ FOP team is delighted to present you a beta version of the next production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of the most important changes.
+<h1 id="news-2008-08-05">5 Aug 2008: Apache&trade; FOP 0.95 Released</h1>
+<p><item date="2008-08-05" title="Apache&trade; FOP 0.95 Released">
+The Apache&trade; FOP team is delighted to present you a production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="0.95/releaseNotes_0.95.html">Release Notes</a> for a list of the most important changes.
+</item></p>
+<h1 id="news-2008-03-16">16 Mar 2008: Apache&trade; FOP 0.95beta Released</h1>
+<p><item date="2008-03-16" title="Apache&trade; FOP 0.95beta Released">
+The Apache&trade; FOP team is delighted to present you a beta version of the next production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the <a href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of the most important changes.
 </item></p>
 <h1 id="news-2007-10-30">30 Oct 2007: New committer</h1>
 <p><item date="2007-10-30" title="New committer">
@@ -363,42 +363,42 @@ Welcome Max Berger!
 <p><item date="2007-10-15" title="New Committer">
 Welcome Adrian Cumiskey!
 </item></p>
-<h1 id="news-2007-08-24">24 Aug 2007: Apache™ FOP 0.94 Released</h1>
-<p><item date="2007-08-24" title="Apache™ FOP 0.94 Released">
-The Apache™ FOP team is pleased to present you the second production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the Release Notes for a list of the most important changes.
+<h1 id="news-2007-08-24">24 Aug 2007: Apache&trade; FOP 0.94 Released</h1>
+<p><item date="2007-08-24" title="Apache&trade; FOP 0.94 Released">
+The Apache&trade; FOP team is pleased to present you the second production grade release of the new FOP codebase. This release contains many bug fixes and new features. See the Release Notes for a list of the most important changes.
 </item></p>
 <h1 id="news-2007-01-26">26 Jan 2007: New Committer</h1>
 <p><item date="2007-01-26" title="New Committer">
 Welcome Jay Bryant!
 </item></p>
-<h1 id="news-2007-01-09">9 Jan 2007: Apache™ FOP 0.93 released</h1>
-<p><item date="2007-01-09" title="Apache™ FOP 0.93 released">
-The Apache™ FOP team is proud to present to you the first production grade release of the new FOP codebase. This release has the new API first introduced in release 0.92 beta. It contains again many bug fixes and new features.
+<h1 id="news-2007-01-09">9 Jan 2007: Apache&trade; FOP 0.93 released</h1>
+<p><item date="2007-01-09" title="Apache&trade; FOP 0.93 released">
+The Apache&trade; FOP team is proud to present to you the first production grade release of the new FOP codebase. This release has the new API first introduced in release 0.92 beta. It contains again many bug fixes and new features.
 </item></p>
 <h1 id="news-2006-10-16">16 Oct 2006: New Committer</h1>
 <p><item date="2006-10-16" title="New Committer">
 Welcome Vincent Hennebert!
 </item></p>
-<h1 id="news-2006-04-18">18 Apr 2006: Apache™ FOP 0.92 beta released</h1>
-<p><item date="2006-04-18" title="Apache™ FOP 0.92 beta released">
+<h1 id="news-2006-04-18">18 Apr 2006: Apache&trade; FOP 0.92 beta released</h1>
+<p><item date="2006-04-18" title="Apache&trade; FOP 0.92 beta released">
 A second "beta" grade release of the new FOP codebase with a modified and now considered stable API. The release contains many bug fixes as well as new features mainly related to even more extensive support of the XSL-FO specification. This is expected to be the last "beta" release before we go to a 1.0 release!
 </item></p>
-<h1 id="news-2005-12-23">23 Dec 2005: Apache™ FOP 0.91 beta released</h1>
-<p><item date="2005-12-23" title="Apache™ FOP 0.91 beta released">
+<h1 id="news-2005-12-23">23 Dec 2005: Apache&trade; FOP 0.91 beta released</h1>
+<p><item date="2005-12-23" title="Apache&trade; FOP 0.91 beta released">
 One month after the initial release we're happy present a "beta" grade release of the new FOP codebase. It's mostly a bug fix release but also contains a few new features. Thanks to all those who sent us feedback on the initial release!
 </item></p>
-<h1 id="news-2005-11-22">22 Nov 2005: Apache™ FOP 0.90 alpha 1 released</h1>
-<p><item date="2005-11-22" title="Apache™ FOP 0.90 alpha 1 released">
-The Apache™ FOP team is proud to present to you the largely rewritten codebase which is finally in a state where you can start to use it. It has taken over three years to get this far and over two years without a new release from the FOP project.</p>
+<h1 id="news-2005-11-22">22 Nov 2005: Apache&trade; FOP 0.90 alpha 1 released</h1>
+<p><item date="2005-11-22" title="Apache&trade; FOP 0.90 alpha 1 released">
+The Apache&trade; FOP team is proud to present to you the largely rewritten codebase which is finally in a state where you can start to use it. It has taken over three years to get this far and over two years without a new release from the FOP project.</p>
 <p>Please see also the <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a> .
 </item></p>
 <h1 id="news-2005-09-08">8 Sep 2005: New Committer</h1>
 <p><item date="2005-09-08" title="New Committer">
 Welcome Manuel Mall!
 </item></p>
-<h1 id="news-2004-10-20">20 Oct 2004: Creation of the Apache™ XML Graphics project</h1>
-<p><item date="2004-10-20" title="Creation of the Apache™ XML Graphics project">
-The Apache Board of Directors agreed to the creation of the <a href="http://xmlgraphics.apache.org">Apache™ XML Graphics</a> project which will be comprised of Batik and FOP. Both former Apache™ XML subprojects are in this way complying with the Board's desire to improve project oversight. Both project teams also see additional benefits of working more closely together.
+<h1 id="news-2004-10-20">20 Oct 2004: Creation of the Apache&trade; XML Graphics project</h1>
+<p><item date="2004-10-20" title="Creation of the Apache&trade; XML Graphics project">
+The Apache Board of Directors agreed to the creation of the <a href="http://xmlgraphics.apache.org">Apache&trade; XML Graphics</a> project which will be comprised of Batik and FOP. Both former Apache&trade; XML subprojects are in this way complying with the Board's desire to improve project oversight. Both project teams also see additional benefits of working more closely together.
 </item></p>
 <h1 id="news-2004-10-08">8 Oct 2004: New Committer</h1>
 <p><item date="2004-10-08" title="New Committer">
@@ -424,8 +424,8 @@ Welcome Finn Bock!
 <p><item date="2003-11-29" title="New Committer">
 Welcome Peter Herweg!
 </item></p>
-<h1 id="news-2003-07-18">18 Jul 2003: Apache™ FOP 0.20.5 released</h1>
-<p><item date="2003-07-18" title="Apache™ FOP 0.20.5 released">
+<h1 id="news-2003-07-18">18 Jul 2003: Apache&trade; FOP 0.20.5 released</h1>
+<p><item date="2003-07-18" title="Apache&trade; FOP 0.20.5 released">
 Changes since 0.20.4 include:</p>
 <ul>
 <li>
@@ -480,12 +480,12 @@ Changes since 0.20.4 include:</p>
 <p><item date="2003-06-29" title="New Committer">
 Welcome Glen Mazza!
 </item></p>
-<h1 id="news-2003-05-23">23 May 2003: Apache™ FOP 0.20.5 Release Candidate 3 available</h1>
-<p><item date="2003-05-23" title="Apache™ FOP 0.20.5 Release Candidate 3 available">
+<h1 id="news-2003-05-23">23 May 2003: Apache&trade; FOP 0.20.5 Release Candidate 3 available</h1>
+<p><item date="2003-05-23" title="Apache&trade; FOP 0.20.5 Release Candidate 3 available">
 See the full text of the <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=5429">announcement</a> .
 </item></p>
-<h1 id="news-2003-02-18">18 Feb 2003: Apache™ FOP 0.20.5 Release Candidate 2 available</h1>
-<p><item date="2003-02-18" title="Apache™ FOP 0.20.5 Release Candidate 2 available">
+<h1 id="news-2003-02-18">18 Feb 2003: Apache&trade; FOP 0.20.5 Release Candidate 2 available</h1>
+<p><item date="2003-02-18" title="Apache&trade; FOP 0.20.5 Release Candidate 2 available">
 See the full text of the <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=4509">announcement</a> .
 </item></p>
 <h1 id="news-2003-02-02">2 Feb 2003: New XML PMC</h1>

Modified: websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Quick Start Guide</title>
+    <title>Apache&amp;trade; FOP: Quick Start Guide</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Quick Start Guide</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Quick Start Guide</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><subtitle>Everything you need to start using and appreciating Apache™ FOP quickly.</subtitle><version>$Revision: 1298724 $</version></p>
-<h1 id="essentials">Apache™ FOP Essentials</h1>
+      	<div class="section-content"><p><subtitle>Everything you need to start using and appreciating Apache&trade; FOP quickly.</subtitle><version>$Revision: 1298724 $</version></p>
+<h1 id="essentials">Apache&trade; FOP Essentials</h1>
 <p>The goal of this <strong>Quick Start Guide</strong> is to help novice users get Apache FOP up and running quickly. Typically, you'll need to:</p>
 <ol>
 <li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/resources.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/resources.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/resources.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Other Resources</title>
+    <title>Apache&amp;trade; FOP: Other Resources</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,13 +323,13 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Other Resources</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Other Resources</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><subtitle>Resources useful for developing and using Apache™ FOP</subtitle><version>$Revision: 1298724 $</version></p>
+      	<div class="section-content"><p><subtitle>Resources useful for developing and using Apache&trade; FOP</subtitle><version>$Revision: 1298724 $</version></p>
 <h1 id="specs">Specifications</h1>
 <h2 id="specs-xslfo">XSL-FO</h2>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/status.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/status.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/status.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Status</title>
+    <title>Apache&amp;trade; FOP Status</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,16 +323,16 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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 Status</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Status</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><subtitle>Current Status of Apache™ FOP</subtitle><version>$Revision: 1298724 $</version></p>
+      	<div class="section-content"><p><subtitle>Current Status of Apache&trade; FOP</subtitle><version>$Revision: 1298724 $</version></p>
 <h1 id="Status">Status</h1>
 <p>[last updated 5 July 2010]</p>
-<p>Apache™ FOP version 0.95 was released on 5 August 2008. Apache™ FOP version 1.0 was released on 21 July 2010.</p>
+<p>Apache&trade; FOP version 0.95 was released on 5 August 2008. Apache&trade; FOP version 1.0 was released on 21 July 2010.</p>
 <h1 id="development-status-developmentstatus">Development Status # {#Development+Status}</h1>
 <p>The FOP code base is gradually evolving, from version 0.90 released on 22 November 2005, to version 1.0 released on 21 July 2010. Further releases in the 1.x series may be expected.</p>
 <p>FOP releases before version 0.90 were based on a different code base. The last release in that series was version 0.20.5, released on 18 July 2003. This series is no longer maintained.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/team.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/team.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/team.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Development Team</title>
+    <title>Apache&amp;trade; FOP: Development Team</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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 Team</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Development Team</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Accessibility</title>
+    <title>Apache&amp;trade; FOP: Accessibility</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Accessibility</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Accessibility</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>
-<p>This page describes the <a href="http://en.wikipedia.org/wiki/Accessibility">accessibility</a> features of Apache™ FOP. <a href="http://www.section508.gov/">Section 508</a> defines accessibility in the context of electronic documents for the USA but other countries have similar requirements.</p>
+<p>This page describes the <a href="http://en.wikipedia.org/wiki/Accessibility">accessibility</a> features of Apache&trade; FOP. <a href="http://www.section508.gov/">Section 508</a> defines accessibility in the context of electronic documents for the USA but other countries have similar requirements.</p>
 <p>Accessibility features are available only for the PDF output format and there are some implementation limitations. Also, certain actions must be undertaken by the content creator to ensure that FOP can create a truly accessible document.</p>
 <h1 id="enabling-accessibility">Enabling accessibility</h1>
 <p>There are 3 ways to enable accessibility:</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Ant task</title>
+    <title>Apache&amp;trade; FOP: Ant task</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Ant task</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Ant task</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>
-<p>Apache™ FOP provides an Ant task for automating the document build process.</p>
+<p>Apache&trade; FOP provides an Ant task for automating the document build process.</p>
 <h1 id="basics">Description</h1>
 <p>The FOP Ant task will convert XSL-FO documents to PDF, PS, PCL etc. output (see <a href="output.html">Output formats</a> for available formats).</p>
 <p>To call FOP tasks within Ant, first add a FOP task definition to your Ant build file. One method of defining the task is as follows:</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Building from Source Code</title>
+    <title>Apache&amp;trade; FOP: Building from Source Code</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Building from Source Code</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Building from Source Code</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="build-needed">Do You Need To Build?</h1>
-<p>Apache™ FOP snapshots are either pre-compiled binary or source. If you are using a binary snapshot, it is already built and there is no need to build it again. If you got the source code from a repository snapshot or via Subversion you will need to build FOP. See the <a href="../download.html">Download Instructions</a> for information about where to obtain binary or repository snapshots, and whether a binary or source snapshot is best for your needs.</p>
+<p>Apache&trade; FOP snapshots are either pre-compiled binary or source. If you are using a binary snapshot, it is already built and there is no need to build it again. If you got the source code from a repository snapshot or via Subversion you will need to build FOP. See the <a href="../download.html">Download Instructions</a> for information about where to obtain binary or repository snapshots, and whether a binary or source snapshot is best for your needs.</p>
 <h1 id="env">Set Up Your Environment</h1>
 <h2 id="env-jdk">JDK</h2>
 <p>Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4 (A Java Runtime Environment is not sufficient).</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Complex Scripts</title>
+    <title>Apache&amp;trade; FOP: Complex Scripts</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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: Complex Scripts</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Complex Scripts</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>
-<p>This page describes the <a href="http://en.wikipedia.org/wiki/Complex_scripts">complex scripts</a> features of Apache™ FOP, which include:</p>
+<p>This page describes the <a href="http://en.wikipedia.org/wiki/Complex_scripts">complex scripts</a> features of Apache&trade; FOP, which include:</p>
 <ul>
 <li>
 <p>Support for languages written with right-to-left scripts, such as Arabic and Hebrew scripts.</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Configuration</title>
+    <title>Apache&amp;trade; FOP: Configuration</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Configuration</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="general">Configuration File Basics</h1>
-<p>The Apache™ FOP configuration file is an XML file containing a variety of settings that are useful for controlling FOP's behavior, and for helping it find resources that you wish it to use.</p>
+<p>The Apache&trade; FOP configuration file is an XML file containing a variety of settings that are useful for controlling FOP's behavior, and for helping it find resources that you wish it to use.</p>
 <p>The easiest way to get started using a FOP configuration file is to copy the sample found at <code>{fop-dir}/conf/fop.xconf</code> to a location of your choice, and then to edit it according to your needs. It contains templates for the various configuration options, most of which are commented out. Remove the comments and change the settings for entries that you wish to use. Be sure to follow any instructions, including comments which specify the value range. Also, since the configuration file is XML, be sure to keep it well-formed.</p>
 <h2 id="general-available">Making Configuration Available to FOP</h2>
 <p>After creating your configuration file, you must tell FOP how to find it:</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Embedding</title>
+    <title>Apache&amp;trade; FOP: Embedding</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Embedding</h1> -->
 
 
       
@@ -331,8 +331,8 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="overview">Overview</h1>
-<p>Review <a href="running.html">Running Apache™ FOP</a> for important information that applies to embedded applications as well as command-line use, such as options and performance.</p>
-<p>To embed Apache™ FOP in your application, first create a new org.apache.fop.apps.FopFactory instance. This object can be used to launch multiple rendering runs. For each run, create a new org.apache.fop.apps.Fop instance through one of the factory methods of FopFactory. In the method call you specify which output format (i.e. MIME type) to use and, if the selected output format requires an OutputStream, which OutputStream to use for the results of the rendering. You can customize FOP's behaviour in a rendering run by supplying your own FOUserAgent instance. The FOUserAgent can, for example, be used to set your own document handler instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.</p>
+<p>Review <a href="running.html">Running Apache&trade; FOP</a> for important information that applies to embedded applications as well as command-line use, such as options and performance.</p>
+<p>To embed Apache&trade; FOP in your application, first create a new org.apache.fop.apps.FopFactory instance. This object can be used to launch multiple rendering runs. For each run, create a new org.apache.fop.apps.Fop instance through one of the factory methods of FopFactory. In the method call you specify which output format (i.e. MIME type) to use and, if the selected output format requires an OutputStream, which OutputStream to use for the results of the rendering. You can customize FOP's behaviour in a rendering run by supplying your own FOUserAgent instance. The FOUserAgent can, for example, be used to set your own document handler instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.</p>
 <h1 id="API">The API</h1>
 <p>FOP has many classes which express the "public" access modifier, however, this is not indicative of their inclusion into the public API. Every attempt will be made to keep the public API static, to minimize regressions for existing users, however, since the API is not clearly defined, the list of classes below are the generally agreed public API:
 org.apache.fop.apps.*

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Events/Processing Feedback</title>
+    <title>Apache&amp;trade; FOP: Events/Processing Feedback</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Events/Processing Feedback</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="introduction">Introduction</h1>
-<p>In versions until 0.20.5, Apache™ FOP used <a href="http://excalibur.apache.org/framework/index.html">Avalon-style Logging</a> where it was possible to supply a logger per processing run. During the redesign the logging infrastructure was switched over to <a href="http://commons.apache.org/logging/">Commons Logging</a> which is (like Log4J or java.util.logging) a "static" logging framework (the logger is accessed through static variables). This made it very difficult in a multi-threaded system to retrieve information for a single processing run.</p>
+<p>In versions until 0.20.5, Apache&trade; FOP used <a href="http://excalibur.apache.org/framework/index.html">Avalon-style Logging</a> where it was possible to supply a logger per processing run. During the redesign the logging infrastructure was switched over to <a href="http://commons.apache.org/logging/">Commons Logging</a> which is (like Log4J or java.util.logging) a "static" logging framework (the logger is accessed through static variables). This made it very difficult in a multi-threaded system to retrieve information for a single processing run.</p>
 <p>With FOP's event subsystem, we'd like to close this gap again and even go further. The first point is to realize that we have two kinds of "logging". Firstly, we have the logging infrastructure for the (FOP) developer who needs to be able to enable finer log messages for certain parts of FOP to track down a certain problem. Secondly, we have the user who would like to be informed about missing images, overflowing lines or substituted fonts. These messages (or events) are targeted at less technical people and may ideally be localized (translated). Furthermore, tool and solution builders would like to integrate FOP into their own solutions. For example, an FO editor should be able to point the user to the right place where a particular problem occurred while developing a document template. Finally, some integrators would like to abort processing if a resource (an image or a font) has not been found, while others would simply continue. The event system allows to react on the
 se events.</p>
 <p>On this page, we won't discuss logging as such. We will show how the event subsystem can be used for various tasks. We'll first look at the event subsystem from the consumer side. Finally, the production of events inside FOP will be discussed (this is mostly interesting for FOP developers only).</p>
 <h1 id="consumer">The consumer side</h1>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Standard Apache™ FOP Extensions</title>
+    <title>Standard Apache&amp;trade; FOP Extensions</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Standard Apache&amp;trade; 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>
-<p>By "extension", we mean any data that can be placed in the input XML document that is not addressed by the XSL-FO standard. By having a mechanism for supporting extensions, Apache™ FOP is able to add features that are not covered in the specification.</p>
+<p>By "extension", we mean any data that can be placed in the input XML document that is not addressed by the XSL-FO standard. By having a mechanism for supporting extensions, Apache&trade; FOP is able to add features that are not covered in the specification.</p>
 <p>The extensions documented here are included with FOP, and are automatically available to you. If you wish to add an extension of your own to FOP, please see the <a href="../dev/extensions.html">Developers' Extension Page</a> .
 All extensions require the correct use of an appropriate namespace in your input document.</p>
 <h1 id="svg">SVG</h1>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Fonts</title>
+    <title>Apache&amp;trade; FOP: Fonts</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Fonts</h1> -->
 
 
       

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Graphics Formats</title>
+    <title>Apache&amp;trade; FOP: Graphics Formats</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Graphics Formats</h1> -->
 
 
       
@@ -334,7 +334,7 @@ $(document).ready(function () {
 <p>Some noteworthy features of the image handling subsystem are:</p>
 <ul>
 <li>
-<p>The image libraries Jimi and JAI are not supported. Instead, Apache™ FOP uses the Image I/O API that was introduced with Java 1.4 for all bitmap codecs.</p>
+<p>The image libraries Jimi and JAI are not supported. Instead, Apache&trade; FOP uses the Image I/O API that was introduced with Java 1.4 for all bitmap codecs.</p>
 </li>
 <li>
 <p>Some bitmap images are not converted to a standardized 24 bit RGB image but are instead handled in their native format.</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Hyphenation</title>
+    <title>Apache&amp;trade; FOP: Hyphenation</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Hyphenation</h1> -->
 
 
       
@@ -332,9 +332,9 @@ $(document).ready(function () {
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="support">Hyphenation Support</h1>
 <h2 id="intro">Introduction</h2>
-<p>Apache™ FOP uses Liang's hyphenation algorithm, well known from TeX. It needs language specific pattern and other data for operation.</p>
+<p>Apache&trade; FOP uses Liang's hyphenation algorithm, well known from TeX. It needs language specific pattern and other data for operation.</p>
 <p>Because of <a href="#license-issues">licensing issues</a> (and for convenience), all hyphenation patterns for FOP are made available through the <a href="http://offo.sourceforge.net/hyphenation/index.html">Objects For Formatting Objects</a> project.
-If you have made improvements to an existing Apache™ FOP hyphenation pattern, or if you have created one from scratch, please consider contributing these to OFFO so that they can benefit other FOP users as well. Please inquire on the <a href="../maillist.html#fop-user">FOP User mailing list</a> .</p>
+If you have made improvements to an existing Apache&trade; FOP hyphenation pattern, or if you have created one from scratch, please consider contributing these to OFFO so that they can benefit other FOP users as well. Please inquire on the <a href="../maillist.html#fop-user">FOP User mailing list</a> .</p>
 <h2 id="license-issues">License Issues</h2>
 <p>Many of the hyphenation files distributed with TeX and its offspring are licenced under the <a href="http://www.latex-project.org/lppl.html">LaTeX Project Public License (LPPL)</a> , which prevents them from being distributed with Apache software. The LPPL puts restrictions on file names in redistributed derived works which we feel can't guarantee. Some hyphenation pattern files have other or additional restrictions, for example against use for commercial purposes.</p>
 <p>Although Apache FOP cannot redistribute hyphenation pattern files that do not conform with its license scheme, that does not necessarily prevent users from using such hyphenation patterns with FOP. However, it does place on the user the responsibility for determining whether the user can rightly use such hyphenation patterns under the hyphenation pattern license.

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Trunk (Development code)</title>
+    <title>Apache&amp;trade; FOP Trunk (Development code)</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP Trunk (Development code)</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="intro">Introduction</h1>
-<p>Apache™ <strong>FOP Trunk</strong> is the name for the current development code as found in the <a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">Subversion repository</a> . This section of the FOP web site provides the documentation for this version.</p>
+<p>Apache&trade; <strong>FOP Trunk</strong> is the name for the current development code as found in the <a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">Subversion repository</a> . This section of the FOP web site provides the documentation for this version.</p>
 <p>The Apache FOP team is proud to present to you this production quality codebase. It has taken over three years to get this far and over two years without a new release from the FOP project. We're still in the process of adding new features. We welcome any feedback you might have and even more, any other form of help to get the project forward.</p>
 <h1 id="upgrading">Upgrading from an earlier version</h1>
 <p>If you're upgrading to this version from an earlier version of FOP, please read the information contained on the <a href="upgrading.html">Upgrading page</a> !</p></div>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Intermediate Format</title>
+    <title>Apache&amp;trade; FOP: Intermediate Format</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Intermediate Format</h1> -->
 
 
       
@@ -332,7 +332,7 @@ $(document).ready(function () {
       	<div class="section-content"><p><version>$Revision: 1298724 $</version>
 Please note that the intermediate formats described here are <strong>advanced features</strong> and can be ignored by most users of Apache FOP.</p>
 <h1 id="introduction">Introduction</h1>
-<p>Apache™ FOP now provides two different so-called intermediate formats. The first one (let's call it the area tree XML format) is basically a 1:1 XML representation of FOP's area tree as generated by the layout engine. The area tree is conceptually defined in the <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a> . Even though the area tree is mentioned in the XSL-FO specification, this part is not standardized. Therefore, the area tree XML format is a FOP-proprietary XML file format. The area tree XML can be generated through the area tree XML Renderer (the XMLRenderer).</p>
+<p>Apache&trade; FOP now provides two different so-called intermediate formats. The first one (let's call it the area tree XML format) is basically a 1:1 XML representation of FOP's area tree as generated by the layout engine. The area tree is conceptually defined in the <a href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a> . Even though the area tree is mentioned in the XSL-FO specification, this part is not standardized. Therefore, the area tree XML format is a FOP-proprietary XML file format. The area tree XML can be generated through the area tree XML Renderer (the XMLRenderer).</p>
 <p>The second intermediate format (which we shall name exactly like this: the intermediate format) is a recent addition which tries to meet a slightly different set of goals. It is highly optimized for speed.</p>
 <p>The intermediate format can be used to generate intermediate documents that are modified before they are finally rendered to their ultimate output format. Modifications include adjusting and changing trait values, adding or modifying area objects, inserting prefabricated pages, overlays, imposition (n-up, rotation, scaling etc.). Multiple IF files can be combined to a single output file.</p>
 <h1 id="which-if">Which Intermediate Format to choose?</h1>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Metadata</title>
+    <title>Apache&amp;trade; FOP: Metadata</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: Metadata</h1> -->
 
 
       
@@ -332,7 +332,7 @@ $(document).ready(function () {
       	<div class="section-content"><h1 id="overview">Overview</h1>
 <p>Document metadata is an important tool for categorizing and finding documents. Various formats support different kinds of metadata representation and to different levels. One of the more popular and flexible means of representing document or object metadata is <a href="http://www.adobe.com/products/xmp/">XMP (eXtensible Metadata Platform, specified by Adobe)</a> . PDF 1.4 introduced the use of XMP. The XMP specification lists recommendation for embedding XMP metdata in other document and image formats. Given its flexibility it makes sense to make use this approach in the XSL-FO context. Unfortunately, unlike SVG which also refers to XMP, XSL-FO doesn't recommend a preferred way of specifying document and object metadata. Therefore, there's no portable way to represent metadata in XSL-FO documents. Each implementation does it differently.</p>
 <h1 id="xmp-in-fo">Embedding XMP in an XSL-FO document</h1>
-<p>As noted above, there's no officially recommended way to embed metadata in XSL-FO. Apache™ FOP supports embedding XMP in XSL-FO. Currently, only support for document-level metadata is implemented. Object-level metadata will be implemented when there's interest.</p>
+<p>As noted above, there's no officially recommended way to embed metadata in XSL-FO. Apache&trade; FOP supports embedding XMP in XSL-FO. Currently, only support for document-level metadata is implemented. Object-level metadata will be implemented when there's interest.</p>
 <p>Document-level metadata can be specified in the <code>fo:declarations</code> element. XMP specification recommends to use <code>x:xmpmeta</code> , <code>rdf:RDF</code> , and <code>rdf:Description</code> elements as shown in example below. Both <code>x:xmpmeta</code> and <code>rdf:RDF</code> elements are recognized as the top-level element introducing an XMP fragment (as per the XMP specification).</p>
 <h2 id="xmp-example">Example</h2>
 <p class="."></p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Output Formats</title>
+    <title>Apache&amp;trade; FOP Output Formats</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,14 +323,14 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; 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>
-<p>Apache™ FOP supports multiple output formats by using a different renderer for each format. The renderers do not all have the same set of capabilities, sometimes because of the output format itself, sometimes because some renderers get more development attention than others.</p>
+<p>Apache&trade; FOP supports multiple output formats by using a different renderer for each format. The renderers do not all have the same set of capabilities, sometimes because of the output format itself, sometimes because some renderers get more development attention than others.</p>
 <h1 id="general">General Information</h1>
 <h2 id="general-fonts">Fonts</h2>
 <p>Most FOP renderers use a FOP-specific system for font registration. However, the Java2D/AWT and print renderers use the Java AWT package, which gets its font information from the operating system registration. This can result in several differences, including actually using different fonts, and having different font metrics for the same font. The net effect is that the layout of a given FO document can be quite different between renderers that do not use the same font information.</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: PDF/A (ISO 19005)</title>
+    <title>Apache&amp;trade; FOP: PDF/A (ISO 19005)</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: PDF/A (ISO 19005)</h1> -->
 
 
       

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: PDF encryption.</title>
+    <title>Apache&amp;trade; FOP: PDF encryption.</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: PDF encryption.</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="Overview">Overview</h1>
-<p>Apache™ FOP supports encryption of PDF output, thanks to Patrick C. Lankswert. This feature is commonly used to prevent unauthorized viewing, printing, editing, copying text from the document and doing annotations. It is also possible to ask the user for a password in order to view the contents. Note that there already exist third party applications which can decrypt an encrypted PDF without effort and allow the aforementioned operations, therefore the degree of protection is limited.</p>
+<p>Apache&trade; FOP supports encryption of PDF output, thanks to Patrick C. Lankswert. This feature is commonly used to prevent unauthorized viewing, printing, editing, copying text from the document and doing annotations. It is also possible to ask the user for a password in order to view the contents. Note that there already exist third party applications which can decrypt an encrypted PDF without effort and allow the aforementioned operations, therefore the degree of protection is limited.</p>
 <p>For further information about features and restrictions regarding PDF encryption, look at the documentation coming with Adobe Acrobat or the technical documentation on the Adobe web site.</p>
 <h1 id="usage-command-line-usage28commandline29">Usage (command line) # {#Usage+%28command+line%29}</h1>
 <p>Encryption is enabled by supplying any of the encryption related options.</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: PDF/X (ISO 15930)</title>
+    <title>Apache&amp;trade; FOP: PDF/X (ISO 15930)</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; FOP: PDF/X (ISO 15930)</h1> -->
 
 
       

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Running Apache™ FOP</title>
+    <title>Running Apache&amp;trade; FOP</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Running Apache&amp;trade; FOP</h1> -->
 
 
       
@@ -340,7 +340,7 @@ $(document).ready(function () {
 </ul>
 </li>
 <li>
-<p>Apache™ FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will need to run a basic FOP installation. These can be found in the [fop-root]/lib directory. These libraries include the following:</p>
+<p>Apache&trade; FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will need to run a basic FOP installation. These can be found in the [fop-root]/lib directory. These libraries include the following:</p>
 <ul>
 <li>
 <p><a href="http://xmlgraphics.apache.org/commons/">Apache XML Graphics Commons</a> , an shared library for Batik and FOP.</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Servlets</title>
+    <title>Apache&amp;trade; FOP: Servlets</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,15 +323,15 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Apache&amp;trade; 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>
+      	<div class="section-content"><p><subtitle>How to use Apache&trade; FOP in a Servlet</subtitle><version>$Revision: 1298724 $</version></p>
 <h1 id="overview">Overview</h1>
-<p>This page discusses topic all around using Apache™ FOP in a servlet environment.</p>
+<p>This page discusses topic all around using Apache&trade; FOP in a servlet environment.</p>
 <h1 id="example-servlets">Example Servlets in the FOP distribution</h1>
 <p>In the directory {fop-dir}/src/java/org/apache/fop/servlet, you'll find a working example of a FOP-enabled servlet.</p>
 <p>The servlet is automatically built when you build Apache FOP using the supplied Ant script. After building the servlet, drop fop.war into the webapps directory of Apache Tomcat (or any other web container). Then, you can use URLs like the following to generate PDF files:</p>

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 Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Upgrading from an Earlier Version of Apache™ FOP</title>
+    <title>Upgrading from an Earlier Version of Apache&amp;trade; FOP</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -323,7 +323,7 @@ $(document).ready(function () {
 	<div id="bannertext" style="border-bottom: 2px dashed #666666; height: 70px;">
 	  <a href="/fop/"><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><!-- <h1>Upgrading from an Earlier Version of Apache&amp;trade; FOP</h1> -->
 
 
       
@@ -331,7 +331,7 @@ $(document).ready(function () {
       	<!-- <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>
 <h1 id="important">Important!</h1>
-<p>If you're planning to upgrade to the latest Apache™ FOP version there are a few very important things to consider:</p>
+<p>If you're planning to upgrade to the latest Apache&trade; FOP version there are a few very important things to consider:</p>
 <ul>
 <li>
 <p>The API of FOP has changed considerably and is not backwards-compatible with versions 0.20.5 and 0.91beta. Version 0.92 introduced the <strong>new stable API</strong> .</p>

Modified: websites/staging/xmlgraphics/trunk/content/legal.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/legal.html (original)
+++ websites/staging/xmlgraphics/trunk/content/legal.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>The Apache™ XML Graphics Project - Legal Stuff</title>
+    <title>The Apache&amp;trade; XML Graphics Project - Legal Stuff</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -122,7 +122,7 @@ $(document).ready(function () {
 	<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><!-- <h1>The Apache&amp;trade; XML Graphics Project - Legal Stuff</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/mail.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/mail.html (original)
+++ websites/staging/xmlgraphics/trunk/content/mail.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>The Apache™ XML Graphics Project - Mailing Lists</title>
+    <title>The Apache&amp;trade; XML Graphics Project - Mailing Lists</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -122,7 +122,7 @@ $(document).ready(function () {
 	<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><!-- <h1>The Apache&amp;trade; XML Graphics Project - Mailing Lists</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/repo.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/repo.html (original)
+++ websites/staging/xmlgraphics/trunk/content/repo.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>The Apache™ XML Graphics Project - Code Repositories</title>
+    <title>The Apache&amp;trade; XML Graphics Project - Code Repositories</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -122,27 +122,27 @@ $(document).ready(function () {
 	<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><!-- <h1>The Apache&amp;trade; 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>
-<p>The Apache™ XML Graphics project uses Subversion (SVN) as version control tool.</p>
+<p>The Apache&trade; XML Graphics project uses Subversion (SVN) as version control tool.</p>
 <p>You can browse the repositories belonging to the XML Graphics project via the web:</p>
 <ul>
 <li>
-<p>Apache™ Batik: <a href="http://svn.apache.org/viewvc/xmlgraphics/batik/">http://svn.apache.org/viewvc/xmlgraphics/batik/</a> (SVN repository)</p>
+<p>Apache&trade; Batik: <a href="http://svn.apache.org/viewvc/xmlgraphics/batik/">http://svn.apache.org/viewvc/xmlgraphics/batik/</a> (SVN repository)</p>
 </li>
 <li>
-<p>Apache™ FOP: <a href="http://svn.apache.org/viewvc/xmlgraphics/fop/">http://svn.apache.org/viewvc/xmlgraphics/fop/</a> (SVN repository)</p>
+<p>Apache&trade; FOP: <a href="http://svn.apache.org/viewvc/xmlgraphics/fop/">http://svn.apache.org/viewvc/xmlgraphics/fop/</a> (SVN repository)</p>
 </li>
 <li>
-<p>Apache™ XML Graphics Commons: <a href="http://svn.apache.org/viewvc/xmlgraphics/commons/">http://svn.apache.org/viewvc/xmlgraphics/commons/</a> (SVN repository)</p>
+<p>Apache&trade; XML Graphics Commons: <a href="http://svn.apache.org/viewvc/xmlgraphics/commons/">http://svn.apache.org/viewvc/xmlgraphics/commons/</a> (SVN repository)</p>
 </li>
 <li>
-<p>Apache™ XML Graphics Site: <a href="http://svn.apache.org/viewvc/xmlgraphics/site/">http://svn.apache.org/viewvc/xmlgraphics/site/</a> (SVN repository)</p>
+<p>Apache&trade; XML Graphics Site: <a href="http://svn.apache.org/viewvc/xmlgraphics/site/">http://svn.apache.org/viewvc/xmlgraphics/site/</a> (SVN repository)</p>
 </li>
 </ul>
 <h1 id="access-the-source-tree-accessthesourcetree">Access the Source Tree # {#Access+the+Source+Tree}</h1>

Modified: websites/staging/xmlgraphics/trunk/content/sitemap.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/sitemap.html (original)
+++ websites/staging/xmlgraphics/trunk/content/sitemap.html Mon Oct 15 03:56:36 2012
@@ -129,14 +129,14 @@ $(document).ready(function () {
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><ul>
-<li><a href="/charter.html">The Apache™ XML Graphics Project - Charter</a></li>
+<li><a href="/charter.html">The Apache&trade; XML Graphics Project - Charter</a></li>
 <li><a href="/index.html"></a></li>
-<li><a href="/legal.html">The Apache™ XML Graphics Project - Legal Stuff</a><ul>
+<li><a href="/legal.html">The Apache&trade; XML Graphics Project - Legal Stuff</a><ul>
 <li><a href="/legal.html#Legal">Legal Stuff</a></li>
 <li><a href="/legal.html#Trademarks">Trademarks</a></li>
 </ul>
 </li>
-<li><a href="/mail.html">The Apache™ XML Graphics Project - Mailing Lists</a><ul>
+<li><a href="/mail.html">The Apache&trade; XML Graphics Project - Mailing Lists</a><ul>
 <li><a href="/mail.html#usage">Usage Notes</a></li>
 <li><a href="/mail.html#public_archives">Public Archives</a></li>
 <li><a href="/mail.html#xmlgraphics-general">XML Graphics General Mailing List</a></li>
@@ -149,7 +149,7 @@ $(document).ready(function () {
 <li><a href="/mail.html#fop-commits">FOP Commits Mailing List</a></li>
 </ul>
 </li>
-<li><a href="/repo.html">The Apache™ XML Graphics Project - Code Repositories</a><ul>
+<li><a href="/repo.html">The Apache&trade; XML Graphics Project - Code Repositories</a><ul>
 <li><a href="/repo.html#web-access">Web Access to the Repositories</a></li>
 <li><a href="/repo.html#Access+the+Source+Tree">Access the Source Tree</a><ul>
 <li><a href="/repo.html#Anonymous+%28read-only%29+SVN+access">Anonymous (read-only) SVN access</a></li>
@@ -157,9 +157,9 @@ $(document).ready(function () {
 </li>
 </ul>
 </li>
-<li><a href="/team.html">The Apache™ XML Graphics Project - Community</a><ul>
+<li><a href="/team.html">The Apache&trade; XML Graphics Project - Community</a><ul>
 <li><a href="/team.html#WhoWeAre">Who We Are</a></li>
-<li><a href="/team.html#PMC">Apache™ XML Graphics Project - Project Management Committee</a><ul>
+<li><a href="/team.html#PMC">Apache&trade; XML Graphics Project - Project Management Committee</a><ul>
 <li><a href="/team.html#PMC-emeritus">Emeritus Project Management Committee Members</a></li>
 </ul>
 </li>

Modified: websites/staging/xmlgraphics/trunk/content/team.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/team.html (original)
+++ websites/staging/xmlgraphics/trunk/content/team.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>The Apache™ XML Graphics Project - Community</title>
+    <title>The Apache&amp;trade; XML Graphics Project - Community</title>
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
@@ -122,15 +122,15 @@ $(document).ready(function () {
 	<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><!-- <h1>The Apache&amp;trade; 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>
-<p>The <em>Apache™ XML Graphics Project</em> operates on a meritocracy: the more you do, the more responsibility you can obtain. This page lists all of the people who have gone the extra mile and are Committers or members of the Project Management Committee. If you would like to get involved, the first step is to join the <a href="mail.html">community mailing lists</a> for the project(s) which interest you.</p>
-<h1 id="PMC">Apache™ XML Graphics Project - Project Management Committee</h1>
+<p>The <em>Apache&trade; XML Graphics Project</em> operates on a meritocracy: the more you do, the more responsibility you can obtain. This page lists all of the people who have gone the extra mile and are Committers or members of the Project Management Committee. If you would like to get involved, the first step is to join the <a href="mail.html">community mailing lists</a> for the project(s) which interest you.</p>
+<h1 id="PMC">Apache&trade; XML Graphics Project - Project Management Committee</h1>
 <ul>
 <li>
 <p><a href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</a> </p>
@@ -170,7 +170,7 @@ $(document).ready(function () {
 </li>
 <li>
 <p><a href="mailto:spepping@apache.org">Simon Pepping</a> 
-If you need to get into contact with the Apache™ XML Graphics PMC and require confidentiality, send your mail to <a href="mailto:private@xmlgraphics.apache.org"></a> . Otherwise, please send your mail to <a href="mailto:general@xmlgraphics.apache.org"></a> . If you want to ask a question about one of the XML Graphics projects's products, please send your mail to the respective <a href="mail.html">user mailing list</a> .</p>
+If you need to get into contact with the Apache&trade; XML Graphics PMC and require confidentiality, send your mail to <a href="mailto:private@xmlgraphics.apache.org"></a> . Otherwise, please send your mail to <a href="mailto:general@xmlgraphics.apache.org"></a> . If you want to ask a question about one of the XML Graphics projects's products, please send your mail to the respective <a href="mail.html">user mailing list</a> .</p>
 </li>
 </ul></div>
       </div>



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


Mime
View raw message