Merged revisions 682600,682604-682605,682616-682618,682625,682630,683136,683159,683684,684041,684491,684493,684575,684577 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

................
  r682600 | jeremias | 2008-08-05 07:46:31 +0100 (Tue, 05 Aug 2008) | 8 lines
  
  Blocked revisions 681371 via svnmerge
  
  ........
    r681371 | jeremias | 2008-07-31 15:54:16 +0200 (Do, 31 Jul 2008) | 1 line
    
    Adjust fop.bat to JAR upgrade.
  ........
................
  r682604 | jeremias | 2008-08-05 07:51:32 +0100 (Tue, 05 Aug 2008) | 26 lines
  
  Merged revisions 636407-637074,637076-637118,637120-637790,637792-637856,637858-637992,637994-638047,638049-638307,638309-638315,638318-638936,638938-640888,640890-642905,642907-647402,647404-647536,647538-648983,648985-649005,649007-649013,649015-650549,650551-651301,651303-653536,653538-654452,654454-656285,656287-656523,656525-657519,657521-661579,661581-663481,663483-664691,664693-666634,666636-666661,666663-668532,668535-668549,668551-668569,668571-668640,668642-669117,669119-669172,669174-669477,669479-670550,670552-673749,673751-674303,674305-674313,674315-674316,674318-675105,675107-675149,675153-675706,675708-680714,680716-680819,680821-681283,681285,681287-681289,681293-681370,681372-682601 via svnmerge from 
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
  
  ........
    r681309 | jeremias | 2008-07-31 11:31:35 +0200 (Do, 31 Jul 2008) | 2 lines
    
    0.95beta -> 0.95
    Added links to the new SVN mirror in the Netherlands.
  ........
    r681314 | vhennebert | 2008-07-31 11:41:33 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Corrected bug number
  ........
    r681329 | vhennebert | 2008-07-31 12:38:10 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Slight re-phrasing to make it clearer (I believe) that this page only lists changes made since 0.95beta, but that changes from that latter are of course also available in 0.95 final
  ........
    r681330 | vhennebert | 2008-07-31 12:39:50 +0200 (Do, 31 Jul 2008) | 2 lines
    
    Don't be shy Max ;-) Restored alphabetical order in the list of active committers
  ........
    r681350 | jeremias | 2008-07-31 14:09:41 +0200 (Do, 31 Jul 2008) | 1 line
    
    Fixed validation errors.
  ........
................
  r682605 | jeremias | 2008-08-05 07:55:12 +0100 (Tue, 05 Aug 2008) | 3 lines
  
  Removed merge tracking for "svnmerge" for 
  https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95
................
  r682616 | jeremias | 2008-08-05 08:46:14 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Skip IO Exception when loading a PFM and an AFM could be loaded. The PFM is only a fallback and not necessary when the AFM is available. Motivation: The "URW Bookman L" fonts from GhostScript have bad PFM files.
................
  r682617 | jeremias | 2008-08-05 08:47:18 +0100 (Tue, 05 Aug 2008) | 1 line
  
  The FontEventListener was not wired into font auto-detection. An error while loading a font wasn't relayed to the event subsystem.
................
  r682618 | jeremias | 2008-08-05 08:57:36 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Fixed small mistake with weight adjustment on font lookup. Weight 400 was slipping through the cracks.
................
  r682625 | jeremias | 2008-08-05 09:12:25 +0100 (Tue, 05 Aug 2008) | 2 lines
  
  Removed "Areas of expertise" as discussed.
  News update for 0.95 release.
................
  r682630 | jeremias | 2008-08-05 09:28:07 +0100 (Tue, 05 Aug 2008) | 1 line
  
  Oopsy, that wasn't intended to get into trunk.
................
  r683136 | jeremias | 2008-08-06 07:49:36 +0100 (Wed, 06 Aug 2008) | 1 line
  
  Some missing release info.
................
  r683159 | jeremias | 2008-08-06 09:24:53 +0100 (Wed, 06 Aug 2008) | 1 line
  
  Converted the project news to a special XML format so I can generate an RSS feed. Mostly copied from XML Graphics Commons.
