Merge from ^/branches/fop-1_1.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1400707 13f79535-47bb-0310-9956-ffa450edef68

38 files changed, 70 insertions, 92 deletions

diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess
index 0edc84f75..062708b4a 100644
--- a/src/documentation/content/.htaccess
+++ b/src/documentation/content/.htaccess
@@ -1,34 +1,34 @@
 # redirect moved files
-RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/1.1rc1/anttask$1
-RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/1.1rc1/compiling$1
-RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/1.1rc1/configuration$1
-RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/1.1rc1/embedding$1
-RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/1.1rc1/extensions$1
-RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/1.1rc1/fonts$1
-RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/1.1rc1/graphics$1
-RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/1.1rc1/hyphenation$1
-RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/1.1rc1/intermediate$1
-RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/1.1rc1/output$1
-RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfa$1
-RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfencryption$1
-RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/1.1rc1/pdfx$1
-RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/1.1rc1/running$1
-RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/1.1rc1/servlets$1
-RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/1.1rc1/upgrading$1
+RedirectMatch Permanent ^/fop/anttask(.*) http://xmlgraphics.apache.org/fop/1.1/anttask$1
+RedirectMatch Permanent ^/fop/compiling(.*) http://xmlgraphics.apache.org/fop/1.1/compiling$1
+RedirectMatch Permanent ^/fop/configuration(.*) http://xmlgraphics.apache.org/fop/1.1/configuration$1
+RedirectMatch Permanent ^/fop/embedding(.*) http://xmlgraphics.apache.org/fop/1.1/embedding$1
+RedirectMatch Permanent ^/fop/extensions(.*) http://xmlgraphics.apache.org/fop/1.1/extensions$1
+RedirectMatch Permanent ^/fop/fonts(.*) http://xmlgraphics.apache.org/fop/1.1/fonts$1
+RedirectMatch Permanent ^/fop/graphics(.*) http://xmlgraphics.apache.org/fop/1.1/graphics$1
+RedirectMatch Permanent ^/fop/hyphenation(.*) http://xmlgraphics.apache.org/fop/1.1/hyphenation$1
+RedirectMatch Permanent ^/fop/intermediate(.*) http://xmlgraphics.apache.org/fop/1.1/intermediate$1
+RedirectMatch Permanent ^/fop/output(.*) http://xmlgraphics.apache.org/fop/1.1/output$1
+RedirectMatch Permanent ^/fop/pdfa(.*) http://xmlgraphics.apache.org/fop/1.1/pdfa$1
+RedirectMatch Permanent ^/fop/pdfencryption(.*) http://xmlgraphics.apache.org/fop/1.1/pdfencryption$1
+RedirectMatch Permanent ^/fop/pdfx(.*) http://xmlgraphics.apache.org/fop/1.1/pdfx$1
+RedirectMatch Permanent ^/fop/running(.*) http://xmlgraphics.apache.org/fop/1.1/running$1
+RedirectMatch Permanent ^/fop/servlets(.*) http://xmlgraphics.apache.org/fop/1.1/servlets$1
+RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/1.1/upgrading$1
 
 # redirect to versioned documentation
 # Current stable release
-Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.1
 
 # Current unstable release (or trunk if no beta is the latest release)
-Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/1.1rc1
+Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
 
 # Latest release
-Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0
-Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.1
+Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.1
 
 # Previous stable release
-Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.95
+Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/1.0
 
 # Old releases
 Redirect Temp /fop/maintenance http://xmlgraphics.apache.org/fop/0.95
diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf
index 7ce3d6d58..a55870a74 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -75,14 +75,14 @@
     </asfext:implements>
     <release>
       <Version>
-        <name>Upcoming release (candidate)</name>
-        <created>2012-07-02</created>
-        <revision>1.1rc1</revision>
+        <name>Current release (stable)</name>
+        <created>2012-10-20</created>
+        <revision>1.1</revision>
       </Version>
     </release>
     <release>
       <Version>
-        <name>Current release (stable)</name>
+        <name>Previous release (stable)</name>
         <created>2010-07-21</created>
         <revision>1.0</revision>
       </Version>
