latest sitemap and some minor link fixes

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

5 files changed, 18 insertions, 15 deletions

diff --git a/src/documentation/content/xdocs/dev/index.xml b/src/documentation/content/xdocs/dev/index.xml
index 1ed024917..b9279daa7 100644
--- a/src/documentation/content/xdocs/dev/index.xml
+++ b/src/documentation/content/xdocs/dev/index.xml
@@ -14,7 +14,7 @@ current development of FOP.
     <p>FOP is the world's first print formatter driven by XSL formatting
        objects and the world's first output independent formatter. It is a
        Java application that reads a formatting object tree and then
-       renders the resulting pages to a specified output. <jump href="output.html">Output formats</jump>
+       renders the resulting pages to a specified output. <link href="../output.html">Output formats</link>
        currently supported are PDF, PCL, PS, SVG, XML (area tree representation),
        Print, AWT, MIF and TXT.
        The primary output target is PDF.
@@ -29,14 +29,14 @@ can mean Formatting Object Processor.
     <p>The latest version of Fop is 0.20.4 and it supports the
        <jump href="http://www.w3.org/TR/2001/REC-xsl-20011015/">XSL-FO Version 1.0
        W3C Recommendation</jump>.
-       You can <jump href="download.html">download</jump>
+       You can <link href="../download.html">download</link>
        Fop including a precompiled version, the source code and many example files to
        get you started. Pointers to introductions into xsl:fo can be found in the
-       <jump href="resources.html">resources</jump> section. Please be aware, that
+       <link href="../resources.html">resources</link> section. Please be aware, that
        Fop is at the moment not a full implementation of the basic conformance level
        of the xsl:fo standard. You can find a list of supported flow objects and properties
-       in the section <jump href="implemented.html">Features</jump> and in section
-       <jump href="limitations.html">Limitations</jump> in what way this support is
+       in the section <link href="../implemented.html">Features</link> and in section
+       <link href="../limitations.html">Limitations</link> in what way this support is
        limited.
     </p>
     <p>FOP is part of Apache's XML project. The homepage of FOP is
diff --git a/src/documentation/content/xdocs/dev/svg.xml b/src/documentation/content/xdocs/dev/svg.xml
index 08f59e2f8..16a664c01 100644
--- a/src/documentation/content/xdocs/dev/svg.xml
+++ b/src/documentation/content/xdocs/dev/svg.xml
@@ -58,7 +58,6 @@ For more information see <link href="http://xml.apache.org/batik/">Batik</link>
 for how transcoders work.
             </p>
           </section>
-<!--
           <section>
             <title>Examples</title>
             <p>
@@ -75,31 +74,31 @@ to PDF:
     <tr>
       <td>images</td> 
       <td><link href="svg/images.svg">images.svg</link></td> 
-      <td><link href="svg/images.png">images.png</link></td>
+      <td><!--link href="svg/images.png"-->images.png<!--/link--></td>
       <td><link href="svg/images.pdf">images.pdf</link></td>
     </tr>
     <tr>
       <td>svg linking</td>
       <td><link href="svg/link.svg">link.svg</link></td>
-      <td><link href="svg/link.png">link.png</link></td>
+      <td><!--link href="svg/link.png"-->link.png<!--/link--></td>
       <td><link href="svg/link.pdf">link.pdf</link></td>
     </tr>
     <tr>
       <td>gradients and patterns</td>
       <td><link href="svg/paints.svg">paints.svg</link></td>
-      <td><link href="svg/paints.png">paints.png</link></td>
+      <td><!--link href="svg/paints.png"-->paints.png<!--/link--></td>
       <td><link href="svg/paints.pdf">paints.pdf</link></td>
     </tr>
     <tr>
       <td>various text and effects on text</td>
       <td><link href="svg/text.svg">text.svg</link></td>
-      <td><link href="svg/text.png">text.png</link></td>
+      <td><!--link href="svg/text.png"-->text.png<!--/link--></td>
       <td><link href="svg/text.pdf">text.pdf</link></td>
     </tr>
     <tr>
       <td>transparent objects</td>
       <td><link href="svg/transparency.svg">transparency.svg</link></td>
-      <td><link href="svg/transparency.png">transparency.png</link></td>
+      <td><!--link href="svg/transparency.png"-->transparency.png<!--/link--></td>
       <td><link href="svg/transparency.pdf">transparency.pdf</link></td>
     </tr>
   </table>
@@ -126,7 +125,6 @@ You will need Acrobat 5.0 to see transparency.
   </table> 
             </p>
           </section>
--->
           <section>
             <title>Important Notes</title>
             <p>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index 10d002bf5..8af11e354 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -19,8 +19,10 @@
        In both cases you have to build Fop yourself - see <link href="compiling.html">Compiling Fop</link> for details.
     </p>
     <note>
-      Important: Currently, releases of FOP are coming out of the "fop-0_20_2-maintain" branch. The "MAIN" branch is
-      used for the redesign. See <link href="design/index.html">NEW DESIGN</link> for more information.
+      Important: Currently, releases of FOP are coming out of the
+      "fop-0_20_2-maintain" branch. The "MAIN" branch is currently
+      under development. See <link href="dev/index.html">Development Docs</link>
+      for more information.
     </note>
     <p>To run FOP from the command line, see <link href="running.html">Running FOP</link>.</p>
     <p>If you are interested in embedding FOP in a Java application of your own, see
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 6e2a6f72d..b18609647 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -15,6 +15,9 @@
        Print, AWT, MIF and TXT.
        The primary output target is PDF. 
     </p>
+    <note>
+      The PDF files on this site are created using current CVS.
+    </note>
         <figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" /> 
     <p>The latest version of Fop is 0.20.4 and it supports the
        <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/">XSL-FO Version 1.0
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 76bf06f72..e7311064c 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -35,7 +35,7 @@ Volunteers needed for:</p>
 <p>
 ... and plenty of other areas. See the <link href="todo.html">todo</link>
 list for more details.
-See this <link href="design/status.html">Status</link> for more information.
+See this <link href="dev/status.html">Status</link> for more information.
 </p>
 <p>
 Development for 1.0DR1 is addressing the design issues for layout and