xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835093 [1/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
Author: buildbot
Date: Mon Oct 15 03:56:36 2012
New Revision: 835093

Log:
Staging update by buildbot for xmlgraphics

Modified:
    websites/staging/xmlgraphics/trunk/content/   (props changed)
    websites/staging/xmlgraphics/trunk/content/charter.html
    websites/staging/xmlgraphics/trunk/content/commons/bugs.html
    websites/staging/xmlgraphics/trunk/content/commons/download.html
    websites/staging/xmlgraphics/trunk/content/commons/image-loader.html
    websites/staging/xmlgraphics/trunk/content/commons/index.html
    websites/staging/xmlgraphics/trunk/content/commons/postscript.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfencryption.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfx.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/running.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/servlets.html
    websites/staging/xmlgraphics/trunk/content/fop/0.95/upgrading.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/accessibility.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/anttask.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/compiling.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/configuration.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/embedding.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/events.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/extensions.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/fonts.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/graphics.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/hyphenation.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/index.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/intermediate.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/knownissues_overview.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/metadata.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/output.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfa.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfencryption.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/servlets.html
    websites/staging/xmlgraphics/trunk/content/fop/1.0/upgrading.html
    websites/staging/xmlgraphics/trunk/content/fop/bugs.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/index.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/release.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html
    websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html
    websites/staging/xmlgraphics/trunk/content/fop/download.html
    websites/staging/xmlgraphics/trunk/content/fop/examples.html
    websites/staging/xmlgraphics/trunk/content/fop/faq.html
    websites/staging/xmlgraphics/trunk/content/fop/fo.html
    websites/staging/xmlgraphics/trunk/content/fop/gethelp.html
    websites/staging/xmlgraphics/trunk/content/fop/index.html
    websites/staging/xmlgraphics/trunk/content/fop/knownissues.html
    websites/staging/xmlgraphics/trunk/content/fop/license.html
    websites/staging/xmlgraphics/trunk/content/fop/maillist.html
    websites/staging/xmlgraphics/trunk/content/fop/news.html
    websites/staging/xmlgraphics/trunk/content/fop/quickstartguide.html
    websites/staging/xmlgraphics/trunk/content/fop/resources.html
    websites/staging/xmlgraphics/trunk/content/fop/status.html
    websites/staging/xmlgraphics/trunk/content/fop/team.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/anttask.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/complexscripts.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/events.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/extensions.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/graphics.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/metadata.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/output.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfa.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfencryption.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/pdfx.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/running.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/servlets.html
    websites/staging/xmlgraphics/trunk/content/fop/trunk/upgrading.html
    websites/staging/xmlgraphics/trunk/content/legal.html
    websites/staging/xmlgraphics/trunk/content/mail.html
    websites/staging/xmlgraphics/trunk/content/repo.html
    websites/staging/xmlgraphics/trunk/content/sitemap.html
    websites/staging/xmlgraphics/trunk/content/team.html

Propchange: websites/staging/xmlgraphics/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 15 03:56:36 2012
@@ -1 +1 @@
-1398188
+1398192

Modified: websites/staging/xmlgraphics/trunk/content/charter.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/charter.html (original)
+++ websites/staging/xmlgraphics/trunk/content/charter.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>The Apache™ XML Graphics Project - Charter</title>
+    <title>The Apache&amp;trade; XML Graphics Project - Charter</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 - Charter</h1> -->
+	</div><!-- <h1>The Apache&amp;trade; XML Graphics Project - Charter</h1> -->
 
 
       
@@ -130,7 +130,7 @@ $(document).ready(function () {
       	<!-- <div id="breadcrumb"><a href="/">Home</a></div> -->
       	<div class="section-content"><h1 id="the-apache-xml-graphics-project-charter">The Apache XML Graphics Project Charter</h1>
 <h1 id="1-introduction">1 INTRODUCTION</h1>
-<p>1.1 Apache™ XML Graphics is a collaborative software development project 
+<p>1.1 Apache&trade; XML Graphics is a collaborative software development project 
 dedicated to providing robust, full-featured, commercial-quality, and freely 
 available software packages for the conversion of XML to graphical output and 
 for related components. This project is managed in cooperation with various 

Modified: websites/staging/xmlgraphics/trunk/content/commons/bugs.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/commons/bugs.html (original)
+++ websites/staging/xmlgraphics/trunk/content/commons/bugs.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ XML Graphics Commons: Bugs and Other Trackable Issues</title>
+    <title>Apache&amp;trade; XML Graphics Commons: Bugs and Other Trackable Issues</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>Apache™ XML Graphics Commons: Bugs and Other Trackable Issues</h1> -->
+	</div><!-- <h1>Apache&amp;trade; XML Graphics Commons: Bugs and Other Trackable Issues</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/commons/download.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/commons/download.html (original)
+++ websites/staging/xmlgraphics/trunk/content/commons/download.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Download Apache™ XML Graphics Commons</title>
+    <title>Download Apache&amp;trade; XML Graphics Commons</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,14 +122,14 @@ $(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>Download Apache™ XML Graphics Commons</h1> -->
+	</div><!-- <h1>Download Apache&amp;trade; XML Graphics Commons</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/commons/">Commons</a></div> -->
       	<div class="section-content"><h1 id="release">Download a Release</h1>
-<p>Source ("-src") and binary ("-bin") distributions can be downloaded from a <a href="http://www.apache.org/dyn/closer.cgi/xmlgraphics/commons">Apache™ XML Graphics Commons Distribution Mirror</a> .</p>
+<p>Source ("-src") and binary ("-bin") distributions can be downloaded from a <a href="http://www.apache.org/dyn/closer.cgi/xmlgraphics/commons">Apache&trade; XML Graphics Commons Distribution Mirror</a> .</p>
 <h1 id="svn">Download from Subversion</h1>
 <p>The latest source code is available directly from the Subversion repository:</p>
 <table>

Modified: websites/staging/xmlgraphics/trunk/content/commons/image-loader.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/commons/image-loader.html (original)
+++ websites/staging/xmlgraphics/trunk/content/commons/image-loader.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ XML Graphics Commons: Image Loader Framework</title>
+    <title>Apache&amp;trade; XML Graphics Commons: Image Loader Framework</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,14 +122,14 @@ $(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>Apache™ XML Graphics Commons: Image Loader Framework</h1> -->
+	</div><!-- <h1>Apache&amp;trade; XML Graphics Commons: Image Loader Framework</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/commons/">Commons</a></div> -->
       	<div class="section-content"><h1 id="overview">Overview</h1>
-<p>Apache™ XML Graphics Commons contains a unified framework for loading and processing images (bitmap and vector). The package name is <code>org.apache.xmlgraphics.image.loader</code> . Key features:</p>
+<p>Apache&trade; XML Graphics Commons contains a unified framework for loading and processing images (bitmap and vector). The package name is <code>org.apache.xmlgraphics.image.loader</code> . Key features:</p>
 <ul>
 <li>
 <p>Unified basic API for all supported image types.</p>

Modified: websites/staging/xmlgraphics/trunk/content/commons/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/commons/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/commons/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ XML Graphics Commons</title>
+    <title>Apache&amp;trade; XML Graphics Commons</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>Apache™ XML Graphics Commons</h1> -->
+	</div><!-- <h1>Apache&amp;trade; XML Graphics Commons</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/commons/">Commons</a></div> -->
       	<div class="section-content"><h1 id="Overview">Overview</h1>
-<p>Apache™ XML Graphics Commons is a library that consists of several reusable components used by <a href="http://xmlgraphics.apache.org/batik/">Apache Batik</a> and <a href="http://xmlgraphics.apache.org/fop/">Apache FOP</a> . Many of these components can easily be used separately outside the domains of SVG and XSL-FO. You will find components such as a PDF library, an RTF library, Graphics2D implementations that let you generate PDF &amp; PostScript files, and much more.</p>
-<p>The Apache™ XML Graphics Commons project is part of the <a href="http://www.apache.org">Apache™</a> Software Foundation, which is a wider community of users and developers of open source projects.</p>
+<p>Apache&trade; XML Graphics Commons is a library that consists of several reusable components used by <a href="http://xmlgraphics.apache.org/batik/">Apache Batik</a> and <a href="http://xmlgraphics.apache.org/fop/">Apache FOP</a> . Many of these components can easily be used separately outside the domains of SVG and XSL-FO. You will find components such as a PDF library, an RTF library, Graphics2D implementations that let you generate PDF &amp; PostScript files, and much more.</p>
+<p>The Apache&trade; XML Graphics Commons project is part of the <a href="http://www.apache.org">Apache&trade;</a> Software Foundation, which is a wider community of users and developers of open source projects.</p>
 <p>In the Wiki, we have a <a href="http://wiki.apache.org/xmlgraphics/XmlGraphicsCommonComponents">Roadmap for Apache XML Graphics Commons</a> . This roadmap is the place to describe new ideas for the project.</p>
 <h1 id="features">Features</h1>
 <p>Components which have been ported from <a href="http://xmlgraphics.apache.org/batik/">Apache Batik</a> and <a href="http://xmlgraphics.apache.org/fop/">Apache FOP</a> include:</p>

Modified: websites/staging/xmlgraphics/trunk/content/commons/postscript.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/commons/postscript.html (original)
+++ websites/staging/xmlgraphics/trunk/content/commons/postscript.html Mon Oct 15 03:56:36 2012
@@ -129,7 +129,7 @@ $(document).ready(function () {
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/commons/">Commons</a></div> -->
       	<div class="section-content"><h1 id="overview">Overview</h1>
-<p>Apache™ XML Graphics Commons contains various tools for writing and processing Adobe PostScript files. This includes:</p>
+<p>Apache&trade; XML Graphics Commons contains various tools for writing and processing Adobe PostScript files. This includes:</p>
 <ul>
 <li>
 <p>A PostScript generator class which helps writing PostScript files from scratch.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/anttask.html 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/0.95/">0.95</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/0.95/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/compiling.html 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/0.95/">0.95</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 distributions are either pre-compiled binary or source. If you are using a binary distribution, it is already built and there is no need to build it again. See the <a href="../download.html">Download Instructions</a> for information about whether a binary or source distribution is best for your needs.</p>
+<p>Apache&trade; FOP distributions are either pre-compiled binary or source. If you are using a binary distribution, it is already built and there is no need to build it again. See the <a href="../download.html">Download Instructions</a> for information about whether a binary or source distribution is best for your needs.</p>
 <p>If you got the source code from a repository snapshot or via Subversion you will need to build FOP in any case.</p>
 <h1 id="env">Set Up Your Environment</h1>
 <h2 id="env-jdk">JDK</h2>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/configuration.html 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> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/embedding.html 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,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: Embedding</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Embedding</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/0.95/">0.95</a></div> -->
-      	<div class="section-content"><p><subtitle>How to Embed Apache™ FOP in a Java application</subtitle><version>$Revision: 1298724 $</version></p>
+      	<div class="section-content"><p><subtitle>How to Embed Apache&trade; 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. Renderer) to use and, if the selected renderer 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 Renderer instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.
+<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. Renderer) to use and, if the selected renderer 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 Renderer instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.
 We recently changed FOP's outer API to what we consider the final API. This might require some changes in your application. The main reasons for these changes were performance improvements due to better reuse of reusable objects and reduced use of static variables for added flexibility in complex environments.</p>
 <h1 id="basics">Basic Usage Pattern</h1>
 <p>Apache FOP relies heavily on JAXP. It uses SAX events exclusively to receive the XSL-FO input document. It is therefore a good idea that you know a few things about JAXP (which is a good skill anyway). Let's look at the basic usage pattern for FOP...</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/extensions.html 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,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>Standard Apache™ FOP Extensions</h1> -->
+	</div><!-- <h1>Standard Apache&amp;trade; FOP Extensions</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/fonts.html 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/0.95/graphics.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/graphics.html 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> -->
 
 
       
@@ -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/0.95/">0.95</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="introduction">Introduction</h1>
-<p>After the Apache™ FOP 0.94 release, the image handling subsystem has been rewritten in order to improve the range of supported images and image subtypes, to lower the overall memory consumption when handling images, to produce smaller output files and to increase the performance in certain areas. Of course, this causes a few changes most of which the user will probably not notice. The most important changes are:</p>
+<p>After the Apache&trade; FOP 0.94 release, the image handling subsystem has been rewritten in order to improve the range of supported images and image subtypes, to lower the overall memory consumption when handling images, to produce smaller output files and to increase the performance in certain areas. Of course, this causes a few changes most of which the user will probably not notice. The most important changes are:</p>
 <ul>
 <li>
 <p>The image libraries Jimi and JAI are no longer supported. Instead, Apache FOP uses the Image I/O API that was introduced with Java 1.4 for all bitmap codecs.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/hyphenation.html 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,7 +332,7 @@ $(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 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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Version 0.95</title>
+    <title>Apache&amp;trade; FOP Version 0.95</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 Version 0.95</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Version 0.95</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/0.95/">0.95</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>The Apache™ FOP team is proud to present to you this production quality release. 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>
+<p>The Apache&trade; FOP team is proud to present to you this production quality release. 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>
 <p>This sixth release contains many bug fix release and new features compared to 0.94. To see what has changed since the last release, please visit the <a href="changes_0.95.html">Changes Page</a> and the <a href="releaseNotes_0.95.html">Release Notes</a> .</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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/intermediate.html 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,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: Intermediate Format</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Intermediate Format</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/0.95/">0.95</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version>
-Please note that the intermediate format is an <strong>advanced feature</strong> and can be ignored by most users of Apache™ FOP.</p>
+Please note that the intermediate format is an <strong>advanced feature</strong> and can be ignored by most users of Apache&trade; FOP.</p>
 <h1 id="introduction">Introduction</h1>
 <p>The intermediate format (IF) is a proprietary XML format that represents the area tree 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> . The IF can be generated through the area tree XML Renderer (the XMLRenderer).</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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/knownissues_overview.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Known Issues</title>
+    <title>Apache&amp;trade; FOP: Known Issues</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: Known Issues</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Known Issues</h1> -->
 
 
       
@@ -332,7 +332,7 @@ $(document).ready(function () {
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="known-issues-knownissues">Known issues # {#Known+issues}</h1>
 <p>This page lists currently known issues in the current release.</p>
-<p>For additional information on known issues in Apache™ FOP, please have a look at the following pages, too:</p>
+<p>For additional information on known issues in Apache&trade; FOP, please have a look at the following pages, too:</p>
 <ul>
 <li>
 <p><a href="../bugs.html">the bug list in Bugzilla</a> </p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/metadata.html 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/0.95/output.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/output.html 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/0.95/">0.95</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</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/0.95/pdfa.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfa.html 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/0.95/pdfencryption.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfencryption.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/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/0.95/">0.95</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/0.95/pdfx.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/pdfx.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/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/0.95/running.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/running.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/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/0.95/servlets.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/servlets.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/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,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: Servlets</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Servlets</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/0.95/">0.95</a></div> -->
       	<div class="section-content"><p><subtitle>How to use Apache� 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/0.95/upgrading.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/0.95/upgrading.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/0.95/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/0.95/">0.95</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>More than half of the codebase has been rewritten over the last four years. With version 0.93 the code has reached <strong>production level</strong> , and continues to improve with version 0.94 and 0.95.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/accessibility.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/accessibility.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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-enablingaccessibility">Enabling accessibility # {#Enabling+accessibility}</h1>
 <p>There are 3 ways to enable accessibility:</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/anttask.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/anttask.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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 distributions are either pre-compiled binary or source. If you are using a binary distribution, it is already built and there is no need to build it again. See the <a href="../download.html">Download Instructions</a> for information about whether a binary or source distribution is best for your needs.</p>
+<p>Apache&trade; FOP distributions are either pre-compiled binary or source. If you are using a binary distribution, it is already built and there is no need to build it again. See the <a href="../download.html">Download Instructions</a> for information about whether a binary or source distribution is best for your needs.</p>
 <p>If you got the source code from a repository snapshot or via Subversion you will need to build FOP in any case.</p>
 <h1 id="env">Set Up Your Environment</h1>
 <h2 id="env-jdk">JDK</h2>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/configuration.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/configuration.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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> -->
 
 
       
@@ -332,7 +332,7 @@ $(document).ready(function () {
       	<div class="section-content"><p><subtitle>How to Embed Apache� FOP in a Java application</subtitle><version>$Revision: 1298724 $</version></p>
 <h1 id="overview">Overview</h1>
 <p>Review <a href="running.html">Running 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. Renderer) to use and, if the selected renderer 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 Renderer instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.
+<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. Renderer) to use and, if the selected renderer 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 Renderer instance (details below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and use that as the SAXResult of your transformation.
 We recently changed FOP's outer API to what we consider the final API. This might require some changes in your application. The main reasons for these changes were performance improvements due to better reuse of reusable objects and reduced use of static variables for added flexibility in complex environments.</p>
 <h1 id="basics">Basic Usage Pattern</h1>
 <p>Apache FOP relies heavily on JAXP. It uses SAX events exclusively to receive the XSL-FO input document. It is therefore a good idea that you know a few things about JAXP (which is a good skill anyway). Let's look at the basic usage pattern for FOP...</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/events.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/events.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/graphics.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/graphics.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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,7 +332,7 @@ $(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 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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Version 1.0</title>
+    <title>Apache&amp;trade; FOP Version 1.0</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 Version 1.0</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Version 1.0</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/1.0/">1.0</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>The Apache™ FOP team is proud to present to you this production quality codebase. FOP 1.0 provides a good subset of the W3C XSL-FO 1.0 and 1.1 Standards. Its stable, 1.0 designation provides added recognition as the productive tool it has been for years.</p>
+<p>The Apache&trade; FOP team is proud to present to you this production quality codebase. FOP 1.0 provides a good subset of the W3C XSL-FO 1.0 and 1.1 Standards. Its stable, 1.0 designation provides added recognition as the productive tool it has been for years.</p>
 <p>We remain committed to improving the tool, and we continue to add new features. We welcome any feedback you might have and even more, any other form of help to get the project forward.</p>
 <p>This release contains many bug fixes and new features compared to the previous version. To see what has changed since the last release, please visit the <a href="changes_1.0.html">Changes Page</a> and the <a href="releaseNotes_1.0.html">Release Notes</a> .</p>
 <p>This release implements a good subset of the W3C XSL-FO 1.0 and 1.1 Standards. For a detailed overview of FOP's compliance, visit the <a href="../compliance.html">compliance page</a> .</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/intermediate.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/intermediate.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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,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: Intermediate Format</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Intermediate Format</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/1.0/">1.0</a></div> -->
       	<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>
+Please note that the intermediate formats described here are <strong>advanced features</strong> and can be ignored by most users of Apache&trade; 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>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>



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


Mime
View raw message