................
  r683684 | jeremias | 2008-08-07 20:26:54 +0100 (Thu, 07 Aug 2008) | 1 line
  
  Added fop.cmd to binary distribution (not sure if any of the others should be included, too)
................
  r684041 | spepping | 2008-08-08 19:38:07 +0100 (Fri, 08 Aug 2008) | 2 lines
  
  Added fop.js to binary distribution
................
  r684491 | adelmelle | 2008-08-10 13:35:42 +0100 (Sun, 10 Aug 2008) | 1 line
  
  Bugzilla 45490: Avoid altering the original 'href' if the protocol is other than 'file:' (suggested by Thomas Stieler)
................
  r684493 | adelmelle | 2008-08-10 13:40:58 +0100 (Sun, 10 Aug 2008) | 1 line
  
  Added 'due-to' to the wrong entry...
................
  r684575 | jeremias | 2008-08-10 20:18:22 +0100 (Sun, 10 Aug 2008) | 2 lines
  
  Merge from 0_95 branch:
  Fixed ID resolution for nested bookmarks with duplicated IDs.
................
  r684577 | jeremias | 2008-08-10 20:35:27 +0100 (Sun, 10 Aug 2008) | 3 lines
  
  Bugzilla #45606:
  Fixed generation of "fonttbl" for RTF output to fix loading problem with AbiWord.
  Submitted by: Pavel Kysilka <goldenfish.at.linuxsoft.cz>
................


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

12 files changed, 377 insertions, 425 deletions

diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf
index c677ecbc8..734e8339b 100644
--- a/src/documentation/content/doap.rdf
+++ b/src/documentation/content/doap.rdf
@@ -77,22 +77,22 @@
     <release>
       <Version>
         <name>Previous stable release</name>
-        <created>2007-01-02</created>
-        <revision>0.93</revision>
+        <created>2007-08-23</created>
+        <revision>0.94</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Previous development release</name>
-        <created>2008-25-08</created>
+        <created>2008-03-26</created>
         <revision>0.95beta</revision>
       </Version>
     </release>
     <release>
       <Version>
         <name>Latest stable release</name>
-        <created>2007-08-23</created>
-        <revision>0.94</revision>
+        <created>2008-08-05</created>
+        <revision>0.95</revision>
       </Version>
     </release>
     <repository>
diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml
index 181f1fe1d..fc89d11d5 100644
--- a/src/documentation/content/xdocs/compliance.ihtml
+++ b/src/documentation/content/xdocs/compliance.ihtml
@@ -492,7 +492,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/dev/release.xml b/src/documentation/content/xdocs/dev/release.xml
index 641758d78..8cbdc0815 100644
--- a/src/documentation/content/xdocs/dev/release.xml
+++ b/src/documentation/content/xdocs/dev/release.xml
@@ -39,7 +39,7 @@ The purpose of documenting it here is to facilitate consistency, ensure that the
         <li>Commit any outstanding changes</li>
         <li>Create a branch called <code>branches/fop-v_vv</code></li>
         <li>Edit release notes (<code>README</code> and <code>status.xml</code> in the root).</li>
-        <li>Update the <code>index.xml</code> and <code>site.xml</code> for the new version.</li>
+        <li>Update the <code>index.xml</code>, <code>site.xml</code> and <code>download.xml</code> for the new version.</li>
         <li>Update the version numbers in the release column on the
         compliance page (<code>compliance.xml</code>); update the compliance in the release column
         to the current state (development column).</li>
diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml
index f0a2a0a61..9f28efd00 100644
--- a/src/documentation/content/xdocs/download.xml
+++ b/src/documentation/content/xdocs/download.xml
@@ -89,35 +89,35 @@
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</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>
         <tr>
-          <th colspan="2">Latest Release</th>
+          <th colspan="2">Previous Stable Release</th>
         </tr>
         <tr>
           <td>Repository URL</td>
           <td>
-            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/">
-              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_95beta/</code>
+            <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
-            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/">
-              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_95beta/</code>
+            <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/">
+              <code>http://svn.apache.org/viewvc/xmlgraphics/fop/tags/fop-0_94/</code>
             </link>
           </td>
         </tr>
