Merge from Trunk revisions 735029 - 740275.

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

5 files changed, 46 insertions, 20 deletions

diff --git a/src/documentation/content/locationmap.xml b/src/documentation/content/locationmap.xml
new file mode 100644
index 000000000..3a5ce410e
--- /dev/null
+++ b/src/documentation/content/locationmap.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+  <components>
+    <matchers default="lm">
+      <matcher name="lm" src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+  </components>
+  <locator>
+    <!-- Examples:
+    <match pattern="project.rewrite.**">
+      <location src="http://cocoon.apache.org/{1}.html"/>
+    </match>
+    <match pattern="project.remote.**.xml">
+      <location src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml"/>
+    </match>
+    -->
+  </locator>
+</locationmap>
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index fc89d11d5..781299361 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -1786,7 +1786,7 @@
 
       <th align="center">0.94 (stable)</th>
 
-      <th align="center">0.95 (beta)</th>
+      <th align="center">0.95 (stable)</th>
 
       <th align="center">develop- ment</th>
     </tr>
@@ -7127,7 +7127,7 @@
 
       <th align="center">0.94 (stable)</th>
 
-      <th align="center">0.95 (beta)</th>
+      <th align="center">0.95 (stable)</th>
 
       <th align="center">develop- ment</th>
     </tr>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 9ed040184..6f46d31a6 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -35,9 +35,9 @@
       </p>
         <figure width="480" height="260" src="images/document.jpg" alt="Render Diagram" />
     <p>
-      A beta release of the latest version of FOP (<link href="0.95/">0.95</link>) is now
-      available. After a short testing period it will become the third
-      stable release after the large redesign effort and will implement a large subset of the
+      A stable release of the latest version of FOP (<link href="0.95/">0.95</link>) is
+      available. It's the third
+      stable release after the large redesign effort and implements a large subset of the
       <link href="http://www.w3.org/TR/xsl11/">XSL-FO Version 1.1 W3C
         Recommendation</link>.
     </p>
@@ -53,7 +53,7 @@
     <title>Demonstration</title>
         <figure width="480" height="260" src="images/layout.jpg" alt="Formatting Diagram" />
 <p>
-This image is a demonstration of a real two page document. The xml data on the left
+This image is a demonstration of a real two page document. The XML data on the left
 is formatted into the two pages on the right. The document contains static areas that appear on every page, an external graphic, a footnote on the first page, and a table that goes across both pages.
 </p>
 <p>
diff --git a/src/documentation/content/xdocs/resources.xml b/src/documentation/content/xdocs/resources.xml
index b49de2be2..252605d42 100644
--- a/src/documentation/content/xdocs/resources.xml
+++ b/src/documentation/content/xdocs/resources.xml
@@ -194,33 +194,33 @@
         <title>FOP add-ons</title>
         <ul>
           <li>[software] TIFFRenderer is a renderer for outputting multi-page TIFF: <jump href="http://www.tkachenko.com/fop/tiffrenderer.html">http://www.tkachenko.com/fop/tiffrenderer.html</jump> (MPL)</li>
-          <li>[software] AFP Renderer / Batch Assembler for FOP: <jump href="http://mypage.bluewin.ch/huanderegg/">http://mypage.bluewin.ch/huanderegg/</jump> (open source, license unclear)</li>
           <li>[software] The <jump href="http://mogwai.sourceforge.net">Mogwai Project</jump> includes a renderer for FOP that generates output for Okidata dot matrix printers (GPL).</li>
           <li>[software] <jump href="http://barcode4j.sourceforge.net">Barcode4J</jump> (formerly Krysalis Barcode) is a barcode generator which can be used with FOP (Apache license v2.0).</li>
           <li>[software] <jump href="http://jeuclid.sourceforge.net">JEuclid</jump> is a MathML implementation which can be used with FOP (Apache license v2.0).</li>
-          <li>[software] <jump href="http://afp-renderer.sourceforge.net/">AFP Renderer</jump> renders formatted objects to AFP or (MO:DCA).</li>
+          <li>[software] <jump href="http://afp-renderer.sourceforge.net/">AFP Renderer</jump> renders formatted objects to AFP or (MO:DCA). (Has been integrated in FOP)</li>
           <li>[software &amp; tools] <jump href="http://offo.sourceforge.net/">Objects For Formatting Objects</jump> hosts hyphenation patterns and (eventually) files other accessory data files &amp; scripts.</li>
         </ul>        
       </section>
       <section id="products-pdf">
         <title>PDF post-processors</title>
         <ul>