diff --git a/src/documentation/content/xdocs/1.1rc1/accessibility.xml b/src/documentation/content/xdocs/1.1/accessibility.xml
index 412519d8b..412519d8b 100644
--- a/src/documentation/content/xdocs/1.1rc1/accessibility.xml
+++ b/src/documentation/content/xdocs/1.1/accessibility.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/anttask.xml b/src/documentation/content/xdocs/1.1/anttask.xml
index ba53fe7d1..ba53fe7d1 100644
--- a/src/documentation/content/xdocs/1.1rc1/anttask.xml
+++ b/src/documentation/content/xdocs/1.1/anttask.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/compiling.xml b/src/documentation/content/xdocs/1.1/compiling.xml
index 7bfa165b5..054f209b3 100644
--- a/src/documentation/content/xdocs/1.1rc1/compiling.xml
+++ b/src/documentation/content/xdocs/1.1/compiling.xml
@@ -48,7 +48,7 @@
       <section id="env-jdk">
         <title>JDK</title>
         <p>
-          Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4
+          Building FOP 1.1 requires a minimum Java Development Kit (JDK/SDK) of 1.5
           (A Java Runtime Environment is not sufficient).
         </p>
       </section>
@@ -144,4 +144,4 @@
       </ul>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>
diff --git a/src/documentation/content/xdocs/1.1rc1/complexscripts.xml b/src/documentation/content/xdocs/1.1/complexscripts.xml
index 697205531..697205531 100644
--- a/src/documentation/content/xdocs/1.1rc1/complexscripts.xml
+++ b/src/documentation/content/xdocs/1.1/complexscripts.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/configuration.xml b/src/documentation/content/xdocs/1.1/configuration.xml
index b30a091a5..b30a091a5 100644
--- a/src/documentation/content/xdocs/1.1rc1/configuration.xml
+++ b/src/documentation/content/xdocs/1.1/configuration.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/embedding.xml b/src/documentation/content/xdocs/1.1/embedding.xml
index 24c74f970..24c74f970 100644
--- a/src/documentation/content/xdocs/1.1rc1/embedding.xml
+++ b/src/documentation/content/xdocs/1.1/embedding.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/events.xml b/src/documentation/content/xdocs/1.1/events.xml
index 27daad59b..27daad59b 100644
--- a/src/documentation/content/xdocs/1.1rc1/events.xml
+++ b/src/documentation/content/xdocs/1.1/events.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/extensions.xml b/src/documentation/content/xdocs/1.1/extensions.xml
index 02d83db96..02d83db96 100644
--- a/src/documentation/content/xdocs/1.1rc1/extensions.xml
+++ b/src/documentation/content/xdocs/1.1/extensions.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/fonts.xml b/src/documentation/content/xdocs/1.1/fonts.xml
index f3481607d..f3481607d 100644
--- a/src/documentation/content/xdocs/1.1rc1/fonts.xml
+++ b/src/documentation/content/xdocs/1.1/fonts.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml b/src/documentation/content/xdocs/1.1/fotree/disabled-testcases.xml
index 196eafcc4..196eafcc4 100644
--- a/src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml
+++ b/src/documentation/content/xdocs/1.1/fotree/disabled-testcases.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/graphics.xml b/src/documentation/content/xdocs/1.1/graphics.xml
index b1653443a..b1653443a 100644
--- a/src/documentation/content/xdocs/1.1rc1/graphics.xml
+++ b/src/documentation/content/xdocs/1.1/graphics.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/hyphenation.xml b/src/documentation/content/xdocs/1.1/hyphenation.xml
index e6f666826..e6f666826 100644
--- a/src/documentation/content/xdocs/1.1rc1/hyphenation.xml
+++ b/src/documentation/content/xdocs/1.1/hyphenation.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/index.xml b/src/documentation/content/xdocs/1.1/index.xml
index 0b5f58215..737203aa9 100644
--- a/src/documentation/content/xdocs/1.1rc1/index.xml
+++ b/src/documentation/content/xdocs/1.1/index.xml
@@ -19,18 +19,18 @@
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
-    <title>Apache™ FOP Version 1.1rc1</title>
+    <title>Apache™ FOP Version 1.1</title>
     <version>$Revision$</version>
   </header>
   <body>
     <section id="intro">
       <title>Introduction</title>
       <p>
