xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r835093 [2/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/1.0/knownissues_overview.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/knownissues_overview.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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>
@@ -341,7 +341,7 @@ $(document).ready(function () {
 <p><a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks">the task list in the Wiki</a> </p>
 </li>
 </ul>
-<p>Apache™ FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit tests during the normal build process. This indicates a problem in the current codebase. When a bug is fixed or a missing feature is added the entry for the relevant test case(s) are removed.</p>
+<p>Apache&trade; FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit tests during the normal build process. This indicates a problem in the current codebase. When a bug is fixed or a missing feature is added the entry for the relevant test case(s) are removed.</p>
 <h2 id="fo-tree-fotree">FO Tree ## {#FO+Tree}</h2>
 <p>This section lists disabled test cases in the test suite for the FO tree tests, at the time of the release.</p>
 <p><strong>demo-test-failure.fo</strong> (demo test failure):<br></br> <em>TODO: Add missing description in disabled-testcases.xml!</em> </p>

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

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/output.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/output.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/pdfa.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfa.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/pdfencryption.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfencryption.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/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/1.0/">1.0</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/1.0/pdfx.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/pdfx.html 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> -->
 
 
       
@@ -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><authors><person email="jeremias@apache.org" name="Jeremias Märki"></person></authors></p>
 <h1 id="overview">Overview</h1>
-<p><warning>Support for PDF/X is available beginning with Apache™ FOP version 0.93. This feature is new and may not be 100% complete, yet. Feedback is welcome.</warning>
+<p><warning>Support for PDF/X is available beginning with Apache&trade; FOP version 0.93. This feature is new and may not be 100% complete, yet. Feedback is welcome.</warning>
 PDF/X is a standard which faciliates prepress digital data exchange using PDF. Currently, only PDF/X-3:2003 is implemented out of the many different flavours of PDF/X profiles. PDF/X-3:2003 is documented in <a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=39940&amp;ICS1=37&amp;ICS2=100&amp;ICS3=99">ISO 15930-6:2003(E)</a> . More info on PDF/X can be found on the <a href="http://www.pdfx.info/">PDF/X info site</a> .</p>
 <h1 id="status">Implementation Status</h1>
 <p><strong>PDF/X-3:2003</strong> is implemented to the degree that FOP supports the creation of the elements described in ISO 15930-6.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/running.html 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/1.0/servlets.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/servlets.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/servlets.html 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/1.0/">1.0</a></div> -->
-      	<div class="section-content"><p><subtitle>How to use Apache™ FOP in a Servlet</subtitle><version>$Revision: 1298724 $</version></p>
+      	<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/1.0/upgrading.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.0/upgrading.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.0/upgrading.html 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/1.0/">1.0</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 three years. With version 0.93 the code has reached <strong>production level</strong> , and continues to improve with version 0.94.</p>

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

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/conventions.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Coding Conventions</title>
+    <title>Apache&amp;trade; FOP Development: Coding Conventions</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 Development: Coding Conventions</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Coding Conventions</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
-<p>Acknowledgement: Some content in this guide was adapted from other Apache™ projects such as Avalon, Cactus, Turbine and Velocity.</p>
+<p>Acknowledgement: Some content in this guide was adapted from other Apache&trade; projects such as Avalon, Cactus, Turbine and Velocity.</p>
 <h1 id="svn">Subversion Repository</h1>
 <p>Conventions in this section apply to Repository content, regardless of type:</p>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/areas.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Area Tree</title>
+    <title>Apache&amp;trade; FOP Design: Area Tree</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 Design: Area Tree</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Area Tree</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/breakpos.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Layout Managers</title>
+    <title>Apache&amp;trade; FOP Design: Layout Managers</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 Design: Layout Managers</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Layout Managers</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/embedding.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Embedding Apache� FOP in Other Applications</title>
+    <title>Apache&amp;trade; FOP Design: Embedding Apache� FOP in Other Applications</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 Design: Embedding Apache� FOP in Other Applications</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Embedding Apache� FOP in Other Applications</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
 <h1 id="intro">Introduction</h1>
-<p>This is the design for the external interface when Apache™ FOP is to be embedded inside another java application.</p>
+<p>This is the design for the external interface when Apache&trade; FOP is to be embedded inside another java application.</p>
 <p>Common places where FOP is embedded is in a report production application of a server side application such as<jump href="http://xml.apache.org/cocoon/index.html">Cocoon</jump>.</p>
 <h1 id="Settings">Settings</h1>
 <h2 id="user-agent-useragent">User Agent ## {#User+Agent}</h2>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/extending.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Extensions</title>
+    <title>Apache&amp;trade; FOP Design: 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>Apache™ FOP Design: Extensions</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Extensions</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
 <h1 id="intro">Introduction</h1>
-<p>Apache™ FOP provides an extension mechanism to add extra functionality. There are a number of different types of extensions that apply to different steps when converting FO into the rendered output.</p>
+<p>Apache&trade; FOP provides an extension mechanism to add extra functionality. There are a number of different types of extensions that apply to different steps when converting FO into the rendered output.</p>
 <h1 id="Extensions">Extensions</h1>
 <p>SVG Graphic - This applies to svg and any other xml document that can be converted into svg in the output. All that is required is the element mapping for the xml and a converter that changes the document into svg. This conversion is done in the FO Tree. The conversion is done by the top level element of the namespace or in the case of an external image a Converter.</p>
 <p>XML Document - Instead of converting the document into svg it can be passed directly to the renderer. The renderer will need to have a handler for the xml document. This handler can add information directly to the output document.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/fotree.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: FO Tree</title>
+    <title>Apache&amp;trade; FOP Design: FO Tree</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 Design: FO Tree</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: FO Tree</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/images.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Images</title>
+    <title>Apache&amp;trade; FOP Design: Images</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 Design: Images</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Images</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Introduction</title>
+    <title>Apache&amp;trade; FOP Design: Introduction</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 Design: Introduction</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Introduction</h1> -->
 
 
       
@@ -332,7 +332,7 @@ $(document).ready(function () {
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors>
 The articles in this section pertain mainly to the <em>redesign</em> or <em>trunk</em> line of development. The redesign is mainly focusing on parts of the layout process (converting the FO tree into the Area Tree). Therefore other (non-layout) sections in this document are probably largely accurate for the maintenance branch, but should be used with care in that context.</p>
 <h1 id="black-box">The Black Box View</h1>
-<p>From a user's standpoint, Apache™ FOP is a black box that an xml file as input, performs some magic, then creates the desired output:</p>
+<p>From a user's standpoint, Apache&trade; FOP is a black box that an xml file as input, performs some magic, then creates the desired output:</p>
 <table>
 <thead>
 <tr>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/layout.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Layout</title>
+    <title>Apache&amp;trade; FOP Design: Layout</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 Design: Layout</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Layout</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/optimise.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Optimisations</title>
+    <title>Apache&amp;trade; FOP Design: Optimisations</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 Design: Optimisations</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Optimisations</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
 <h1 id="intro">Introduction</h1>
-<p>Apache™ FOP should be able to handle very large documents. A document can be supplied using SAX and the information should be passed entirely through the system, from fo elements to rendered output as soon as possible.</p>
+<p>Apache&trade; FOP should be able to handle very large documents. A document can be supplied using SAX and the information should be passed entirely through the system, from fo elements to rendered output as soon as possible.</p>
 <p>A top level block area, immediately below the flow, can be added to the page layout as soon as the element is complete.</p>
 <p>The fo elements used to construct a page can be discarded as soon as the layout for the page is complete. Some information may be stored in the area tree of the page in order to handle unresolved page references and links.</p>
 <p>Once the layout of a page has been completed, all elements are fully resolved, then the page can be rendered. Some renderers may support out of order rendering of pages.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/parsing.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Input Parsing</title>
+    <title>Apache&amp;trade; FOP Design: Input Parsing</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 Design: Input Parsing</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Input Parsing</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>Parsing is the process of reading the XSL-FO input and making the information in it available to Apache™ FOP.</p>
+<p>Parsing is the process of reading the XSL-FO input and making the information in it available to Apache&trade; FOP.</p>
 <h1 id="input">SAX for Input</h1>
 <p>The two standard ways of dealing with XML input are SAX and DOM. SAX basically creates events as it parses an XML document in a serial fashion; a program using SAX (and not storing anything internally) will only see a small window of the document at any point in time, and can never look forward in the document. DOM creates and stores a tree representation of the document, allowing a view of the entire document as an integrated whole. One issue that may seem counter-intuitive to some new FOP developers, and which has from time to time been contentious, is that FOP uses SAX for input. (DOM can be used as input as well, but it is converted into SAX events before entering FOP, effectively negating its advantages).</p>
 <p>Since FOP essentially needs a tree representation of the FO input, at first glance it seems to make sense to use DOM. Instead, FOP takes SAX events and builds its own tree-like structure. Why?</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/pdf-library.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: PDF Library</title>
+    <title>Apache&amp;trade; FOP Design: PDF Library</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 Design: PDF Library</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: PDF Library</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>The PDF Library is an independant package of classes in Apache™ FOP. These class provide a simple way to construct documents and add the contents. The classes are found in <code>org.apache.fop.pdf.*</code> .</p>
+<p>The PDF Library is an independant package of classes in Apache&trade; FOP. These class provide a simple way to construct documents and add the contents. The classes are found in <code>org.apache.fop.pdf.*</code> .</p>
 <h1 id="pdf-document-pdfdocument">PDF Document # {#PDF+Document}</h1>
 <p>This is where most of the document is created and put together.</p>
 <p>It sets up the header, trailer and resources. Each page is made and added to the document. There are a number of methods that can be used to create/add certain PDF objects to the document.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/renderers.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Renderers</title>
+    <title>Apache&amp;trade; FOP Design: Renderers</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 Design: Renderers</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Renderers</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/startup.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: Startup, Environment, Control</title>
+    <title>Apache&amp;trade; FOP Design: Startup, Environment, Control</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 Design: Startup, Environment, Control</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: Startup, Environment, Control</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>Startup is the process of getting Apache™ FOP bootstrapped and creating basic objects. Environment includes acquiring user options, instantiating any frameworks, setting up logging, etc. Control includes the basic logic for tieing the various subsystems together properly.</p>
+<p>Startup is the process of getting Apache&trade; FOP bootstrapped and creating basic objects. Environment includes acquiring user options, instantiating any frameworks, setting up logging, etc. Control includes the basic logic for tieing the various subsystems together properly.</p>
 <h1 id="status">Status</h1>
 <h2 id="status-todo">To Do</h2>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/svg.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: SVG</title>
+    <title>Apache&amp;trade; FOP Design: SVG</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 Design: SVG</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: SVG</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>SVG is rendered through Apache™ Batik.</p>
+<p>SVG is rendered through Apache&trade; Batik.</p>
 <p>The XML from the XSL:FO document is converted into an SVG DOM with batik. This DOM is then set as the Document on the Foreign Object area in the Area Tree.</p>
 <p>This DOM is then available to be rendered by the renderer.</p>
 <p>SVG is rendered in the renderers via an XMLHandler in the FOUserAgent. This XML handler is used to render the SVG. The SVG is rendered by using batik. Batik converts the SVG DOM into an internal structure that can be drawn into a Graphics2D. So for PDF we use a PDFGraphics2D to draw into.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/design/useragent.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Design: User Agent</title>
+    <title>Apache&amp;trade; FOP Design: User Agent</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 Design: User Agent</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Design: User Agent</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/dev/">Dev</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/design/">Design</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person></authors></p>
 <h1 id="intro">Introduction</h1>
-<p>Technically the user agent is Apache™ FOP in the role of determining the output format and when resolving various attributes. The user agent is represented by a class that is available to others to specify how FOP should behave.</p>
+<p>Technically the user agent is Apache&trade; FOP in the role of determining the output format and when resolving various attributes. The user agent is represented by a class that is available to others to specify how FOP should behave.</p>
 <p>The user agent is used by the formatting process to determine certain user definable values.</p>
 <p>It will enable the customisation of values for generating and rendering the document.</p>
 <p>The user agent must be available to the layout processor and the renderer. Users can supply their own user agent or use the default one for a particular renderer.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/doc.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Managing Documentation</title>
+    <title>Apache&amp;trade; FOP Development: Managing Documentation</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: Managing Documentation</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Managing Documentation</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="general">General Information</h1>
-<p>All raw documentation content is managed in the Apache™ FOP SVN repository. Updates should be committed to the repository, then the repository files are used to generate usable output. The remaining discussions on this page assume that the SVN repository is the starting place for processing. The path to the documentation is src/documentation/content/xdocs.
+<p>All raw documentation content is managed in the Apache&trade; FOP SVN repository. Updates should be committed to the repository, then the repository files are used to generate usable output. The remaining discussions on this page assume that the SVN repository is the starting place for processing. The path to the documentation is src/documentation/content/xdocs.
 All documentation is maintained on the trunk.
 Basic documents are stored in XML files, and use DTDs provided by Apache Forrest.</p>
 <h1 id="design">Design Principles</h1>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/extensions.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Adding an Extension</title>
+    <title>Apache&amp;trade; FOP Development: Adding an Extension</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: Adding an Extension</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Adding an Extension</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="overview">Overview</h1>
-<p>For documentation of standard Apache™ FOP extensions, see the <a href="../trunk/extensions.html">User FOP Extensions</a> document.</p>
+<p>For documentation of standard Apache&trade; FOP extensions, see the <a href="../trunk/extensions.html">User FOP Extensions</a> document.</p>
 <p>If the default funtionality of FOP needs to be extended for some reason then you can write an extension.</p>
 <p>There are three types of extensions possible:</p>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/implement.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Implementation Overview</title>
+    <title>Apache&amp;trade; FOP Development: Implementation Overview</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 Development: Implementation Overview</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Implementation Overview</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/">Dev</a></div> -->
       	<div class="section-content"><p><subtitle>Following a Document Through Apache� FOP</subtitle><version>$Revision: 1298724 $</version><authors><person email="" name="Arved Sandstrom"></person></authors></p>
-<p>The purpose of this document is to tie together the Apache™ FOP design (interface) with some of the key points where control is passed within FOP (implementation), so that developers can quickly find the section of code that is relevant to their needs. The process described is for a "typical" command-line document. All classes are in org.apache.fop unless otherwise designated.</p>
+<p>The purpose of this document is to tie together the Apache&trade; FOP design (interface) with some of the key points where control is passed within FOP (implementation), so that developers can quickly find the section of code that is relevant to their needs. The process described is for a "typical" command-line document. All classes are in org.apache.fop unless otherwise designated.</p>
 <h1 id="Overview">Overview</h1>
 <p>The input FO document is sent to the FO tree builder via SAX events. Fragments of an FO Tree are built from this process. As each page-sequence element is completed, it is passed to a layout processor, which in turn converts it into an Area Tree. The Area Tree is then given to the Renderer, which converts it into a stream of data containing the output document. The sections below will provide additional details. Where needed differences between the trunk and maintenance branches are shown in tabular format.</p>
 <h1 id="Startup">Startup</h1>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: General Information</title>
+    <title>Apache&amp;trade; FOP Development: General Information</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: General Information</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: General Information</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>These pages contain information that should be helpful for those developing Apache™ FOP. This certainly includes programmers, but may also include those contributing to the project in other ways.</p>
-<p>For basic and user information on FOP, please visit the <a href="http://xml.apache.org/fop">Apache™ FOP homepage</a> .</p>
+<p>These pages contain information that should be helpful for those developing Apache&trade; FOP. This certainly includes programmers, but may also include those contributing to the project in other ways.</p>
+<p>For basic and user information on FOP, please visit the <a href="http://xml.apache.org/fop">Apache&trade; FOP homepage</a> .</p>
 <h1 id="lines">Development</h1>
 <p>The main development happens on "FOP Trunk".
 The SVN repository URL for the trunk is:<br></br> <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code> </p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/release.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/release.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/release.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Release Mechanics</title>
+    <title>Apache&amp;trade; FOP Development: Release Mechanics</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: Release Mechanics</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Release Mechanics</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1310603 $</version></p>
 <h1 id="intro">Introduction</h1>
-<p>This page documents the process of creating a Apache™ FOP release. FOP releases are coordinated by some designated member of the team. The purpose of documenting it here is to facilitate consistency, ensure that the process is captured, and to allow others to comment on the process.</p>
+<p>This page documents the process of creating a Apache&trade; FOP release. FOP releases are coordinated by some designated member of the team. The purpose of documenting it here is to facilitate consistency, ensure that the process is captured, and to allow others to comment on the process.</p>
 <p>The checklist below is based on a combination of input from from Christian Geisert and Simon Pepping.</p>
 <h1 id="checklist">Checklist</h1>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/rtflib.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: RTFLib (jfor)</title>
+    <title>Apache&amp;trade; FOP Development: RTFLib (jfor)</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: RTFLib (jfor)</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: RTFLib (jfor)</h1> -->
 
 
       
@@ -335,7 +335,7 @@ $(document).ready(function () {
 <p>The RTFLib package is an open-source, <em>independent</em> package suitable for writing RTF files in a java environment. By <em>independent</em> we mean:</p>
 <ul>
 <li>
-<p>Although it is used by Apache™ FOP to generate FOP's RTF output, it is not dependent on FOP for any of its functionality.</p>
+<p>Although it is used by Apache&trade; FOP to generate FOP's RTF output, it is not dependent on FOP for any of its functionality.</p>
 </li>
 <li>
 <p>It does not require FOP as a front-end, nor does it even require XSL-FO for input. It essentially exposes an API of relatively high-level RTF construction routines to a host program. This means it can be used anywhere RTF output is required and java is available.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/svg.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: SVG Issues</title>
+    <title>Apache&amp;trade; FOP Development: SVG 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 Development: SVG Issues</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: SVG Issues</h1> -->
 
 
       

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/testing.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Testing</title>
+    <title>Apache&amp;trade; FOP Development: Testing</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: Testing</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Testing</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/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
 <h1 id="build">"Build" Testing</h1>
-<p>Apache™ projects use an automated build tool called "gump" to create nightly builds from the SVN repository. Gump sends "nag" messages if the build fails. This can be considered a sort of basic test of the build process. To view the most recent logs of the gump builds:</p>
+<p>Apache&trade; projects use an automated build tool called "gump" to create nightly builds from the SVN repository. Gump sends "nag" messages if the build fails. This can be considered a sort of basic test of the build process. To view the most recent logs of the gump builds:</p>
 <ul>
 <li>
 <p><a href="http://gump.cocoondev.org/xml-fop.html">Gump build for the Trunk</a> </p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/dev/tools.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Development: Developer Tools</title>
+    <title>Apache&amp;trade; FOP Development: Developer Tools</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 Development: Developer Tools</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Development: Developer Tools</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/dev/">Dev</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
-<p>This page documents items that may be helpful to other developers, especially to those who are new to Apache™ FOP. Exhaustive treatment of these topics is better suited to other fora, but the information presented here is intended to deal with FOP-specific issues related to these tools, especially "gotchas", and to help developers get jump-started.</p>
+<p>This page documents items that may be helpful to other developers, especially to those who are new to Apache&trade; FOP. Exhaustive treatment of these topics is better suited to other fora, but the information presented here is intended to deal with FOP-specific issues related to these tools, especially "gotchas", and to help developers get jump-started.</p>
 <h1 id="checklist">Developer Checklist</h1>
 <p>Here is a (probably not comprehensive) list of tools you will need to be a successful FOP developer:</p>
 <ul>

Modified: websites/staging/xmlgraphics/trunk/content/fop/download.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/download.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/download.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Downloading A Distribution</title>
+    <title>Apache&amp;trade; FOP: Downloading A Distribution</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: Downloading A Distribution</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Downloading A Distribution</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="dist-type">Binary or Source?</h1>
-<p>Most Apache™ FOP users will want to download the latest binary distribution, which is ready to run "out of the box." However, a source distribution will be preferable if you fall into one of the following categories:</p>
+<p>Most Apache&trade; FOP users will want to download the latest binary distribution, which is ready to run "out of the box." However, a source distribution will be preferable if you fall into one of the following categories:</p>
 <ul>
 <li>
 <p>You wish to modify FOP.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/examples.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/examples.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/examples.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP Examples</title>
+    <title>Apache&amp;trade; FOP Examples</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 Examples</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP Examples</h1> -->
 
 
       
       <div id="content" class="grid_16">
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a></div> -->
       	<div class="section-content"><p><version>$Revision: 1298724 $</version></p>
-<h1 id="example-documents-using-apachetm-fop-exampledocumentsusingapachee284a2fop">Example Documents Using Apache™ FOP # {#Example+Documents+Using+Apache%E2%84%A2+FOP}</h1>
-<p>These examples have been rendered using Apache™ FOP:</p>
+<h1 id="example-documents-using-apachewzxhzdk2-fop-exampledocumentsusingapachee284a2fop">Example Documents Using Apache&trade; FOP # {#Example+Documents+Using+Apache%E2%84%A2+FOP}</h1>
+<p>These examples have been rendered using Apache&trade; FOP:</p>
 <table>
 <thead>
 <tr>

Modified: websites/staging/xmlgraphics/trunk/content/fop/faq.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/faq.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/faq.html Mon Oct 15 03:56:36 2012
@@ -330,8 +330,8 @@ $(document).ready(function () {
       <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"><h1 id="Questions">Questions</h1>
-<h2 id="part-general">1. Apache™ FOP: General questions</h2>
-<h3 id="fop-general">1.1. What is Apache™ FOP?</h3>
+<h2 id="part-general">1. Apache&trade; FOP: General questions</h2>
+<h3 id="fop-general">1.1. What is Apache&trade; FOP?</h3>
 <p>FOP is a print formatter for <a href="#XSLFO">XSL formatting objects</a> .</p>
 <p>It can be used to render an XML file containing XSL formatting objects into a page layout. The main target is PDF but other rendering targets are supported, such as AWT, PCL, text and direct printing.</p>
 <h3 id="fop-functions">1.2. What can I do with FOP?</h3>

Modified: websites/staging/xmlgraphics/trunk/content/fop/fo.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/fo.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/fo.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: XSL-FO Input</title>
+    <title>Apache&amp;trade; FOP: XSL-FO Input</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: XSL-FO Input</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: XSL-FO Input</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><subtitle>Basic Help for Using XML, XSLT, and XSL-FO</subtitle><version>$Revision: 1298724 $</version></p>
 <h1 id="overview">Overview</h1>
-<p>Apache™ FOP uses XSL-FO as input. It is the responsibility of the user to make sure that the XSL-FO submitted to FOP is correct. The tutorial items presented here are not comprehensive, but are of the FAQ variety. Another good FAQ is<fork href="http://www.dpawson.co.uk/xsl/">Dave Pawson's XSL FAQ</fork>.</p>
+<p>Apache&trade; FOP uses XSL-FO as input. It is the responsibility of the user to make sure that the XSL-FO submitted to FOP is correct. The tutorial items presented here are not comprehensive, but are of the FAQ variety. Another good FAQ is<fork href="http://www.dpawson.co.uk/xsl/">Dave Pawson's XSL FAQ</fork>.</p>
 <h1 id="xml">XML Issues</h1>
 <h2 id="xml-special-chars">Special Characters</h2>
 <p>When entering special (non-ASCII) characters in XML, the general rule is to use the applicable Unicode character instead of trying to use a character entity as you would with HTML. Remember that HTML is an SGML document type. SGML has a limited character set, which requires it to use character entities to represent special characters. One of the improvements of XML over SGML (and thus HTML) is native support for Unicode. Basic XML has only a handful of character entities, primarily because it doesn't really need more.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/gethelp.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/gethelp.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/gethelp.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP: Getting Help</title>
+    <title>Apache&amp;trade; FOP: Getting Help</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: Getting Help</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP: Getting Help</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>Checklist for Finding Appropriate Resources</subtitle><version>$Revision: 1298724 $</version></p>
-<p>The Apache™ FOP developer community is eager to help you maximize the usefulness of FOP. However, to make wise use of its limited resources, support must be primarily self-service. Go through the following checklist sequentially to determine what kind of help you need, and where to get it:</p>
+<p>The Apache&trade; FOP developer community is eager to help you maximize the usefulness of FOP. However, to make wise use of its limited resources, support must be primarily self-service. Go through the following checklist sequentially to determine what kind of help you need, and where to get it:</p>
 <h1 id="underlying">Understand Underlying Technologies</h1>
 <p>If you have a questions about XML, XSLT, or XSL-FO that are not directly related to FOP, please consult resources that are appropriate for those questions. FOP is an implementation of these technologies, and when you use FOP, there is a presumption that you have a working understanding of them. We have included several useful links on our <a href="resources.html">Resources</a> page that may help you get started.</p>
 <h1 id="limitations">Understand FOP's Limitations</h1>

Modified: websites/staging/xmlgraphics/trunk/content/fop/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/index.html Mon Oct 15 03:56:36 2012
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <title>Apache™ FOP</title>
+    <title>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>Apache™ FOP</h1> -->
+	</div><!-- <h1>Apache&amp;trade; FOP</h1> -->
 
 
       
@@ -331,8 +331,8 @@ $(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="intro">Introduction</h1>
-<p>Apache™ FOP (Formatting Objects Processor) is a print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. <a href="1.0/output.html">Output formats</a> currently supported include PDF, PS, PCL, AFP, XML (area tree representation), Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary output target is PDF.</p>
-<p>The Apache™ FOP 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>Apache&trade; FOP (Formatting Objects Processor) is a print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter. It is a Java application that reads a formatting object (FO) tree and renders the resulting pages to a specified output. <a href="1.0/output.html">Output formats</a> currently supported include PDF, PS, PCL, AFP, XML (area tree representation), Print, AWT and PNG, and to a lesser extent, RTF and TXT. The primary output target is PDF.</p>
+<p>The Apache&trade; FOP 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.
 <figure alt="Render Diagram" height="260" src="images/document.jpg" width="480"></figure>
 A stable release of the latest version of FOP ( <a href="1.0/">1.0</a> ) is available. It's the third stable release after the large redesign effort and implements a large subset of the <a href="http://www.w3.org/TR/xsl11/">XSL-FO Version 1.1 W3C Recommendation</a> .</p>
 <p>Support for each of the standard's objects and properties is detailed in <a href="compliance.html">FOP Compliance</a> . <a href="download.html">Download</a> options include a precompiled version, source code, and many example files to get you started. <a href="resources.html">Resources</a> include links to XSL-FO introductions and many other useful references. A checklist for <a href="gethelp.html">Getting Help</a> will guide you toward maximizing the usefulness of FOP.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/knownissues.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/knownissues.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/knownissues.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> -->
 
 
       
@@ -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="known-issues-knownissues">Known issues # {#Known+issues}</h1>
-<p>This page lists currently known issues in the Apache™ FOP codebase. Please note that this list is generated from data in FOP's code repository (Trunk) and may not exactly represent the list of issues in the latest release.</p>
+<p>This page lists currently known issues in the Apache&trade; FOP codebase. Please note that this list is generated from data in FOP's code repository (Trunk) and may not exactly represent the list of issues in the latest release.</p>
 <p>For additional information on known issues in Apache FOP, please have a look at the following pages, too:</p>
 <ul>
 <li>
@@ -341,7 +341,7 @@ $(document).ready(function () {
 <p><a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectTasks">the task list in the Wiki</a> </p>
 </li>
 </ul>
-<p>Apache™ FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit tests during the normal build process. This indicates a problem in the current codebase. When a bug is fixed or a missing feature is added the entry for the relevant test case(s) are removed.</p>
+<p>Apache&trade; FOP has an extensive automated testing infrastructure. Parts of this infrastructure are several sets of test cases. When a test case is listed in disabled-testcases.xml it is disabled in the JUnit tests during the normal build process. This indicates a problem in the current codebase. When a bug is fixed or a missing feature is added the entry for the relevant test case(s) are removed.</p>
 <h2 id="fo-tree-fotree">FO Tree ## {#FO+Tree}</h2>
 <p>This section lists currently disabled test cases in the test suite for the FO tree tests. The data for this section comes from <a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/test/fotree/disabled-testcases.xml">test/fotree/disabled-testcases.xml</a> .</p>
 <p><strong>demo-test-failure.fo</strong> (demo test failure):<br></br> <em>TODO: Add missing description in disabled-testcases.xml!</em> </p>



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


Mime
View raw message