Merged revisions 556567-558280,558282-562946,562948-563926,563928-563950,563952-563955,563957-564855,564857-567293,567295-567296,567298-567302,567304-569099 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_94

........
  r560595 | vhennebert | 2007-07-28 21:26:51 +0200 (sam, 28 jui 2007) | 2 lines
  
  Remove tab for the no longer supported 0.20.5 version
........
  r560596 | vhennebert | 2007-07-28 21:28:30 +0200 (sam, 28 jui 2007) | 2 lines
  
  Create a tab for the new 0.94 version
........
  r560600 | vhennebert | 2007-07-28 21:45:13 +0200 (sam, 28 jui 2007) | 2 lines
  
  Remove any reference to the old maintenance branch
........
  r560886 | vhennebert | 2007-07-30 10:19:59 +0200 (lun, 30 jui 2007) | 2 lines
  
  Update the documentation before releasing
........
  r562023 | clay | 2007-08-02 08:08:49 +0200 (jeu, 02 aoû 2007) | 1 line
  
  Changes to fop-0_94 branch to prepare it for 0.94 release.
........
  r562024 | clay | 2007-08-02 08:09:33 +0200 (jeu, 02 aoû 2007) | 1 line
  
  Changes to fop-0_94 branch to prepare it for 0.94 release.
........
  r562027 | clay | 2007-08-02 08:27:01 +0200 (jeu, 02 aoû 2007) | 1 line
  
  Changes to fop-0_94 branch to prepare it for 0.94 release.
........
  r562332 | clay | 2007-08-03 07:09:50 +0200 (ven, 03 aoû 2007) | 1 line
  
  Updated FOP Compliance page to include additional column for 0.94 (did not remove 0.20.5 or 0.93 column). Also 'Notes' column was *not* modified for 0.94-specific information.
........
  r562333 | clay | 2007-08-03 07:10:47 +0200 (ven, 03 aoû 2007) | 1 line
  
  Updated FOP Compliance page to include additional column for 0.94 (did not remove 0.20.5 or 0.93 column). Also 'Notes' column was *not* modified for 0.94-specific information.
........
  r562880 | vhennebert | 2007-08-05 17:05:41 +0200 (dim, 05 aoû 2007) | 4 lines
  
  - Update the website content
  - Fix some typos
  - Fix broken links
........
  r562881 | vhennebert | 2007-08-05 17:06:59 +0200 (dim, 05 aoû 2007) | 5 lines
  
  Changes in the trunk tab:
  - update content
  - fix typos
  - fix broken links
........
  r562887 | vhennebert | 2007-08-05 17:22:15 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Merge changes on the Trunk tab from revision 562881
........
  r562891 | vhennebert | 2007-08-05 17:32:33 +0200 (dim, 05 aoû 2007) | 4 lines
  
  Update the list of known issues:
  - border-collapsing model for tables is available
  - internal links point to the exact location
........
  r562900 | vhennebert | 2007-08-05 17:48:50 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Setup the "known issues" infrastructure for the 0.94 tab
........
  r562903 | vhennebert | 2007-08-05 18:23:59 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Style only: remove tab characters
........
  r562909 | vhennebert | 2007-08-05 19:11:58 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Disable "Valid HTML" icons. The site isn't valid...
........
  r562919 | vhennebert | 2007-08-05 19:52:13 +0200 (dim, 05 aoû 2007) | 3 lines
  
  Disable any link to relnotes.html. This file is not properly placed (in no tab), and only contains release notes for versions up to 0.92.
  TODO determine what to do with this file; newer versions have their own system
........
  r562924 | vhennebert | 2007-08-05 20:09:44 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Add a link to the Release Notes for version 0.94
........
  r562925 | vhennebert | 2007-08-05 20:10:34 +0200 (dim, 05 aoû 2007) | 2 lines
  
  Replace "Apache Forrest" with "Apache FOP". Copy-paste error?
........
  r564159 | vhennebert | 2007-08-09 11:56:41 +0200 (jeu, 09 aoû 2007) | 2 lines
  
  Introduce 0.94 in status.xml and README
........
  r564233 | vhennebert | 2007-08-09 17:09:49 +0200 (jeu, 09 aoû 2007) | 2 lines
  
  Update the compliance page
........
  r564864 | vhennebert | 2007-08-11 10:41:15 +0200 (sam, 11 aoû 2007) | 2 lines
  
  Fix error that made the 0.94 menu appear in the Trunk tab and vice-versa
........
  r564866 | vhennebert | 2007-08-11 10:45:39 +0200 (sam, 11 aoû 2007) | 2 lines
  
  Add my key for signing the release
........
  r564871 | vhennebert | 2007-08-11 10:51:35 +0200 (sam, 11 aoû 2007) | 2 lines
  
  Update dependency on version 1.2 of XML Graphics Commons