-        This is Release Candidate 1 (rc1) of an upcoming minor (dot) release of FOP. FOP 1.1rc1 contains many bux
+        This is Version 1.1 of Apache FOP. FOP 1.1 contains many bug
         fixes and a number of improvements, including
         important features such as support for <a href="complexscripts.html">Complex Scripts</a>
         (e.g., Arabic, Hebrew, Indic, and Southeast Asian scripts). To see what has changed since the last release,
-        please visit <a href="releaseNotes_1.1rc1.html">Release Notes</a>.
+        please visit <a href="releaseNotes_1.1.html">Release Notes</a>.
       </p>
       <p>
 	This release implements a substantial subset of the W3C XSL-FO 1.1
diff --git a/src/documentation/content/xdocs/1.1rc1/intermediate.xml b/src/documentation/content/xdocs/1.1/intermediate.xml
index 171ae4e6a..171ae4e6a 100644
--- a/src/documentation/content/xdocs/1.1rc1/intermediate.xml
+++ b/src/documentation/content/xdocs/1.1/intermediate.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/known-issues.xml b/src/documentation/content/xdocs/1.1/known-issues.xml
index c0107317d..c0107317d 100644
--- a/src/documentation/content/xdocs/1.1rc1/known-issues.xml
+++ b/src/documentation/content/xdocs/1.1/known-issues.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/knownissues_overview.xml b/src/documentation/content/xdocs/1.1/knownissues_overview.xml
index f27f98f32..a8b9e9b94 100644
--- a/src/documentation/content/xdocs/1.1rc1/knownissues_overview.xml
+++ b/src/documentation/content/xdocs/1.1/knownissues_overview.xml
@@ -49,7 +49,7 @@
       This section lists disabled test cases in the test suite for the FO tree tests, at the time
       of the release.
     </p>
-    <xi:include href="cocoon://knownissues-raw-fotree_1.1rc1.xml#xpointer(/document/body/*)"/>
+    <xi:include href="cocoon://knownissues-raw-fotree_1.1.xml#xpointer(/document/body/*)"/>
   </section>
   <section>
     <title>Layout Engine</title>
@@ -57,7 +57,7 @@
       This section lists disabled test cases in the test suite for the layout engine tests, at the
       time of the release.
     </p>
-    <xi:include href="cocoon://knownissues-raw-layoutengine_1.1rc1.xml#xpointer(/document/body/*)"/>
+    <xi:include href="cocoon://knownissues-raw-layoutengine_1.1.xml#xpointer(/document/body/*)"/>
   </section>
   <section>
     <title>Other known issues</title>
@@ -67,7 +67,7 @@
       <link href="http://issues.apache.org/bugzilla/buglist.cgi?chfieldto=Now&amp;chfield=%5BBug%20creation%5D&amp;query_format=advanced&amp;chfieldfrom=2010-07-20&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;bug_status=NEEDINFO&amp;product=Fop">newer bugs that remain open</link>.
     </p>
     <!-- See <root>/known-issues.xml for the source document of this section! -->
-    <xi:include href="cocoon://knownissues-raw-static_1.1rc1.xml#xpointer(/document/body/*)"/>
+    <xi:include href="cocoon://knownissues-raw-static_1.1.xml#xpointer(/document/body/*)"/>
   </section>
 </section>
 </body>
