summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Adams <gadams@apache.org>2012-06-02 19:17:27 +0000
committerGlenn Adams <gadams@apache.org>2012-06-02 19:17:27 +0000
commit212be02c8e6ac76ba73988fb5121e412d70516e7 (patch)
tree8833bd2f54d64f2054814b3531dd982ae790bcfb
parentb72b7c52a033ac0bf4da5d584a3a3a0367f191a9 (diff)
downloadxmlgraphics-fop-212be02c8e6ac76ba73988fb5121e412d70516e7.tar.gz
xmlgraphics-fop-212be02c8e6ac76ba73988fb5121e412d70516e7.zip
Change release designation 1.1 to 1.1rc1.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1rc1@1345561 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--build.xml2
-rw-r--r--src/documentation/content/.htaccess42
-rw-r--r--src/documentation/content/doap.rdf8
-rw-r--r--src/documentation/content/xdocs/1.1rc1/accessibility.xml (renamed from src/documentation/content/xdocs/1.1/accessibility.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/anttask.xml (renamed from src/documentation/content/xdocs/1.1/anttask.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/compiling.xml (renamed from src/documentation/content/xdocs/1.1/compiling.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/complexscripts.xml (renamed from src/documentation/content/xdocs/1.1/complexscripts.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/configuration.xml (renamed from src/documentation/content/xdocs/1.1/configuration.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/embedding.xml (renamed from src/documentation/content/xdocs/1.1/embedding.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/events.xml (renamed from src/documentation/content/xdocs/1.1/events.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/extensions.xml (renamed from src/documentation/content/xdocs/1.1/extensions.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/fonts.xml (renamed from src/documentation/content/xdocs/1.1/fonts.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml (renamed from src/documentation/content/xdocs/1.1/fotree/disabled-testcases.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/graphics.xml (renamed from src/documentation/content/xdocs/1.1/graphics.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/hyphenation.xml (renamed from src/documentation/content/xdocs/1.1/hyphenation.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/index.xml (renamed from src/documentation/content/xdocs/1.1/index.xml)8
-rw-r--r--src/documentation/content/xdocs/1.1rc1/intermediate.xml (renamed from src/documentation/content/xdocs/1.1/intermediate.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/known-issues.xml (renamed from src/documentation/content/xdocs/1.1/known-issues.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/knownissues_overview.xml (renamed from src/documentation/content/xdocs/1.1/knownissues_overview.xml)6
-rw-r--r--src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml (renamed from src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/metadata.xml (renamed from src/documentation/content/xdocs/1.1/metadata.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/output.xml (renamed from src/documentation/content/xdocs/1.1/output.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/pdfa.xml (renamed from src/documentation/content/xdocs/1.1/pdfa.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/pdfencryption.xml (renamed from src/documentation/content/xdocs/1.1/pdfencryption.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/pdfx.xml (renamed from src/documentation/content/xdocs/1.1/pdfx.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/running.xml (renamed from src/documentation/content/xdocs/1.1/running.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/servlets.xml (renamed from src/documentation/content/xdocs/1.1/servlets.xml)0
-rw-r--r--src/documentation/content/xdocs/1.1rc1/upgrading.xml (renamed from src/documentation/content/xdocs/1.1/upgrading.xml)0
-rw-r--r--src/documentation/content/xdocs/compliance.ihtml6
-rw-r--r--src/documentation/content/xdocs/download.xml27
-rw-r--r--src/documentation/content/xdocs/faq.xml10
-rw-r--r--src/documentation/content/xdocs/fo.xml2
-rw-r--r--src/documentation/content/xdocs/index.xml4
-rw-r--r--src/documentation/content/xdocs/license.xml2
-rw-r--r--src/documentation/content/xdocs/maillist.xml2
-rw-r--r--src/documentation/content/xdocs/news-data.xml2
-rw-r--r--src/documentation/content/xdocs/quickstartguide.xml14
-rw-r--r--src/documentation/content/xdocs/site.xml10
-rw-r--r--src/documentation/content/xdocs/tabs.xml2
-rw-r--r--status.xml2
40 files changed, 84 insertions, 65 deletions
diff --git a/build.xml b/build.xml
index 5ddd58e72..7bd8b701a 100644
--- a/build.xml
+++ b/build.xml
@@ -143,7 +143,7 @@ list of possible build targets.
<property name="Name" value="Apache FOP"/>
<property name="name" value="fop"/>
<property name="NAME" value="FOP"/>
- <property name="version" value="1.1"/>
+ <property name="version" value="1.1rc1"/>
<property name="year" value="1999-2012"/>
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess
index 062708b4a..0edc84f75 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.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
+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
# redirect to versioned documentation
# Current stable release
-Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.1
+Redirect Temp /fop/stable http://xmlgraphics.apache.org/fop/1.0
# Current unstable release (or trunk if no beta is the latest release)
-Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/trunk
+Redirect Temp /fop/unstable http://xmlgraphics.apache.org/fop/1.1rc1
# Latest release
-Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.1
-Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.1
+Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/latest http://xmlgraphics.apache.org/fop/1.0
# Previous stable release
-Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/1.0
+Redirect Temp /fop/previous http://xmlgraphics.apache.org/fop/0.95
# 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 327d8dec8..8ccd82bf6 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -77,15 +77,15 @@
<release>
<Version>
<name>Previous stable release</name>
- <created>2010-07-21</created>
- <revision>1.0</revision>
+ <created>2008-08-05</created>
+ <revision>0.95</revision>
</Version>
</release>
<release>
<Version>
<name>Latest stable release</name>
- <created>2012-MM-DD</created>
- <revision>1.1</revision>
+ <created>2010-07-21</created>
+ <revision>1.0</revision>
</Version>
</release>
<repository>
diff --git a/src/documentation/content/xdocs/1.1/accessibility.xml b/src/documentation/content/xdocs/1.1rc1/accessibility.xml
index 412519d8b..412519d8b 100644
--- a/src/documentation/content/xdocs/1.1/accessibility.xml
+++ b/src/documentation/content/xdocs/1.1rc1/accessibility.xml
diff --git a/src/documentation/content/xdocs/1.1/anttask.xml b/src/documentation/content/xdocs/1.1rc1/anttask.xml
index ba53fe7d1..ba53fe7d1 100644
--- a/src/documentation/content/xdocs/1.1/anttask.xml
+++ b/src/documentation/content/xdocs/1.1rc1/anttask.xml
diff --git a/src/documentation/content/xdocs/1.1/compiling.xml b/src/documentation/content/xdocs/1.1rc1/compiling.xml
index 7bfa165b5..7bfa165b5 100644
--- a/src/documentation/content/xdocs/1.1/compiling.xml
+++ b/src/documentation/content/xdocs/1.1rc1/compiling.xml
diff --git a/src/documentation/content/xdocs/1.1/complexscripts.xml b/src/documentation/content/xdocs/1.1rc1/complexscripts.xml
index c622fe192..c622fe192 100644
--- a/src/documentation/content/xdocs/1.1/complexscripts.xml
+++ b/src/documentation/content/xdocs/1.1rc1/complexscripts.xml
diff --git a/src/documentation/content/xdocs/1.1/configuration.xml b/src/documentation/content/xdocs/1.1rc1/configuration.xml
index b30a091a5..b30a091a5 100644
--- a/src/documentation/content/xdocs/1.1/configuration.xml
+++ b/src/documentation/content/xdocs/1.1rc1/configuration.xml
diff --git a/src/documentation/content/xdocs/1.1/embedding.xml b/src/documentation/content/xdocs/1.1rc1/embedding.xml
index 24c74f970..24c74f970 100644
--- a/src/documentation/content/xdocs/1.1/embedding.xml
+++ b/src/documentation/content/xdocs/1.1rc1/embedding.xml
diff --git a/src/documentation/content/xdocs/1.1/events.xml b/src/documentation/content/xdocs/1.1rc1/events.xml
index 27daad59b..27daad59b 100644
--- a/src/documentation/content/xdocs/1.1/events.xml
+++ b/src/documentation/content/xdocs/1.1rc1/events.xml
diff --git a/src/documentation/content/xdocs/1.1/extensions.xml b/src/documentation/content/xdocs/1.1rc1/extensions.xml
index 02d83db96..02d83db96 100644
--- a/src/documentation/content/xdocs/1.1/extensions.xml
+++ b/src/documentation/content/xdocs/1.1rc1/extensions.xml
diff --git a/src/documentation/content/xdocs/1.1/fonts.xml b/src/documentation/content/xdocs/1.1rc1/fonts.xml
index f3481607d..f3481607d 100644
--- a/src/documentation/content/xdocs/1.1/fonts.xml
+++ b/src/documentation/content/xdocs/1.1rc1/fonts.xml
diff --git a/src/documentation/content/xdocs/1.1/fotree/disabled-testcases.xml b/src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml
index 196eafcc4..196eafcc4 100644
--- a/src/documentation/content/xdocs/1.1/fotree/disabled-testcases.xml
+++ b/src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml
diff --git a/src/documentation/content/xdocs/1.1/graphics.xml b/src/documentation/content/xdocs/1.1rc1/graphics.xml
index b1653443a..b1653443a 100644
--- a/src/documentation/content/xdocs/1.1/graphics.xml
+++ b/src/documentation/content/xdocs/1.1rc1/graphics.xml
diff --git a/src/documentation/content/xdocs/1.1/hyphenation.xml b/src/documentation/content/xdocs/1.1rc1/hyphenation.xml
index e6f666826..e6f666826 100644
--- a/src/documentation/content/xdocs/1.1/hyphenation.xml
+++ b/src/documentation/content/xdocs/1.1rc1/hyphenation.xml
diff --git a/src/documentation/content/xdocs/1.1/index.xml b/src/documentation/content/xdocs/1.1rc1/index.xml
index f1d4dcb87..0b5f58215 100644
--- a/src/documentation/content/xdocs/1.1/index.xml
+++ b/src/documentation/content/xdocs/1.1rc1/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.1</title>
+ <title>Apache™ FOP Version 1.1rc1</title>
<version>$Revision$</version>
</header>
<body>
<section id="intro">
<title>Introduction</title>
<p>
- The Apache™ FOP team is proud to present to you this production quality
- minor (dot) release of FOP. FOP 1.1 contains many bux fixes and a number of improvements, including
+ This is Release Candidate 1 (rc1) of an upcoming minor (dot) release of FOP. FOP 1.1rc1 contains many bux
+ 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.0.html">Release Notes</a>.
+ please visit <a href="releaseNotes_1.1rc1.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.1/intermediate.xml b/src/documentation/content/xdocs/1.1rc1/intermediate.xml
index 171ae4e6a..171ae4e6a 100644
--- a/src/documentation/content/xdocs/1.1/intermediate.xml
+++ b/src/documentation/content/xdocs/1.1rc1/intermediate.xml
diff --git a/src/documentation/content/xdocs/1.1/known-issues.xml b/src/documentation/content/xdocs/1.1rc1/known-issues.xml
index 622e6a79a..622e6a79a 100644
--- a/src/documentation/content/xdocs/1.1/known-issues.xml
+++ b/src/documentation/content/xdocs/1.1rc1/known-issues.xml
diff --git a/src/documentation/content/xdocs/1.1/knownissues_overview.xml b/src/documentation/content/xdocs/1.1rc1/knownissues_overview.xml
index b2ea2eff2..0ac803336 100644
--- a/src/documentation/content/xdocs/1.1/knownissues_overview.xml
+++ b/src/documentation/content/xdocs/1.1rc1/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.1.xml#xpointer(/document/body/*)"/>
+ <xi:include href="cocoon://knownissues-raw-fotree_1.1rc1.xml#xpointer(/document/body/*)"/>
</section>
<section>
<title>Layout Engine</title>
@@ -57,12 +57,12 @@
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.1.xml#xpointer(/document/body/*)"/>
+ <xi:include href="cocoon://knownissues-raw-layoutengine_1.1rc1.xml#xpointer(/document/body/*)"/>
</section>
<section>
<title>Other known issues</title>
<p>This section lists other known issues.</p>
- <xi:include href="cocoon://knownissues-raw-static_1.1.xml#xpointer(/document/body/*)"/>
+ <xi:include href="cocoon://knownissues-raw-static_1.1rc1.xml#xpointer(/document/body/*)"/>
</section>
</section>
</body>
diff --git a/src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml b/src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml
index 5208fa91d..5208fa91d 100644
--- a/src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml
+++ b/src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml
diff --git a/src/documentation/content/xdocs/1.1/metadata.xml b/src/documentation/content/xdocs/1.1rc1/metadata.xml
index 5d4185533..5d4185533 100644
--- a/src/documentation/content/xdocs/1.1/metadata.xml
+++ b/src/documentation/content/xdocs/1.1rc1/metadata.xml
diff --git a/src/documentation/content/xdocs/1.1/output.xml b/src/documentation/content/xdocs/1.1rc1/output.xml
index cabbbb0fa..cabbbb0fa 100644
--- a/src/documentation/content/xdocs/1.1/output.xml
+++ b/src/documentation/content/xdocs/1.1rc1/output.xml
diff --git a/src/documentation/content/xdocs/1.1/pdfa.xml b/src/documentation/content/xdocs/1.1rc1/pdfa.xml
index 0b8399121..0b8399121 100644
--- a/src/documentation/content/xdocs/1.1/pdfa.xml
+++ b/src/documentation/content/xdocs/1.1rc1/pdfa.xml
diff --git a/src/documentation/content/xdocs/1.1/pdfencryption.xml b/src/documentation/content/xdocs/1.1rc1/pdfencryption.xml
index 2d8fdfb10..2d8fdfb10 100644
--- a/src/documentation/content/xdocs/1.1/pdfencryption.xml
+++ b/src/documentation/content/xdocs/1.1rc1/pdfencryption.xml
diff --git a/src/documentation/content/xdocs/1.1/pdfx.xml b/src/documentation/content/xdocs/1.1rc1/pdfx.xml
index bef2fce2a..bef2fce2a 100644
--- a/src/documentation/content/xdocs/1.1/pdfx.xml
+++ b/src/documentation/content/xdocs/1.1rc1/pdfx.xml
diff --git a/src/documentation/content/xdocs/1.1/running.xml b/src/documentation/content/xdocs/1.1rc1/running.xml
index 5e30bb25e..5e30bb25e 100644
--- a/src/documentation/content/xdocs/1.1/running.xml
+++ b/src/documentation/content/xdocs/1.1rc1/running.xml
diff --git a/src/documentation/content/xdocs/1.1/servlets.xml b/src/documentation/content/xdocs/1.1rc1/servlets.xml
index dd2df4351..dd2df4351 100644
--- a/src/documentation/content/xdocs/1.1/servlets.xml
+++ b/src/documentation/content/xdocs/1.1rc1/servlets.xml
diff --git a/src/documentation/content/xdocs/1.1/upgrading.xml b/src/documentation/content/xdocs/1.1rc1/upgrading.xml
index 1e2136a06..1e2136a06 100644
--- a/src/documentation/content/xdocs/1.1/upgrading.xml
+++ b/src/documentation/content/xdocs/1.1rc1/upgrading.xml
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index 55362db8c..d64b5fd2b 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 (stable)</th>
+ <th align="center">1.1 (rc1)</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 (stable)</th>
+ <th align="center">1.1 (rc1)</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 (stable)</th>
+ <th align="center">1.1 (rc1)</th>
<th align="center">develop- ment</th>
</tr>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index e153a97b8..22208b42f 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -85,21 +85,40 @@
<p/>
<table>
<tr>
+ <th colspan="2">This Candidate 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>
+ </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>
+ </td>
+ </tr>
+ <tr>
<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_1/">
- <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/</code>
+ <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/">
+ <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_0/</code>
</link>
</td>
</tr>
<tr>
<td>Web view</td>
<td>
- <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 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>
diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 463583666..e4ebd3e1a 100644
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -146,11 +146,11 @@
<p>
When it's ready and the committers have enough time to go
through the time-consuming process of creating a release. Version
- 1.1 was released on [TBD - ADD DAY MONTH] 2012, and will release a
- subsequent version when we accumulate enough enhancements and bug fixes. If
- you want to speed up the process, consider <link
- href="dev/index.html#involved">contributing</link> to
- FOP.</p>
+ 1.1rc1 was released on [TBD - ADD DAY MONTH] 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
+ href="dev/index.html#involved">contributing</link> to FOP.
+ </p>
</answer>
</faq>
<faq id="redesign">
diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml
index 8818a030c..8d4521e4d 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.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>
+ <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>
<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 ec9084a50..2ffd0aba0 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -28,7 +28,7 @@
<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. <link href="1.1/output.html">Output formats</link>
+ pages to a specified output. <link href="1.1rc1/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>
@@ -38,7 +38,7 @@
</p>
<figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" />
<p>
- A stable release of the latest version of FOP is available at <link href="1.1/">FOP 1.1</link>.
+ A release candidate (rc1) of the latest version of FOP is available at <link href="1.1rc1/">FOP 1.1rc1</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/license.xml b/src/documentation/content/xdocs/license.xml
index b0cf05c5d..c453598f4 100644
--- a/src/documentation/content/xdocs/license.xml
+++ b/src/documentation/content/xdocs/license.xml
@@ -27,7 +27,7 @@
<title>License</title>
<p>
All new Apache™ FOP releases will be licensed under the <strong>Apache™ License, version 2.0</strong>.
- Releases until version 0.20.5 are released unter the Apache™ License, version 1.1.
+ Releases up through version 0.20.5 were released under the Apache™ License, version 1.1.
</p>
<p>
To inspect the license terms please consult the LICENSE and NOTICE files in the root
diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml
index e58778c32..91b174332 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.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>
+ 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>
<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 b76c7e2da..0d977634c 100644
--- a/src/documentation/content/xdocs/news-data.xml
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -22,7 +22,7 @@
The Apache™ FOP team is delighted to present you a production grade
release of the new FOP codebase. This release
contains bug fixes and new features. See the <a
- href="1.1/releaseNotes_1.1.html">Release Notes</a> for a list of
+ href="1.1rc1/releaseNotes_1.1rc1.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 ceb931248..1192bf1c3 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.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>
+ <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>
</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.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="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="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.1/index.html">product documentation</link>.
+ in the detailed FOP <link href="1.1rc1/index.html">product documentation</link>.
</p>
</section>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 4c55beb2b..65a51a57b 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -94,12 +94,12 @@
-->
<!--
- BEGIN Version 1.1 documentation tab
+ BEGIN Version 1.1rc1 documentation tab
-->
- <trunk label="Apache™ FOP 1.1" href="1.1/" tab="stableversion">
+ <trunk label="Apache™ FOP 1.1rc1" href="1.1rc1/" tab="stableversion">
<about label="About" href="index.html"/>
- <release label="Release Notes" href="releaseNotes_1.1.html"/>
- <changes label="Changes (1.1)" href="changes_1.1.html"/>
+ <release label="Release Notes" href="releaseNotes_1.1rc1.html"/>
+ <changes label="Changes (1.1rc1)" href="changes_1.1rc1.html"/>
<knownissues label="Known Issues" href="knownissues_overview.html"/>
<upgrading label="Upgrading" href="upgrading.html"/>
@@ -130,7 +130,7 @@
</trunk>
<!--
- END Version 1.1 documentation tab
+ END Version 1.1rc1 documentation tab
-->
<!--
diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml
index e14d9409e..27e99b67c 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.1" dir="1.1/"/>
+ <tab label="Version 1.1rc1" dir="1.1rc1/"/>
<tab label="FOP Trunk" dir="trunk/"/>
<tab label="Development" dir="dev/"/>
</tabs>
diff --git a/status.xml b/status.xml
index 23ad7456e..a6a5eaf13 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="DD Month 2012">
+ <release version="1.1rc1" date="DD Month 2012">
<action context="Renderers" dev="GA" type="fix" fixes-bug="53304,53306">
Add version attribute to AT and IF intermediate formats. Also eliminate redundant use of reversed attribute in AT format.
</action>