@@ -127,17 +127,30 @@
         <tr>
           <td>Repository URL</td>
           <td>
+            Main Repository:
             <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">
               <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
             </link>
+            <br/>
+            European Mirror:
+            <link href="http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/">
+              <code>http://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
+            </link>
+            
           </td>
         </tr>
         <tr>
           <td>Web view</td>
           <td>
+            Main Repository:
             <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/">
               <code>http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
             </link>
+            <br/>
+            European Mirror:
+            <link href="http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/">
+              <code>http://svn.eu.apache.org/viewvc/xmlgraphics/fop/trunk/</code>
+            </link>
           </td>
         </tr>
       </table>
@@ -146,7 +159,9 @@
         build FOP from the source files. For details please see the "Build" page on the documentation tab
         for the version you've downloaded.
       </p>
+      <!-- No hopes to reenable them because of problems with long path names on Solaris
       <fixme author="jeremias">Reenable the link to the SVN snapshots once they are available.</fixme>
+      -->
     </section>
     <section id="archives">
       <title>Archive Download</title>
diff --git a/src/documentation/content/xdocs/news-data.xml b/src/documentation/content/xdocs/news-data.xml
new file mode 100644
index 000000000..56ff61094
--- /dev/null
+++ b/src/documentation/content/xdocs/news-data.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0" standalone="no"?>
+<!--
+  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.
+-->
+<!-- $Id$ -->
+<news>
+  <item date="2008-08-05" title="Apache FOP 0.95 Released">
+    <p>
+      The Apache FOP team is delighted to present you a production grade
+      release of the new FOP codebase. This release
+      contains many bug fixes and new features. See the <a
+        href="0.95/releaseNotes_0.95.html">Release Notes</a> for a list of
+      the most important changes.
+    </p>
+  </item>
+  <item date="2008-03-16" title="Apache FOP 0.95beta Released">
+    <p>
+      The Apache FOP team is delighted to present you a beta version of the
+      next production grade release of the new FOP codebase. This release
+      contains many bug fixes and new features. See the <a
+        href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
+      the most important changes.
+    </p>
+  </item>
+  <item date="2007-10-30" title="New committer">
+    <p>Welcome Max Berger!</p>
+  </item>
+  <item date="2007-10-15" title="New Committer">
+    <p>Welcome Adrian Cumiskey!</p>
+  </item>
+  <item date="2007-08-24" title="Apache FOP 0.94 Released">
+    <p>The Apache FOP team is pleased to present you the second production
+      grade release of the new FOP codebase. This release contains many bug
+      fixes and new features. See the <a
+        href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
+      the most important changes.</p>
+  </item>
+  <item date="2007-01-26" title="New Committer">
+    <p>Welcome Jay Bryant!</p>
+  </item>
+  <item date="2007-01-09" title="Apache FOP 0.93 released">
+    <p>
+      The Apache FOP team is proud to present to you the first
+      production grade release of the new FOP codebase. This release
+      has the new API first introduced in release 0.92 beta. It
+      contains again many bug fixes and new features.
+    </p>
+  </item>
+  <item date="2006-10-16" title="New Committer">
+    <p>Welcome Vincent Hennebert!</p>
+  </item>
+  <item date="2006-04-18" title="Apache FOP 0.92 beta released">
+    <p>
+      A second "beta" grade release of the new FOP codebase with a modified and
+      now considered stable API. The release contains many bug fixes as well as
+      new features mainly related to even more extensive support of the XSL-FO
+      specification. This is expected to be the last "beta" release before we
+      go to a 1.0 release!
+    </p>
+  </item>
+  <item date="2005-12-23" title="Apache FOP 0.91 beta released">
+    <p>
+      One month after the initial release we're happy present a "beta" grade
+      release of the new FOP codebase. It's mostly a bug fix release but also
+      contains a few new features. Thanks to all those who sent us feedback
+      on the initial release!
+    </p>
+  </item>
+  <item date="2005-11-22" title="Apache FOP 0.90 alpha 1 released">
+    <p>
+      The Apache FOP team is proud to present to you the largely rewritten 
+      codebase which is finally in a state where you can start to use it. 
+      It has taken over three years to get this far and over two years 
+      without a new release from the FOP project.
+    </p>
+    <p>
+      Please see also the 
+      <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a>.
+      <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
+    </p>
+  </item>
+  <item date="2005-09-08" title="New Committer">
+    <p>Welcome Manuel Mall!</p>
+  </item>
+  <item date="2004-10-20" title="Creation of the Apache XML Graphics project">
+    <p>
+      The Apache Board of Directors agreed to the creation of the 
+      <a href="http://xmlgraphics.apache.org">Apache XML Graphics</a>
+      project which will be comprised of Batik and FOP. Both former 
+      Apache XML subprojects are in this way complying with the Board's desire
+      to improve project oversight. Both project teams also see additional
+      benefits of working more closely together.
+    </p>
+  </item>
+  <item date="2004-10-08" title="New Committer">
+    <p>Welcome Luca Furini!</p>
+  </item>
+  <item date="2004-04-24" title="New Committer">
+    <p>Welcome Simon Pepping!</p>
+  </item>
+  <item date="2004-03-07" title="New Committer">
+    <p>Welcome Web Maestro Clay Leeds!</p>
+  </item>
+  <item date="2004-01-10" title="New Committers">
+    <p>Welcome Chris Bowditch and Andreas Delmelle!</p>
+  </item>
+  <item date="2004-01-04" title="New Committer">
+    <p>Welcome Finn Bock!</p>
+  </item>
+  <item date="2003-11-29" title="New Committer">
+    <p>Welcome Peter Herweg!</p>
+  </item>
+  <item date="2003-07-18" title="Apache FOP 0.20.5 released">
+    <p>Changes since 0.20.4 include:</p>
+    <ul>
+      <li>Added support for PDF encryption</li>
+      <li>Perfomance tuning</li>
+      <li>Fixed link hotspot positioning</li>
+      <li>Fixed multi-threading issues</li>
+      <li>Added support for CCITT Group 4 encoded TIFF files</li>
+      <li>Dynamic JAI support</li>
+      <li>Added autoselecting portrait/landscape for PCL and PS Renderer</li>
+      <li>Added continued-label extension for tables</li>
+      <li>Improved AWT Font-measuring/rendering</li>
+      <li>Improved marker handling</li>
+      <li>Fixed problem with jpegs with icc profile and acrobat reader 5</li>
+      <li>Added a fontBaseDir property</li>
+      <li>TXTRenderer output encoding</li>
+      <li>border-spacing support</li>
+      <li>and a lot more bugfixes</li>
+    </ul>
+    <p>
+      See also the full text of the
+      <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=6067">
+        announcement</a>.
+      <!-- TODO re-enable  and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
+    </p>
+  </item>
+  <item date="2003-06-29" title="New Committer">
+    <p>Welcome Glen Mazza!</p>
+  </item>
+  <item date="2003-05-23" title="Apache FOP 0.20.5 Release Candidate 3 available">
+    <p>
+      See the full text of the <a
+        href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=5429">announcement</a>.
+    </p>
+  </item>
+  <item date="2003-02-18" title="Apache FOP 0.20.5 Release Candidate 2 available">
+    <p>
+      See the full text of the <a
+        href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=4509">announcement</a>.
+    </p>
+  </item>
+  <item date="2003-02-02" title="New XML PMC">
+    <p>
+      Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC.
+    </p>
+  </item>
+  <item date="2003-01-28" title="FOP logo contest">
+    <p>We are looking for a new logo. FOP logo
+      contest is started!</p>
+  </item>
+  <item date="2002-12-23" title="Official FOP Wiki">
+    <p>
+      See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages"
+        >FOP project pages</a> at the ApacheWiki.
+    </p>
+  </item>
+  <item date="2002-12-10" title="FOP 0.20.5 Release Candidate available">
+    <p>
+      See the full text of the <a
+        href="http://marc.theaimsgroup.com/?l=fop-user&amp;m=103954279712704&amp;w=2"
+        >announcement</a>.
+    </p>
+  </item>
+  <item date="2002-11-23" title="EXLSFO project has been created">
+    <p>
+      The EXSLFO project is a community effort to define functional extensions
+      to thet XSL Formatting Objects specification. See the
+      <a href="http://exslfo.sourceforge.net">EXSLFO website</a> for details.
+    </p>
+  </item>
+  <item date="2002-11-22" title="New Committer">
+    <p>Welcome Victor Mote!</p>
+  </item>
+  <item date="2002-11-09" title="New Committer">
+    <p>Welcome Oleg Tkachenko!</p>
+  </item>
+</news>
\ No newline at end of file
diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml
index 1a5c178e2..29a1e3f98 100644
--- a/src/documentation/content/xdocs/news.xml
+++ b/src/documentation/content/xdocs/news.xml
@@ -23,207 +23,10 @@
     <version>$Revision$</version>
   </header>
   <body>
