Move target release date for 1.1 to 18 Oct.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1@1397989 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 16 insertions, 35 deletions

diff --git a/lib/xmlgraphics-commons-1.5.jar b/lib/xmlgraphics-commons-1.5.jar
index daf2a56d4..e9ab55d30 100644
--- a/lib/xmlgraphics-commons-1.5.jar
+++ b/lib/xmlgraphics-commons-1.5.jar
diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess
index 98229c429..062708b4a 100644
--- a/src/documentation/content/.htaccess
+++ b/src/documentation/content/.htaccess
@@ -18,17 +18,17 @@ RedirectMatch Permanent ^/fop/upgrading(.*) http://xmlgraphics.apache.org/fop/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.1
+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 7c51249a7..4f28acd05 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -76,7 +76,7 @@
     <release>
       <Version>
         <name>Current release (stable)</name>
-        <created>2012-10-15</created>
+        <created>2012-10-18</created>
         <revision>1.1</revision>
       </Version>
     </release>
diff --git a/src/documentation/content/xdocs/1.1/compiling.xml b/src/documentation/content/xdocs/1.1/compiling.xml
index 7bfa165b5..054f209b3 100644
--- a/src/documentation/content/xdocs/1.1/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/download.xml b/src/documentation/content/xdocs/download.xml
index 6b233564d..3ab7d20d2 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -85,7 +85,7 @@
       <p/>
       <table>
         <tr>
-          <th colspan="2">This Candidate Release</th>
+          <th colspan="2">Latest Stable Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
@@ -104,7 +104,7 @@
           </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 3ee573400..8280ff56a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -145,7 +145,7 @@
       <question>When is the next released planned?</question>
       <answer>
         <p>
-          Version 1.1 of FOP was released on 15 October 2012.
+          Version 1.1 of FOP was released on 18 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
diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml
index fb1bbfebc..008d6ad0d 100644
--- a/src/documentation/content/xdocs/news-data.xml
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -17,7 +17,7 @@
 -->
 <!-- $Id$ -->
 <news>
-  <item date="2012-10-15" title="Apache™ FOP 1.1 Released">
+  <item date="2012-10-18" title="Apache™ FOP 1.1 Released">
     <p>
       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
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 02008e782..01a77674c 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -27,9 +27,9 @@
   <body>
     <section>
       <title>Status</title>
-      <p>Last updated 15 October 2012.</p>
+      <p>Last updated 18 October 2012.</p>
       <p>
-        Apache™ FOP Version 1.1 was released on 15 October 2012.
+        Apache™ FOP Version 1.1 was released on 18 October 2012.
       </p>
     </section>
     <section>
@@ -37,7 +37,7 @@
       <p>
         The FOP code base is gradually evolving, from Version 0.90,
 	released on 22 November 2005, to Version 1.1, released on
-        15 October 2012. Further releases in the 1.x series and beyond are expected.
+        18 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/status.xml b/status.xml
index 9c1676dab..7ddaeaa89 100644
--- a/status.xml
+++ b/status.xml
@@ -61,7 +61,7 @@
       users, i.e. when the behaviour changes and could affect the layout of existing
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
-    <release version="1.1" date="15 October 2012">
+    <release version="1.1" date="18 October 2012">
       <action context="Test" dev="GA" type="fix">
         Fix errors and warnings in example files. Add build.xml for documentation examples.
       </action>