+          <li>[software] <jump href="http://incubator.apache.org/pdfbox">Apache PDFBox</jump> (Incubating, Apache License V2.0)</li>
           <li>[software] <jump href="http://www.lowagie.com/iText">iText</jump> (MPL and LGPL)</li>
           <li>[software] <jump href="http://www.etymon.com/pjc">PJ Classic</jump> by Etymon (GPL)</li>
           <li>[software] <jump href="http://www.etymon.com/pjx">PJ Professional</jump> by Etymon (commercial)</li>
           <li>[software] <jump href="http://www.accesspdf.com/pdftk/">pdftk</jump> the pdf toolkit</li>
-          <li>[software] <jump href="http://www.pdfbox.org">PDFBox</jump> (BSD)</li>
         </ul>
       </section>
       <section id="products-editors">
         <title>XSL-FO editors</title>
         <ul>
           <li>[software] <jump href="http://foa.sourceforge.net/">FOA (Formatting Objects Authoring)</jump> (MPL)</li>
-          <li>[software] <jump href="http://www.scruffyware.com/products/foeditor/">FOEditor</jump> by Scruffy Software (Shareware)</li>
+          <!--infected website
+            <li>[software] <jump href="http://www.scruffyware.com/products/foeditor/">FOEditor</jump> by Scruffy Software (Shareware)</li>
+          -->
           <li>[software] <jump href="http://www.scriptura-xsl.com">Scriptura</jump> by Inventive Designers (commercial)</li>
           <li>[software] <jump href="http://www.xslfast.com">XSLfast</jump> by jCatalog Software AG (commercial)</li>
           <li>[software] <jump href="http://www.digiforms.com/">DIGIFORMS Document Designer</jump> by Metafocus (commercial)</li>
-          <li>[software] <jump href="http://web.assentis.com/products/products.php?navi=Products&amp;product_id=7">Assentis:DocDesign</jump> by Assentis Technologies (commercial)</li>
         </ul>
       </section>
       <section id="products-other">
@@ -228,6 +228,7 @@
         <ul>
           <li>[software] <jump href="http://foray.sourceforge.net/">FOray</jump> a renderer for converting XML files to PDF via XSL Formatting Object elements (FOP fork)</li>
           <li>[software] <jump href="http://defoe.sourceforge.net/folio">Folio</jump> a renderer for XML files containing Formatting Object elements (aka FOP Alt.Design)</li>
+          <li>[software] <jump href="http://xmlroff.org/">xmlroff</jump> an open source XSL-FO implementation written in C (BSD-style license)</li>
 
           <li>[commercial software developer] <jump href="http://antennahouse.com/product.htm">Antenna House</jump> - XSL Formatter, WordMLToFo, XML Editor...</li>
           <li>[commercial software developer] <jump href="http://www.renderx.net/">RenderX</jump> XEP, EnMasse, Docbench...</li>
@@ -242,10 +243,6 @@
           is the most obvious language it would be used for. The tool has a number of
           page-related extensions. It also comes with an API in the form of an XML
           filter (OSI-Approved Open Source - Public Domain).</li>
-          <li> [software] <jump href="http://www.vbxml.com/xpathvisualizer">The XPath Visualizer</jump>.
-Web site says: "This is a full blown Visual XPath Interpreter for the evaluation of any XPath expression and visual presentation of the resulting nodeset or scalar value."
-Requires Internet Explorer 5+.
-(freeware)</li>
           <li>
             [software] <jump href="http://www.ahmadsoft.org/fopbridge.html">FOP Bridge</jump> is an Eclipse plug-in
             that allows to convert FO documents using Apache FOP directly inside the Eclipse workbench (LGPL).
diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml
index b211c58b0..777881494 100644
--- a/src/documentation/content/xdocs/team.xml
+++ b/src/documentation/content/xdocs/team.xml
@@ -78,11 +78,6 @@
             from the TeX/LaTeX world. See his <fork href="http://www.leverkruid.eu">home
             page</fork> for some of his private projects.</li>
         <li id="jp"><link href="mailto:pietsch@apache.org">J&#x00F6;rg Pietschmann</link> (JP)</li>
-        <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> (MB) is currently a
-          PostDoc pursuing an academic career in computer science. His main interest in FOP is to
-          improve the DocBook to PDF tool-chain to produce high quality output, while still
-          conforming to given style-guides. See his <link href="http://max.berger.name">home
-            page</link> for more information.</li>
       </ul>
     </section>
     <section id="contribute-active">