-    <section>
-      <title>26th March 2007 - Apache FOP 0.95beta Released</title>
-      <p>The Apache FOP team is delighted to present you a beta version of the
-        next production grade release of the new FOP codebase. This release
-        contains many bug fixes and new features. See the <a
-          href="0.95/releaseNotes_0.95beta.html">Release Notes</a> for a list of
-        the most important changes.</p>
-    </section>
-    <section>
-      <title>30 October 2007 - New Committer</title>
-      <p>Welcome Max Berger!</p>
-    </section>
-    <section>
-      <title>15 October 2007 - New Committer</title>
-      <p>Welcome Adrian Cumiskey!</p>
-    </section>
-    <section>
-      <title>24th August 2007 - Apache FOP 0.94 Released</title>
-      <p>The Apache FOP team is pleased to present you the second production
-        grade release of the new FOP codebase. This release contains many bug
-        fixes and new features. See the <a
-          href="0.94/releaseNotes_0.94.html">Release Notes</a> for a list of
-        the most important changes.</p>
-    </section>
-    <section>
-      <title>26 January 2007 - New Committer</title>
-      <p>Welcome Jay Bryant!</p>
-    </section>
-    <section>
-      <title>9 January 2007 - Apache FOP 0.93 released</title>
-      <p>
-        The Apache FOP team is proud to present to you the first
-        production grade release of the new FOP codebase. This release
-        has the new API first introduced in release 0.92 beta. It
-        contains again many bug fixes and new features.
-      </p>
-    </section>
-    <section>
-      <title>16 October 2006 - New Committer</title>
-      <p>Welcome Vincent Hennebert!</p>
-    </section>
-    <section>
-      <title>18 April 2006 - Apache FOP 0.92 beta released</title>
-      <p>
-        A second "beta" grade release of the new FOP codebase with a modified and
-        now considered stable API. The release contains many bug fixes as well as
-        new features mainly related to even more extensive support of the XSL-FO
-        specification. This is expected to be the last "beta" release before we
-        go to a 1.0 release!
-      </p>
-    </section>
-    <section>
-      <title>23 December 2005 - Apache FOP 0.91 beta released</title>
-      <p>
-        One month after the initial release we're happy present a "beta" grade
-        release of the new FOP codebase. It's mostly a bug fix release but also
-        contains a few new features. Thanks to all those who sent us feedback
-        on the initial release!
-      </p>
-    </section>
-    <section>
-      <title>22 November 2005 - Apache FOP 0.90 alpha 1 released</title>
-      <p>
-        The Apache FOP team is proud to present to you the largely rewritten 
-        codebase which is finally in a state where you can start to use it. 
-        It has taken over three years to get this far and over two years 
-        without a new release from the FOP project.
-      </p>
-      <p>
-        Please see also the 
-        <a href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-users/200511.mbox/%3c20051123002157.0EB0.JEREMIAS@apache.org%3e">announcement</a>.
-        <!-- TODO re-enable and the <link href="relnotes.html#FOP+0.90+alpha+1">release notes</link>.-->
-      </p>
-    </section>
-    <section>
-      <title>8 September 2005 - New Committer</title>
-      <p>Welcome Manuel Mall!</p>
-    </section>
-    <section>
-      <title>20 October 2004 - Creation of the Apache XML Graphics project</title>
-      <p>
-        The Apache Board of Directors agreed to the creation of the 
-        <a href="http://xmlgraphics.apache.org">Apache XML Graphics</a>
-        project which will be comprised of Batik and FOP. Both former 
-        Apache XML subprojects are in this way complying with the Board's desire
-        to improve project oversight. Both project teams also see additional
-        benefits of working more closely together.
-      </p>
-    </section>
-    <section>
-      <title>8 October 2004 - New Committer</title>
-      <p>Welcome Luca Furini!</p>
-    </section>
-    <section>
-      <title>24 April 2004 - New Committer</title>
-      <p>Welcome Simon Pepping!</p>
-    </section>
-    <section>
-      <title>7 March 2004 - New Committer</title>
-      <p>Welcome Web Maestro Clay Leeds!</p>
-    </section>
-    <section>
-      <title>10 January 2004 - New Committers</title>
-      <p>Welcome Chris Bowditch and Andreas Delmelle!</p>
-    </section>
-    <section>
-      <title>4 January 2004 - New Committer</title>
-      <p>Welcome Finn Bock!</p>
-    </section>
-    <section>
-      <title>29 November 2003 - New Committer</title>
-      <p>Welcome Peter Herweg!</p>
-    </section>
-    <section>
-      <title>18 July 2003 FOP 0.20.5 released</title>
-      <p>Changes since 0.20.4 include:</p>
-      <ul>
-        <li>Added support for PDF encryption</li>
-        <li>Perfomance tuning</li>
-        <li>Fixed link hotspot positioning</li>
-        <li>Fixed multi-threading issues</li>
-        <li>Added support for CCITT Group 4 encoded TIFF files</li>
-        <li>Dynamic JAI support</li>
-        <li>Added autoselecting portrait/landscape for PCL and PS Renderer</li>
-        <li>Added continued-label extension for tables</li>
-        <li>Improved AWT Font-measuring/rendering</li>
-        <li>Improved marker handling</li>
-        <li>Fixed problem with jpegs with icc profile and acrobat reader 5</li>
-        <li>Added a fontBaseDir property</li>
-        <li>TXTRenderer output encoding</li>
-        <li>border-spacing support</li>
-        <li>and a lot more bugfixes</li>
-      </ul>
-      <p>
-      See also the full text of the
-      <a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=6067">
-        announcement</a>.
-      <!-- TODO re-enable  and the <link href="relnotes.html#FOP+0.20.5">release notes</link>.-->
-      </p>
-    </section>
-    <section>
-      <title>29 June 2003 - New Committer</title>
-      <p>Welcome Glen Mazza!</p>
-    </section>
-    <section>
-      <title>23 May 2003 - FOP 0.20.5 Release Candidate 3 available</title>
-      <p>
-      See the full text of the <a
-      href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=5429">announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>18 February 2003 - FOP 0.20.5 Release Candidate 2 available</title>
-      <p>
-      See the full text of the <a
-      href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listName=fop-dev@xml.apache.org&amp;msgNo=4509">announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>2 February 2003 - New XML PMC</title>
-      <p>
-      Jeremias Maerki and Peter B. West are now representing FOP on the XML PMC.
-      </p>
-    </section>
-    <section>
-      <title>28 January 2003 - FOP logo contest</title>
-      <p>We are looking for a new logo. FOP logo
-      contest is started!</p>
-    </section>
-    <section>
-      <title>23 December 2002 - Official FOP Wiki</title>
-      <p>
-      See <a href="http://wiki.apache.org/xmlgraphics-fop/FOPProjectPages"
-      >FOP project pages</a> at the ApacheWiki.
-      </p>
-    </section>
-    <section>
-      <title>10 December 2002 - FOP 0.20.5 Release Candidate available</title>
-      <p>
-      See the full text of the <a
-      href="http://marc.theaimsgroup.com/?l=fop-user&amp;m=103954279712704&amp;w=2"
-      >announcement</a>.
-      </p>
-    </section>
-    <section>
-      <title>23 November 2002 - EXLSFO project has been created</title>
-      <p>
-      The EXSLFO project is a community effort to define functional extensions
-      to thet XSL Formatting Objects specification. See the
-      <a href="http://exslfo.sourceforge.net">EXSLFO website</a> for details.
-      </p>
-    </section>
-    <section>
-      <title>22 November 2002 - New Committer</title>
-  <p>Welcome Victor Mote!</p>
- </section>
-    <section>
-      <title>9 November 2002 - New Committer</title>
-  <p>Welcome Oleg Tkachenko!</p>
- </section>
-
+    <p>
+      RSS Feed: <a href="subproject-news-feed.rss"><img src="feed-icon-14x14.png" alt="Subproject News Feed"/></a>
+    </p>
+    <xi:include href="cocoon://subproject-news-document.xml#xpointer(/document/body/*)" xmlns:xi="http://www.w3.org/2001/XInclude"/>
     </body>
 </document>
 
diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml
index a65840270..b211c58b0 100644
--- a/src/documentation/content/xdocs/team.xml
+++ b/src/documentation/content/xdocs/team.xml
@@ -31,6 +31,11 @@
       <title>Active Committers</title>
       <note label="Important">Please don't write to any developer directly if you need help on using FOP. Only if you submit questions to the <link href="maillist.html#fop-user">FOP User Mailing List</link> will other FOP users be able to profit from answers given to your question. Another point is that a developer may have gone inactive or is on holidays in which case you may not get an answer in time.</note>
       <ul>
+        <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>
         <li id="cb"><link href="mailto:bowditch_chris@hotmail.com">Chris Bowditch</link> (CB)
             is a Java/VB Programmer from England.</li>
         <li id="jb"><link href="mailto:jay@bryantcs.com">Jay Bryant</link> (JB) is a
@@ -78,11 +83,6 @@
           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>
-        <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">
@@ -131,206 +131,6 @@
         <li id="pbw"><link href="mailto:pbwest@apache.org">Peter B. West</link></li>
       </ul>
     </section>
-    <section id="expertise">
-      <title>Areas of Expertise</title>
-      <table>
-        <tr>
-          <th/>
-          <th>CG</th>
-          <th>FB</th>
-          <th>CL</th>
-          <th>JM</th>
-          <th>VH</th>
-          <th>PH</th>
-          <th>JP</th>
-          <th>SP</th>
-          <th>LF</th>
-          <th>JB</th>
-        </tr>
-        <tr>
-          <td>Release manager</td>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>XSL-FO tree</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td></td>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Properties</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Layout</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-        </tr>
-        <tr>
-          <td>Fonts</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>SVG</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Java2D (AWT)</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>PDF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-        </tr>
-        <tr>
-          <td>PostScript</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>PCL</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>RTF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>MIF</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>AFP</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-        <tr>
-          <td>Forrest</td>
-          <td/>
-          <td/>
-          <td>X</td>
-          <td>X</td>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-          <td/>
-        </tr>
-      </table>
-    </section>
   </body>
 </document>
 