........
  r567299 | vhennebert | 2007-08-18 19:23:09 +0200 (sam, 18 aoû 2007) | 2 lines
  
  Update .htaccess to 0.94 release
........
  r567539 | clay | 2007-08-20 06:12:42 +0200 (lun, 20 aoû 2007) | 1 line
  
  Added formatting for code in page.
........


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

1 files changed, 18 insertions, 14 deletions

diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml
index 62d7a63df..5ab95fe8d 100644
--- a/src/documentation/content/xdocs/fo.xml
+++ b/src/documentation/content/xdocs/fo.xml
@@ -31,7 +31,7 @@
         FOP uses XSL-FO as input.
 It is the responsibility of the user to make sure that the XSL-FO submitted to FOP is correct.
 The tutorial items presented here are not comprehensive, but are of the FAQ variety. Another 
-good FAQ is <fork href="http://www.dpawson.co.uk/xsl/xslfaq.html">Dave Pawson's XSL FAQ</fork>.
+good FAQ is <fork href="http://www.dpawson.co.uk/xsl/">Dave Pawson's XSL FAQ</fork>.
       </p>
     </section>
     <section id="xml">
@@ -92,7 +92,7 @@ It is not necessary everywhere, but it is wise to do so anyway, just to be sure.
       <section id="xml-encoding">
         <title>Encoding Issues</title>
         <p>
-          If the parser complains about illegal bytes or characters in the input, or there are unexpected characters in the output, this is usually is the result of a character encoding problem.
+          If the parser complains about illegal bytes or characters in the input, or there are unexpected characters in the output, this is usually the result of a character encoding problem.
 See the <link href="http://www.dpawson.co.uk/xsl">XSL FAQ</link> for additional information.
 Many software packages that produce XML, including XSLT processors, use UTF-8 encoding as a default.
 If you view their output with something not aware of the encoding, like Notepad for Win95/98/ME/NT, funny characters are displayed. A &#197; is a giveaway.
@@ -350,13 +350,14 @@ Omit your normal headers and footers, and use (for example) an extended header t
       <section id="fo-preformat">
         <title>Preformatting Content</title>
         <p>
-          Sometimes it is desirable to retain linebreaks and hard spaces, and to get preformatted text to pass through without being changed.
-The XSL-FO specification provides some properties for this: <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">white-space-collapse</link> and <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#linefeed-treatment">linefeed-treatment</link>.
-In FOP, use white-space-collapse="false" on an enclosing block.
+          Sometimes it is desirable to retain linebreaks and hard spaces, and to get
+          preformatted text to pass through without being changed. The XSL-FO
+          specification provides some properties for this: <link
+            href="http://www.w3.org/TR/xsl11/#white-space-collapse">white-space-collapse</link>
+          and <link
+            href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice7.html#white-space-collapse">linefeed-treatment</link>.
+          In FOP, use white-space-collapse="false" on an enclosing block.
         </p>
-        <warning>
-          Due to a bug in FOP 0.20.5, setting white-space-collapse="false" will also preserve line breaks in the text. Do not rely on this behavior, as it is non-conformant and has changed in FOP 0.93.
-        </warning>
       </section>
       <section id="fo-total-pages">
         <title>Total Document Pages</title>
@@ -447,7 +448,7 @@ This applies similarly to the extent of the after region and the bottom margin o
         </p>
         <ul>
           <li>
-            Horizontal lines can be drawn using <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice6.html#fo_leader">fo:leader</link>.
+            Horizontal lines can be drawn using <link href="http://www.w3.org/TR/xsl11/#fo_leader">fo:leader</link>.
           </li>
           <li>
             Use a solid border on a suitable fo:block. This will work for horizontal and vertical lines only.
@@ -463,9 +464,12 @@ This applies similarly to the extent of the after region and the bottom margin o
           <link href="http://www.renderx.com">RenderX</link> has provided an <link href="http://www.renderx.com/Tests/validator/fo.dtd.html">Unofficial DTD for FO Documents</link>, which may be helpful in validating general FO issues.
         </p>
         <p>
-          FOP also maintains an <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/foschema/fop.xsd?view=co">Unofficial FOP Schema</link> in the FOP CVS Repository.
-This document can be used either to validate against the FO standard, or against the actual FOP implementation.
-See the notes near the beginning of the document for instructions on how to use it.
+          FOP also maintains an <link
+            href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/foschema/fop.xsd?view=co">Unofficial
+            FOP Schema</link> in the FOP Subversion Repository. This document can be used
+          either to validate against the FO standard, or against the actual FOP
+          implementation. See the notes near the beginning of the document for
+          instructions on how to use it.
           </p>
       </section>
       <section id="landscape">
@@ -484,8 +488,8 @@ See the notes near the beginning of the document for instructions on how to use
       </section>
       <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/2001/REC-xsl-20011015/slice5.html#section-N8794-Property-Datatypes">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="0.20.5/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>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="0.94/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>