From e742fb8cb2ff93b513064292ddf622443214315e Mon Sep 17 00:00:00 2001 From: Glenn Adams Date: Fri, 5 Oct 2012 08:56:54 +0000 Subject: [PATCH] Update for final 1.1 release on 2012-10-15. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-1_1@1394416 13f79535-47bb-0310-9956-ffa450edef68 --- README | 25 +++++-------- build.xml | 2 +- ...1.5rc1.jar => xmlgraphics-commons-1.5.jar} | Bin 600645 -> 600640 bytes src/documentation/content/.htaccess | 34 +++++++++--------- src/documentation/content/doap.rdf | 8 ++--- .../xdocs/{1.1rc1 => 1.1}/accessibility.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/anttask.xml | 0 .../xdocs/{1.1rc1 => 1.1}/compiling.xml | 0 .../xdocs/{1.1rc1 => 1.1}/complexscripts.xml | 0 .../xdocs/{1.1rc1 => 1.1}/configuration.xml | 0 .../xdocs/{1.1rc1 => 1.1}/embedding.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/events.xml | 0 .../xdocs/{1.1rc1 => 1.1}/extensions.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/fonts.xml | 0 .../fotree/disabled-testcases.xml | 0 .../xdocs/{1.1rc1 => 1.1}/graphics.xml | 0 .../xdocs/{1.1rc1 => 1.1}/hyphenation.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/index.xml | 6 ++-- .../xdocs/{1.1rc1 => 1.1}/intermediate.xml | 0 .../xdocs/{1.1rc1 => 1.1}/known-issues.xml | 0 .../{1.1rc1 => 1.1}/knownissues_overview.xml | 6 ++-- .../layoutengine/disabled-testcases.xml | 0 .../xdocs/{1.1rc1 => 1.1}/metadata.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/output.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/pdfa.xml | 0 .../xdocs/{1.1rc1 => 1.1}/pdfencryption.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/pdfx.xml | 0 .../content/xdocs/{1.1rc1 => 1.1}/running.xml | 0 .../xdocs/{1.1rc1 => 1.1}/servlets.xml | 0 .../xdocs/{1.1rc1 => 1.1}/upgrading.xml | 0 .../content/xdocs/compliance.ihtml | 6 ++-- src/documentation/content/xdocs/download.xml | 8 ++--- src/documentation/content/xdocs/faq.xml | 9 +++-- src/documentation/content/xdocs/fo.xml | 2 +- src/documentation/content/xdocs/index.xml | 4 +-- src/documentation/content/xdocs/maillist.xml | 2 +- src/documentation/content/xdocs/news-data.xml | 8 ++--- .../content/xdocs/quickstartguide.xml | 14 ++++---- src/documentation/content/xdocs/site.xml | 10 +++--- src/documentation/content/xdocs/status.xml | 8 ++--- src/documentation/content/xdocs/tabs.xml | 2 +- status.xml | 2 +- 42 files changed, 73 insertions(+), 83 deletions(-) rename lib/{xmlgraphics-commons-1.5rc1.jar => xmlgraphics-commons-1.5.jar} (91%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/accessibility.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/anttask.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/compiling.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/complexscripts.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/configuration.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/embedding.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/events.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/extensions.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/fonts.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/fotree/disabled-testcases.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/graphics.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/hyphenation.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/index.xml (89%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/intermediate.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/known-issues.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/knownissues_overview.xml (92%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/layoutengine/disabled-testcases.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/metadata.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/output.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/pdfa.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/pdfencryption.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/pdfx.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/running.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/servlets.xml (100%) rename src/documentation/content/xdocs/{1.1rc1 => 1.1}/upgrading.xml (100%) diff --git a/README b/README index 0fc91455d..d0793c720 100644 --- a/README +++ b/README @@ -93,12 +93,11 @@ http://xmlgraphics.apache.org/fop/stable/running.html RELEASE NOTES ============================================================================== -Version 1.1rc1 +Version 1.1 ============== -This is a candidate release of the next, minor (dot) release of Apache FOP, -which primarily addresses bug fixes and also adds a number of new features. -See below for details. +This release of Apache FOP primarily addresses bug fixes and also adds a number +of new features. See below for details. Compliance ---------- @@ -113,22 +112,16 @@ Known issues A detailed list of known issues in this release is available at http://xmlgraphics.apache.org/fop/1.1/knownissues_overview.html. -Major Changes in Version 1.1rc1 +Major Changes in Version 1.1 ------------------------------- -* Adds support for complex scripts, in particular those that require - either bidirectional processing or advanced typographic tables in - fonts (e.g., the GSUB and GPOS tables of OpenType). -* Adds support for fo:bidi-override and (relatively) full support - for writing-mode='rl-tb' (or equivalent). -* Adds support for Unicode BIDI Control characters: U+200E LEFT-TO-RIGHT - MARK (LRM), U+200F RIGHT-TO-LEFT MARK (RLM), U+202A LEFT-TO-RIGHT EMBEDDING - (LRE), U+202B RIGHT-TO-LEFT EMBEDDING (RLE), U+202D LEFT-TO-RIGHT OVERRIDE - (LRO), U+202E RIGHT-TO-LEFT OVERRIDE (RLO), and U+202C POP DIRECTIONAL - FORMATTING (PDF). +* Adds support for complex scripts. +* Adds support for TTF fonts in PostScript. +* Adds support for PDF Object Streams. +* Adds support for PDF 128-bit encryption. A more detailed list of changes in this release is available at -http://xmlgraphics.apache.org/fop/1.1rc1/changes_1.1rc1.html. +http://xmlgraphics.apache.org/fop/1.1/changes_1.1.html. A more detailed list of changes in this and earlier releases is available at http://xmlgraphics.apache.org/fop/changes.html. diff --git a/build.xml b/build.xml index e0c3c97bc..9cf4f6271 100644 --- a/build.xml +++ b/build.xml @@ -143,7 +143,7 @@ list of possible build targets. - + diff --git a/lib/xmlgraphics-commons-1.5rc1.jar b/lib/xmlgraphics-commons-1.5.jar similarity index 91% rename from lib/xmlgraphics-commons-1.5rc1.jar rename to lib/xmlgraphics-commons-1.5.jar index 03cf5b3d640b6891acb466d8484c4b28c5de0776..501c8c818b4ac1556be70516da184ab6c8138a19 100644 GIT binary patch delta 20906 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 AW&i*H delta 20460 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 diff --git a/src/documentation/content/.htaccess b/src/documentation/content/.htaccess index 0edc84f75..98229c429 100644 --- a/src/documentation/content/.htaccess +++ b/src/documentation/content/.htaccess @@ -1,27 +1,27 @@ # 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 # 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/1.1 # Latest release Redirect Temp /fop/current http://xmlgraphics.apache.org/fop/1.0 diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf index 7ce3d6d58..7c51249a7 100644 --- a/src/documentation/content/doap.rdf +++ b/src/documentation/content/doap.rdf @@ -75,14 +75,14 @@ - Upcoming release (candidate) - 2012-07-02 - 1.1rc1 + Current release (stable) + 2012-10-15 + 1.1 - Current release (stable) + Previous release (stable) 2010-07-21 1.0 diff --git a/src/documentation/content/xdocs/1.1rc1/accessibility.xml b/src/documentation/content/xdocs/1.1/accessibility.xml similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/accessibility.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/anttask.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/compiling.xml rename to src/documentation/content/xdocs/1.1/compiling.xml diff --git a/src/documentation/content/xdocs/1.1rc1/complexscripts.xml b/src/documentation/content/xdocs/1.1/complexscripts.xml similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/complexscripts.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/configuration.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/embedding.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/events.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/extensions.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/fonts.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/fotree/disabled-testcases.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/graphics.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/hyphenation.xml rename to 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 similarity index 89% rename from src/documentation/content/xdocs/1.1rc1/index.xml rename to src/documentation/content/xdocs/1.1/index.xml index 0b5f58215..db11ff2c9 100644 --- a/src/documentation/content/xdocs/1.1rc1/index.xml +++ b/src/documentation/content/xdocs/1.1/index.xml @@ -19,18 +19,18 @@
- Apache™ FOP Version 1.1rc1 + Apache™ FOP Version 1.1 $Revision$
Introduction

- This is Release Candidate 1 (rc1) of an upcoming minor (dot) release of FOP. FOP 1.1rc1 contains many bux + This is Release Version 1.1 Apache FOP. FOP 1.1 contains many bug fixes and a number of improvements, including important features such as support for Complex Scripts (e.g., Arabic, Hebrew, Indic, and Southeast Asian scripts). To see what has changed since the last release, - please visit Release Notes. + please visit Release Notes.

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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/intermediate.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/known-issues.xml rename to 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 similarity index 92% rename from src/documentation/content/xdocs/1.1rc1/knownissues_overview.xml rename to 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.

- +
Layout Engine @@ -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.

- +
Other known issues @@ -67,7 +67,7 @@ newer bugs that remain open.

- +
diff --git a/src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml b/src/documentation/content/xdocs/1.1/layoutengine/disabled-testcases.xml similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/layoutengine/disabled-testcases.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/metadata.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/output.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/pdfa.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/pdfencryption.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/pdfx.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/running.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/servlets.xml rename to 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 similarity index 100% rename from src/documentation/content/xdocs/1.1rc1/upgrading.xml rename to 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 @@ 1.0 (stable) - 1.1 (rc1) + 1.1 (stable) development @@ -1492,7 +1492,7 @@ 1.0 (stable) - 1.1 (rc1) + 1.1 (stable) develop- ment @@ -4643,7 +4643,7 @@ 1.0 (stable) - 1.1 (rc1) + 1.1 (stable) development diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml index 905e4a131..6b233564d 100644 --- a/src/documentation/content/xdocs/download.xml +++ b/src/documentation/content/xdocs/download.xml @@ -90,16 +90,16 @@ Repository URL - - http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1rc1/ + + http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-1_1/ Web view - - http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1rc1/ + + http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-1_1/ diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml index 79a20e966..3ee573400 100644 --- a/src/documentation/content/xdocs/faq.xml +++ b/src/documentation/content/xdocs/faq.xml @@ -145,11 +145,10 @@ When is the next released planned?

- 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 contributing to FOP.

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
External Resources

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 Section 5.11 Property Datatypes, which includes a link to the URI standard itself. Refer to the XSL-FO and URI standards themselves for more detailed instructions.

-

URIs may be either absolute or relative to a base URI. (See FOP: Configuration 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:

+

URIs may be either absolute or relative to a base URI. (See FOP: Configuration 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:

]]>

Here is an example referencing an external-graphic that is an absolute URI on a local filesystem:

]]> 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. Output formats + pages to a specified output. Output formats 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.

@@ -39,7 +39,7 @@

- A release candidate (rc1) of the latest version of FOP is available at FOP 1.1rc1. + The latest version of FOP is available at FOP 1.1.

Support for each of the standard's objects and properties is detailed in FOP Compliance. diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml index b24166462..50b829c6e 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 almost certainly not appropriate to this list. In general, the only input documents that are appropriate on this list are XSL-FO snippets. See Running Xalan 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. + href="1.1/running.html#check-input">Running Xalan 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.

  • If you are providing one or more XSL-FO snippets:
    • Have you reduced them to the shortest possible complete, self-contained document that demonstrates the problem? Please do so.
      • diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml index 4b8956cd1..fb1bbfebc 100644 --- a/src/documentation/content/xdocs/news-data.xml +++ b/src/documentation/content/xdocs/news-data.xml @@ -17,12 +17,10 @@ --> - +

      - 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 - Release Notes for a list of + Apache™ FOP 1.1 contains bug fixes and a number of new features. See + Release Notes for a list of the most important changes.

      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 @@

      The goal of this Quick Start Guide is to help novice users get Apache FOP up and running quickly. Typically, you'll need to:

      1. Download FOP
        2. -
      2. Build FOP (you can skip this step if you download the binary distribution!)
        3. -
      3. Configure FOP
        4. -
      4. Run FOP
        5. +
      5. Build FOP (you can skip this step if you download the binary distribution!)
        6. +
      6. Configure FOP
        7. +
      7. Run FOP

      Here are some links to help you find out what FOP can do, as well as how and where to get help:

        -
      • Calling FOP from a Java Application
        • -
      • Using FOP in Servlets
        • -
      • Using FOP in an 'Ant' Build Script
        • +
      • Calling FOP from a Java Application
        • +
      • Using FOP in Servlets
        • +
      • Using FOP in an 'Ant' Build Script
      • XSL-FO Compliance (what FOP supports and what it doesn't)
      • FAQs
      • Getting Help
        • @@ -45,7 +45,7 @@

      Once you've familiarized yourself with the basics, you can get more detailed information, - in the detailed FOP product documentation. + in the detailed FOP product documentation.

    • 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 @@ --> - + - - + + @@ -130,7 +130,7 @@ - + Fix errors and warnings in example files. Add build.xml for documentation examples. -- 2.39.5