diff --git a/src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml b/src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml
index 5208fa91d..5208fa91d 100644
--- a/src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml
+++ b/src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/metadata.xml b/src/documentation/content/xdocs/1.1/metadata.xml
index 5d4185533..5d4185533 100644
--- a/src/documentation/content/xdocs/1.1rc1/metadata.xml
+++ b/src/documentation/content/xdocs/1.1/metadata.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/output.xml b/src/documentation/content/xdocs/1.1/output.xml
index cabbbb0fa..cabbbb0fa 100644
--- a/src/documentation/content/xdocs/1.1rc1/output.xml
+++ b/src/documentation/content/xdocs/1.1/output.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/pdfa.xml b/src/documentation/content/xdocs/1.1/pdfa.xml
index 0b8399121..0b8399121 100644
--- a/src/documentation/content/xdocs/1.1rc1/pdfa.xml
+++ b/src/documentation/content/xdocs/1.1/pdfa.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/pdfencryption.xml b/src/documentation/content/xdocs/1.1/pdfencryption.xml
index 2d8fdfb10..2d8fdfb10 100644
--- a/src/documentation/content/xdocs/1.1rc1/pdfencryption.xml
+++ b/src/documentation/content/xdocs/1.1/pdfencryption.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/pdfx.xml b/src/documentation/content/xdocs/1.1/pdfx.xml
index bef2fce2a..bef2fce2a 100644
--- a/src/documentation/content/xdocs/1.1rc1/pdfx.xml
+++ b/src/documentation/content/xdocs/1.1/pdfx.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/running.xml b/src/documentation/content/xdocs/1.1/running.xml
index 5e30bb25e..5e30bb25e 100644
--- a/src/documentation/content/xdocs/1.1rc1/running.xml
+++ b/src/documentation/content/xdocs/1.1/running.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/servlets.xml b/src/documentation/content/xdocs/1.1/servlets.xml
index dd2df4351..dd2df4351 100644
--- a/src/documentation/content/xdocs/1.1rc1/servlets.xml
+++ b/src/documentation/content/xdocs/1.1/servlets.xml
diff --git a/src/documentation/content/xdocs/1.1rc1/upgrading.xml b/src/documentation/content/xdocs/1.1/upgrading.xml
index 1e2136a06..1e2136a06 100644
--- a/src/documentation/content/xdocs/1.1rc1/upgrading.xml
+++ b/src/documentation/content/xdocs/1.1/upgrading.xml
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index bdfe96d8d..454131915 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -561,7 +561,7 @@
     </tr>
     <tr>
       <th align="center">1.0 (stable)</th>
-      <th align="center">1.1 (rc1)</th>
+      <th align="center">1.1 (stable)</th>
       <th align="center">development</th>
     </tr>
 
@@ -1492,7 +1492,7 @@
     </tr>
     <tr>
       <th align="center">1.0 (stable)</th>
-      <th align="center">1.1 (rc1)</th>
+      <th align="center">1.1 (stable)</th>
       <th align="center">develop- ment</th>
     </tr>
 
@@ -4643,7 +4643,7 @@
     </tr>
     <tr>
       <th align="center">1.0 (stable)</th>
-      <th align="center">1.1 (rc1)</th>
+      <th align="center">1.1 (stable)</th>
       <th align="center">development</th>
     </tr>
     <tr>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index 905e4a131..3ab7d20d2 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -85,26 +85,26 @@
       <p/>
       <table>
         <tr>
-          <th colspan="2">This Candidate Release</th>
+          <th colspan="2">Latest Stable Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/</code>
+            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/">
+              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/</code>
             </link>
           </td>
         </tr>
         <tr>
-          <th colspan="2">Latest Stable Release</th>
+          <th colspan="2">Previous Stable Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
@@ -123,25 +123,6 @@
           </td>
         </tr>
         <tr>
-          <th colspan="2">Previous Stable Release</th>
-        </tr>
-        <tr>
-          <td>Repository URL</td>
-          <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tages/fop-0_95/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code>
-            </link>
-          </td>
-        </tr>
-        <tr>
-          <td>Web view</td>
-          <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95/</code>
-            </link>
-          </td>
-        </tr>
-        <tr>
           <th colspan="2">Trunk</th>
         </tr>
         <tr>
diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 79a20e966..9d3784d8a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -145,11 +145,10 @@
       <question>When is the next released planned?</question>
       <answer>
         <p>
-          When it's ready and the committers have enough time to go
-          through the time-consuming process of creating a release. Version
-          1.1rc1 was released on 02 July 2012. A subsequent final
-          Version 1.1 is expected to be released within 1 to 3 months following
-          this release candidate. If you want to speed up the process, consider <link
+          Version 1.1 of FOP was released on 20 October 2012.
+          Work on a new Version 1.2 of Apache FOP is underway at this time, with
+          no fixed date set for its release.
+          If you want to speed up the process, consider <link
           href="dev/index.html#involved">contributing</link> to FOP.
         </p>
       </answer>
diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml
index c668eecfd..c100d6489 100644
--- a/src/documentation/content/xdocs/fo.xml
+++ b/src/documentation/content/xdocs/fo.xml
@@ -518,7 +518,7 @@ This applies similarly to the extent of the after region and the bottom margin o
       <section id="external-resources">
         <title>External Resources</title>
         <p>Resources needed by an XSL-FO file that are external to it (graphics, for example), are defined in the XSL-FO standard as being of type "uri-specification". This is defined in the standard at <jump href="http://www.w3.org/TR/xsl11/#datatype">Section 5.11 Property Datatypes</jump>, which includes a link to the URI standard itself. Refer to the XSL-FO and URI standards themselves for more detailed instructions.</p>