diff --git a/src/documentation/resources/images/feed-icon-14x14.png b/src/documentation/resources/images/feed-icon-14x14.png
new file mode 100644
index 000000000..b3c949d22
--- /dev/null
+++ b/src/documentation/resources/images/feed-icon-14x14.png
diff --git a/src/documentation/resources/stylesheets/news2document.xsl b/src/documentation/resources/stylesheets/news2document.xsl
new file mode 100644
index 000000000..dae1552bd
--- /dev/null
+++ b/src/documentation/resources/stylesheets/news2document.xsl
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:date="http://exslt.org/dates-and-times"
+    extension-element-prefixes="date"
+    version="1.0">
+
+  <date:date-format lang="en" first-day-in-week="monday"/>
+
+  <xsl:template match="news">
+    <document>
+      <header>
+        <title>News</title>
+      </header>
+      <body>
+        <xsl:apply-templates select="item"/>
+      </body>
+    </document>  
+  </xsl:template>
+
+  <xsl:template match="item">
+    <section id="news-{@date}">
+      <title>
+        <xsl:value-of select="date:day-in-month(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:month-abbreviation(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:year(@date)"/>
+        <xsl:text>: </xsl:text>
+        <xsl:value-of select="@title"/>
+      </title>
+      <xsl:copy-of select="."/>
+    </section>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/documentation/resources/stylesheets/news2rss.xsl b/src/documentation/resources/stylesheets/news2rss.xsl
new file mode 100644
index 000000000..d629ba6f4
--- /dev/null
+++ b/src/documentation/resources/stylesheets/news2rss.xsl
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<!--
+  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.
+-->
+<!-- $Id$ -->
+<xsl:stylesheet 
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:date="http://exslt.org/dates-and-times"
+    extension-element-prefixes="date"
+    version="1.0">
+  <xsl:param name="project-name" select="//skinconfig/project-name"/>
+  <xsl:param name="project-url" select="//skinconfig/project-url"/>
+  <xsl:template match="news">
+    <rss version="2.0">
+      <channel>
+        <title><xsl:value-of select="$project-name"/> News</title>
+        <link><xsl:value-of select="$project-url"/></link>
+        <description>
+          Subproject News for <xsl:value-of select="$project-name"/>
+        </description>
+        <language>en</language>
+        <xsl:apply-templates/>
+      </channel>
+    </rss>
+  </xsl:template>
+  <xsl:template match="item">
+    <item>
+      <title>
+        <xsl:value-of select="date:day-in-month(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:month-abbreviation(@date)"/>
+        <xsl:text> </xsl:text>
+        <xsl:value-of select="date:year(@date)"/>
+        <xsl:text>: </xsl:text>
+        <xsl:value-of select="@title"/>
+      </title>
+      <guid>news-<xsl:value-of select="@date"/></guid>
+      <link><xsl:value-of select="$project-url"/>/index.html#news-<xsl:value-of select="@date"/></link>
+      <pubDate><xsl:value-of select="date:format-date(@date, 'EEE, d MMM yyyy HH:mm:ss Z')"/></pubDate>
+      <description>
+        <xsl:apply-templates/>
+      </description>
+    </item>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap
index 470db0b7b..0e845d0bc 100644
--- a/src/documentation/sitemap.xmap
+++ b/src/documentation/sitemap.xmap
@@ -17,6 +17,9 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
+    <map:serializers default="html">
+      <map:serializer name="rss" mime-type="application/rss+xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
+    </map:serializers>
   </map:components>
 
   <map:pipelines>