-        <p>URIs may be either absolute or relative to a base URI. (See <link href="1.1rc1/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p>
+        <p>URIs may be either absolute or relative to a base URI. (See <link href="1.1/configuration.html">FOP: Configuration</link> for information on setting the base URI for a FOP session). Here is an example referencing an external-graphic that is relative to the base URI:</p>
         <source><![CDATA[<fo:external-graphic src="url('images/logo.jpg')"/>]]></source>
         <p>Here is an example referencing an external-graphic that is an absolute URI on a local filesystem:</p>
         <source><![CDATA[fo:external-graphic src="url('file:///d:/images/logo.jpg')"/>]]></source>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 8a95934e3..dad96a6b0 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -29,7 +29,7 @@
         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. <link href="1.1rc1/output.html">Output formats</link>
+        pages to a specified output. <link href="1.1/output.html">Output formats</link>
         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>
@@ -39,7 +39,7 @@
       </p>
       <figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" />
       <p>
-        A release candidate (rc1) of the latest version of FOP is available at <link href="1.1rc1/">FOP 1.1rc1</link>.
+        The latest version of FOP is available at <link href="1.1/">FOP 1.1</link>.
       </p>
     <p>
       Support for each of the standard's objects and properties is detailed in <link href="compliance.html">FOP Compliance</link>.
diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml
index 406ccf3c0..eff0bb5cc 100644
--- a/src/documentation/content/xdocs/maillist.xml
+++ b/src/documentation/content/xdocs/maillist.xml
@@ -83,7 +83,7 @@ If you are using Microsoft Outlook, this setting can be found at the "Mail Forma
             source, or other semantic XML? If so, the question is <em>almost certainly not
               appropriate to this list</em>. In general, the only input documents that are
             appropriate on this list are XSL-FO snippets. See <link
-              href="1.1rc1/running.html#check-input">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li>
+              href="1.1/running.html#check-input">Running Xalan</link> for instructions about capturing the XSL-FO document that is actually submitted to FOP. If you haven't examined the XSL-FO document yourself, then you are not yet prepared to formulate a FOP-specific question.</li>
           <li>If you are providing one or more XSL-FO snippets:
             <ul>
               <li>Have you reduced them to the shortest possible complete, <strong>self-contained</strong> document that demonstrates the problem? Please do so.</li>
diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml
index 4b8956cd1..6ac7ac3f0 100644
--- a/src/documentation/content/xdocs/news-data.xml
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -17,12 +17,10 @@
 -->
 <!-- $Id$ -->
 <news>
-  <item date="2012-07-02" title="Apache™ FOP 1.1rc1 Available">
+  <item date="2012-10-20" title="Apache™ FOP 1.1 Released">
     <p>
-      This is a candidate release for an upcoming FOP Version 1.1 (stable) release.
-      release of the new FOP codebase. This release
-      contains bug fixes and new features. See
-      <a href="1.1rc1/releaseNotes_1.1rc1.html">Release Notes</a> for a list of
+      Apache™ FOP 1.1 contains bug fixes and a number of new features. See
+      <a href="1.1/releaseNotes_1.1.html">Release Notes</a> for a list of
       the most important changes.
     </p>
   </item>
diff --git a/src/documentation/content/xdocs/quickstartguide.xml b/src/documentation/content/xdocs/quickstartguide.xml
index 3d369c08c..bb3822641 100644
--- a/src/documentation/content/xdocs/quickstartguide.xml
+++ b/src/documentation/content/xdocs/quickstartguide.xml
@@ -29,15 +29,15 @@
       <p>The goal of this <strong>Quick Start Guide</strong> is to help novice users get Apache FOP up and running quickly. Typically, you'll need to:</p>
       <ol>
         <li><link href="download.html">Download FOP</link></li>
-        <li><link href="1.1rc1/compiling.html">Build FOP</link> (you can skip this step if you download the binary distribution!)</li>
-        <li><link href="1.1rc1/configuration.html">Configure FOP</link></li>
-        <li><link href="1.1rc1/running.html">Run FOP</link></li>
+        <li><link href="1.1/compiling.html">Build FOP</link> (you can skip this step if you download the binary distribution!)</li>
+        <li><link href="1.1/configuration.html">Configure FOP</link></li>
+        <li><link href="1.1/running.html">Run FOP</link></li>
       </ol>
       <p>Here are some links to help you find out what FOP can do, as well as how and where to get help:</p>
       <ul>
-        <li><link href="1.1rc1/embedding.html">Calling FOP from a Java Application</link></li>
-        <li><link href="1.1rc1/servlets.html">Using FOP in Servlets</link></li>
-        <li><link href="1.1rc1/anttask.html">Using FOP in an 'Ant' Build Script</link></li>
+        <li><link href="1.1/embedding.html">Calling FOP from a Java Application</link></li>
+        <li><link href="1.1/servlets.html">Using FOP in Servlets</link></li>
+        <li><link href="1.1/anttask.html">Using FOP in an 'Ant' Build Script</link></li>
         <li><link href="compliance.html" title="FOP Compliance">XSL-FO Compliance</link> (what FOP supports and what it doesn't)</li>
         <li><link href="faq.html">FAQs</link></li>
         <li><link href="gethelp.html">Getting Help</link></li>
@@ -45,7 +45,7 @@
       </ul>
       <p>
         Once you've familiarized yourself with the basics, you can get more detailed information,
-        in the detailed FOP <link href="1.1rc1/index.html">product documentation</link>.
+        in the detailed FOP <link href="1.1/index.html">product documentation</link>.
       </p>
     </section>
     
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index c750f9556..b5e9ad607 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -94,12 +94,12 @@
   -->
 
   <!--
-  BEGIN Version 1.1rc1 documentation tab
+  BEGIN Version 1.1 documentation tab
   -->
-  <trunk label="Apache™ FOP 1.1rc1" href="1.1rc1/" tab="stableversion">
+  <trunk label="Apache™ FOP 1.1" href="1.1/" tab="stableversion">
     <about label="About" href="index.html"/>
-    <release label="Release Notes" href="releaseNotes_1.1rc1.html"/>
-    <changes label="Changes (1.1rc1)" href="changes_1.1rc1.html"/>
+    <release label="Release Notes" href="releaseNotes_1.1.html"/>
+    <changes label="Changes (1.1)" href="changes_1.1.html"/>
     <knownissues label="Known Issues" href="knownissues_overview.html"/>
     <upgrading label="Upgrading" href="upgrading.html"/>
     
@@ -130,7 +130,7 @@
     
   </trunk>
   <!--
-  END Version 1.1rc1 documentation tab
+  END Version 1.1 documentation tab
   -->
 
   <!--
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 1b6f1dc2b..b774130e9 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -27,17 +27,17 @@
   <body>
     <section>
       <title>Status</title>
-      <p>Last updated 02 July 2012.</p>
+      <p>Last updated 20 October 2012.</p>
       <p>
-        Apache™ FOP version 1.1rc1 (candidate) was released on 02 July 2012.
+        Apache™ FOP Version 1.1 was released on 20 October 2012.
       </p>
     </section>
     <section>
       <title>Development Status</title>
       <p>
         The FOP code base is gradually evolving, from Version 0.90,
-	released on 22 November 2005, to Version 1.1, expected to be released during
-        the Summer of 2012. Further releases in the 1.x series and beyond are expected.
+	released on 22 November 2005, to Version 1.1, released on
+        20 October 2012. Further releases in the 1.x series and beyond are expected.
       </p>
       <p>
         FOP releases prior to version 0.90 were based on a different
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index 27e99b67c..e14d9409e 100644
--- a/src/documentation/content/xdocs/tabs.xml
+++ b/src/documentation/content/xdocs/tabs.xml
@@ -22,7 +22,7 @@
 <tabs software="FOP" title="FOP" copyright="@year@ The Apache Software Foundation" xmlns:xlink="http://www.w3.org/1999/xlink">
   <tab label="Home" dir=""/>
   <tab label="Version 1.0" dir="1.0/"/>
-  <tab label="Version 1.1rc1" dir="1.1rc1/"/>
+  <tab label="Version 1.1" dir="1.1/"/>
   <tab label="FOP Trunk" dir="trunk/"/>
   <tab label="Development" dir="dev/"/>
 </tabs>