@@ -69,6 +72,26 @@
         <map:serialize type="xml-document"/>
       </map:match>
     </map:pipeline>
-     
+
+    <!-- This is used by xinclude statements for News-->
+    <map:pipeline>
+      <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-document.xml">
+        <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+        <map:transform src="resources/stylesheets/news2document.xsl" >
+          <map:parameter name="path" value="{1}{2}"/>
+        </map:transform>
+        <map:serialize type="xml"/>
+      </map:match>
+      <map:match type="regexp" pattern="^(.*?)([^/]*)subproject-news-feed.rss">
+        <map:generate src="{properties:content.xdocs}{1}news-data.xml"/>
+        <map:transform src="resources/stylesheets/news2rss.xsl" >
+          <map:parameter name="path" value="{1}{2}"/>
+          <map:parameter name="project-name" value="{properties:projectInfo.project.fullname}"/>
+          <map:parameter name="project-url" value="{properties:projectInfo.project.url}"/>
+        </map:transform>
+        <map:serialize type="rss"/>
+      </map:match>
+    </map:pipeline>
+    
   </map:pipelines>
 </map:sitemap>
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index b9a12fa59..20b12808e 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -378,7 +378,6 @@ which will be used to configure the chosen Forrest skin.
       <height>125</height>
     </credit>
     -->
-    <!--
     <credit box-location="alt2">
       <name>ApacheCon US 2008</name>
       <url>http://us.apachecon.com/</url>
@@ -386,7 +385,6 @@ which will be used to configure the chosen Forrest skin.
       <width>125</width>
       <height>125</height>
     </credit>
-    -->
     
     <credit role="pdf">
       <name>PDF created by Apache FOP</name>