Lots of smaller updates:

- mailing list archive links
- XML -> XML Graphics
- Defoe -> Folio
etc.


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

8 files changed, 64 insertions, 42 deletions

diff --git a/src/documentation/content/xdocs/dev/conventions.xml b/src/documentation/content/xdocs/dev/conventions.xml
index 7970077d6..48d5f7291 100644
--- a/src/documentation/content/xdocs/dev/conventions.xml
+++ b/src/documentation/content/xdocs/dev/conventions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -36,9 +36,17 @@
       <title>Java</title>
       <section id="java-style">
         <title>Java Style</title>
-        <p>In order to facilitate the human reading of FOP source code, reduce churning in code, and prevent disputes, the FOP developers have agreed on a set of coding conventions.
-The basis of these coding conventions is documented in the <link href="http://xml.apache.org/source.html">Apache XML Project Guidelines</link>, which requires that <strong>all Java Language source code in the repository must be written in conformance to Sun's</strong> <link href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Code Conventions for the Java Programming Language</link>.
-In addition, the FOP developers have agreed to other conventions, which are summarized in the following table:</p>
+        <p>
+          In order to facilitate the human reading of FOP source code, 
+          reduce churning in code, and prevent disputes, the FOP developers 
+          have agreed on a set of coding conventions. The basis of these coding 
+          conventions is documented in the 
+          <link href="http://xml.apache.org/source.html">Apache XML Project Guidelines</link>, 
+          which requires that <strong>all Java Language source code in the repository 
+          must be written in conformance to Sun's</strong> 
+          <link href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Code Conventions for the Java Programming Language</link>.
+          In addition, the FOP developers have agreed to other conventions, 
+          which are summarized in the following table:</p>
         <table>
           <tr>
             <th>Convention</th>
@@ -146,9 +154,8 @@ Printing error messages to System.err or System.out is useless in a server-side
       <section id="java-links">
         <title>Related Links</title>
         <ul>
-          <li><jump href="http://xml.apache.org/source.html">Apache Source Repositories</jump></li>
+          <li><jump href="http://xmlgraphics.apache.org/repo.html">Apache XML Graphics Code Repositories</jump></li>
           <li><jump href="http://jakarta.apache.org/site/faqs.html#Coding%20Conventions%20and%20Standards">Jakarta Code Conventions and Standards</jump> (see Coding Conventions and Standards section)</li>
-          <li><jump href="http://jakarta.apache.org/avalon/code-standards.html">Avalon Project - Coding Standards</jump></li>
         </ul>
       </section>
     </section>
diff --git a/src/documentation/content/xdocs/dev/index.xml b/src/documentation/content/xdocs/dev/index.xml
index ceffb3eaa..2a9b1ff68 100644
--- a/src/documentation/content/xdocs/dev/index.xml
+++ b/src/documentation/content/xdocs/dev/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -86,49 +86,55 @@ Appropriate mailing lists for these topics can be found on the <link href="../ma
           <li>
 To review the archives, you have several options:
             <ul>
-              <li>The <link href="http://marc.theaimsgroup.com/?l=fop-dev&amp;r=1&amp;w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).
+              <li>
+                The <link href="http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-dev/">Apache Mailing List archive (mod_mbox)</link>.
+              </li>
+              <li>
+                The <link href="http://xmlgraphics.apache.org/mail/fop-dev/">Apache Mailing List archive (gzipped mbox files)</link>.
               </li>
               <li>
-The <link href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=fop-dev@xml.apache.org">Apache Eyebrowse</link> archive (search, list by date, author, subject, or thread).
+                The <link href="http://marc.theaimsgroup.com/?l=fop-dev&amp;r=1&amp;w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).
               </li>
               <li>
-The <link href="http://xml.apache.org/mail/fop-dev/">Apache Mailing List archive</link>.
+                The <link href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=fop-dev@xml.apache.org">Apache Eyebrowse</link> archive (search, list by date, author, subject, or thread).
               </li>
             </ul>
           </li>
           <li>Before posting questions to any list, see "<link href="../maillist.html#general">General Information</link>".</li>
           <li>
-See <link href="http://xml.apache.org/mail.html#fop-dev_fop-cvs">Apache XML Mailing Lists</link>
+See <link href="http://xmlgraphics.apache.org/mail.html">Apache XML Graphics Mailing Lists</link>
 for detailed subscription information.
           </li>
           <li>
-To subscribe (digest only): Send email to <link href="mailto:fop-dev-digest-subscribe@xml.apache.org">fop-dev-digest-subscribe@xml.apache.org</link>.
+To subscribe (digest only): Send email to <link href="mailto:fop-dev-digest-subscribe@xmlgraphics.apache.org">fop-dev-digest-subscribe@xmlgraphics.apache.org</link>.
           </li>
           <li>
-To subscribe fully: Send email to <link href="mailto:fop-dev-subscribe@xml.apache.org">fop-dev-subscribe@xml.apache.org</link>.
+To subscribe fully: Send email to <link href="mailto:fop-dev-subscribe@xmlgraphics.apache.org">fop-dev-subscribe@xmlgraphics.apache.org</link>.
           </li>
           <li>
-For standard help: Send email to <link href="mailto:fop-dev-help@xml.apache.org">fop-dev-help@xml.apache.org</link>.
+For standard help: Send email to <link href="mailto:fop-dev-help@xmlgraphics.apache.org">fop-dev-help@xmlgraphics.apache.org</link>.
           </li>
           <li>
-To unsubscribe: Send email to <link href="mailto:fop-dev-unsubscribe@xml.apache.org">fop-dev-unsubscribe@xml.apache.org</link>.
+To unsubscribe: Send email to <link href="mailto:fop-dev-unsubscribe@xmlgraphics.apache.org">fop-dev-unsubscribe@xmlgraphics.apache.org</link>.
           </li>
         </ul>
+        <note>The Eyebrowse and MARC archives are currently broken!</note>
       </section>
       <section id="mail-fop-cvs">
         <title>Subscribe to the fop-cvs Mailing List</title>
         <p>When changes are committed to the code repository, a record of the diffs is emailed to the fop-cvs mailing list. FOP developers are encouraged to subscribe to this list because it helps in following the progress of the project.
         </p>
         <ul>
+          <li>Review the archives at <link href="http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-commits/">http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-commits/</link> (mod_mbox).</li>
           <li>Review the archives at <link href="http://marc.theaimsgroup.com/?l=fop-cvs&amp;r=1&amp;w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).</li>
-          <li>Subscribe by sending an email to <link href="mailto:fop-cvs-subscribe@xml.apache.org">fop-cvs-subscribe@xml.apache.org</link>.</li>
+          <li>Subscribe by sending an email to <link href="mailto:fop-commits-subscribe@xmlgraphics.apache.org">fop-commits-subscribe@xmlgraphics.apache.org</link>.</li>
         </ul>
       </section>
       <section id="dev-code">
         <title>Download and Use the Developers' Code Using CVS</title>
         <p>Between releases the newest code can be accessed via cvs. To do this you need to install a cvs
      client on your computer, if it is not already there. An explanation how to connect to the
-     FOP source repository can be found at <link href="http://xml.apache.org/cvs.html">http://xml.apache.org/cvs.html</link>.
+     FOP source repository can be found at <link href="http://xmlgraphics.apache.org/repo.html">http://xmlgraphics.apache.org/repo.html</link>.
      An introduction into cvs and the cvs manual can be found in the
      <link href="http://xml.apache.org/library.html">reference library</link>.</p>
       </section>
diff --git a/src/documentation/content/xdocs/dev/tools.xml b/src/documentation/content/xdocs/dev/tools.xml
index 76908f7ca..bbec5351e 100644
--- a/src/documentation/content/xdocs/dev/tools.xml
+++ b/src/documentation/content/xdocs/dev/tools.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@
       <title>Concurrent Versions System (CVS)</title>
       <section id="cvs_general">
         <title>General</title>
-        <p>Visit <link href="http://xml.apache.org/cvs.html">Apache XML CVS Repositories</link> for useful information.</p>
+        <p>Visit <link href="http://xmlgraphics.apache.org/repo.html">Apache XML Graphics Code Repositories</link> for useful information.</p>
         <p>You will need a CVS client to be able to gain access to the FOP repository. For general CVS information, visit <link href="http://www.cvshome.org">CVS Home</link>. Nice GUI clients for Windows can be found at <link href="http://www.wincvs.org">WinCVS</link> and for Mac (68k, PPC) and Mac OS X from <link href="http://www.heilancoo.net/MacCVSClient/">MacCVSClient</link>.</p>
         <p>Regardless of what platform you develop on, please be sure to submit patches that use Unix line endings. If you are using WinCVS or MacCVSClient, check code out this way by going to the Admin / Preferences menu item, clicking on the "Globals" tab, then select the "Checkout text files with the Unix LF (0xa)" option. You will also need to use an editor that supports opening and saving files using Unix line endings.</p>
       </section>
@@ -113,6 +113,7 @@ RCS is used by CVS for its file operations (CVS is kind of a wrapper around RCS)
       <p>See <link href="http://jakarta.apache.org/site/idedevelopers.html">the Apache Jakarta IDE Developer's Guide</link> for useful information on Java IDEs.</p>
       <p>Borland's JBuilder 7/8 does not support Ant builds unless you have the Enterprise Edition (which is quite expensive). This causes problems with any code that is generated by the Ant build. First, you must run the Ant build before you can use the IDE. Second, when you are editing in the IDE, you must be editing the generated files, which means that you must make any changes to the source files in another editor. This is less serious for development on the trunk, but in the maintenance branch, all source files were "generated".</p>
       <p>Sun ONE Studio Four does support Ant, but seems to use a built-in version, and as of this writing chokes on the FOP build file, saying that it is not valid. There is awkward because there is no official DTD for Ant, and it may be merely an Ant version issue.</p>
+      <p>Additional notes on setting up FOP within an IDE (ex. Eclipse) in the <fork href="http://wiki.apache.org/xmlgraphics-fop/FOPIDESetupGuide">Wiki</fork>.</p>
     </section>
   </body>
 </document>
diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml
index 553ae6e93..75b29cddf 100644
--- a/src/documentation/content/xdocs/index.xml
+++ b/src/documentation/content/xdocs/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
        Support for each of the standard's objects and properties is detailed in <link href="compliance.html">FOP Compliance</link>.
        <link href="download.html">Download</link> options include a precompiled version, source code, and many example files to get you started. <link href="resources.html">Resources</link> include links to XSL-FO introductions and many other useful references. A checklist for <link href="gethelp.html">Getting Help</link> will guide you toward maximizing the usefulness of FOP.
     </p>
-    <p>FOP is proud to be part of <link href="http://xml.apache.org">Apache's XML project</link>.
+    <p>FOP is proud to be part of <link href="http://xmlgraphics.apache.org">Apache's XML Graphics project</link>.
     </p>
     </section>
 
diff --git a/src/documentation/content/xdocs/resources.xml b/src/documentation/content/xdocs/resources.xml
index c974ea1b0..48aaf616d 100644
--- a/src/documentation/content/xdocs/resources.xml
+++ b/src/documentation/content/xdocs/resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
+  Copyright 1999-2005 The Apache Software Foundation
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -15,8 +15,7 @@
   limitations under the License.
 -->
 <!-- $Id$ -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN"
-    "document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd">
 <!-- FOP Relevant Specifications and links -->
 <document>
   <header>
@@ -53,6 +52,8 @@
         <title>Java</title>
         <ul>
           <li><jump href="http://java.sun.com/j2se/1.3/docs/api/index.html">Java JDK 1.3 Documentation</jump></li>
+          <li><jump href="http://java.sun.com/j2se/1.4/docs/api/index.html">Java JDK 1.4 Documentation</jump></li>
+          <li><jump href="http://java.sun.com/j2se/1.5/docs/api/index.html">Java JDK 1.5 Documentation</jump></li>
         </ul>
       </section>
       <section id="specs-pdf">
@@ -150,16 +151,20 @@
         <ul>
           <li>[mailing list info] <jump href="http://xml.apache.org/fop/maillist.html">http://xml.apache.org/fop/maillist.html</jump></li>
           <ul>
-            <li>[fop-user archives] <jump href="http://marc.theaimsgroup.com/?l=fop-user">http://marc.theaimsgroup.com/?l=fop-user</jump></li>
-            <li>[fop-user gzip'd archives] <jump href="http://xml.apache.org/mail/fop-user/">http://xml.apache.org/mail/fop-user/</jump></li>
-            <li>[fop-user-subscribe] <jump href="mailto:fop-user-subscribe@xml.apache.org">fop-user-subscribe@xml.apache.org</jump></li>
-            <li>[fop-user-digest-subscribe] <jump href="mailto:fop-user-digest-subscribe@xml.apache.org">fop-user-digest-subscribe@xml.apache.org</jump></li>
+            <li>[fop-users mod_mbox archives] <jump href="http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-users/">http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-users/</jump></li>
+            <li>[fop-users archives] <jump href="http://marc.theaimsgroup.com/?l=fop-user">http://marc.theaimsgroup.com/?l=fop-user</jump></li>
+            <li>[fop-users gzip'd archives] <jump href="http://xmlgraphics.apache.org/mail/fop-users/">http://xmlgraphics.apache.org/mail/fop-users/</jump></li>
+            <li>[fop-users-subscribe] <jump href="mailto:fop-users-subscribe@xmlgraphics.apache.org">fop-users-subscribe@xmlgraphics.apache.org</jump></li>
+            <li>[fop-users-digest-subscribe] <jump href="mailto:fop-users-digest-subscribe@xmlgraphics.apache.org">fop-users-digest-subscribe@xmlgraphics.apache.org</jump></li>
+            <li>[fop-users-unsubscribe] <jump href="mailto:fop-users-unsubscribe@xmlgraphics.apache.org">fop-users-subscribe@xmlgraphics.apache.org</jump></li>
           </ul>
           <ul>
+            <li>[fop-dev mod_mbox archives] <jump href="http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-dev/">http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-dev/</jump></li>
             <li>[fop-dev archives] <jump href="http://marc.theaimsgroup.com/?l=fop-dev">http://marc.theaimsgroup.com/?l=fop-dev</jump></li>
-            <li>[fop-dev gzip'd archives] <jump href="http://xml.apache.org/mail/fop-dev/">http://xml.apache.org/mail/fop-dev/</jump></li>
-            <li>[fop-dev-subscribe] <jump href="mailto:fop-dev-subscribe@xml.apache.org">fop-dev-subscribe@xml.apache.org</jump></li>
-            <li>[fop-dev-digest-subscribe] <jump href="mailto:fop-dev-digest-subscribe@xml.apache.org">fop-dev-digest-subscribe@xml.apache.org</jump></li>
+            <li>[fop-dev gzip'd archives] <jump href="http://xmlgraphics.apache.org/mail/fop-dev/">http://xmlgraphics.apache.org/mail/fop-dev/</jump></li>
+            <li>[fop-dev-subscribe] <jump href="mailto:fop-dev-subscribe@xmlgraphics.apache.org">fop-dev-subscribe@xmlgraphics.apache.org</jump></li>
+            <li>[fop-dev-digest-subscribe] <jump href="mailto:fop-dev-digest-subscribe@xmlgraphics.apache.org">fop-dev-digest-subscribe@xmlgraphics.apache.org</jump></li>
+            <li>[fop-dev-unsubscribe] <jump href="mailto:fop-dev-unsubscribe@xmlgraphics.apache.org">fop-dev-unsubscribe@xmlgraphics.apache.org</jump></li>
           </ul>
         </ul>
       </section>
@@ -191,7 +196,7 @@
           <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.krysalis.org">Barcode4J</jump> (formerly Krysalis Barcode) is a barcode generator which can be used with FOP (Apache-style license).</li>
+          <li>[software] <jump href="http://barcode4j.krysalis.org">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://afp-renderer.sourceforge.net/">AFP Renderer</jump> renders formatted objects to AFP or (MO:DCA).</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>        
@@ -218,8 +223,8 @@
       <section id="products-other">
         <title>Other products</title>
         <ul>
-          <li>[software] <jump href="http://foray.sourceforge.net/">FOray</jump> a renderer for converting XML files to PDF via XSL Formatting Object elements</li>
-          <li>[software] <jump href="http://defoe.sourceforge.net/">Defoe</jump> a renderer for XML files containing Formatting Object elements (aka FOP Alt.Design)</li>
+          <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>[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>
diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml
index 3dbe57f11..0bf04bd22 100644
--- a/src/documentation/content/xdocs/team.xml
+++ b/src/documentation/content/xdocs/team.xml
@@ -24,7 +24,10 @@
     <version>$Revision$</version>
   </header>
   <body>
-    <p>All lists on this page are in alphabetical order. Some of them may be incomplete. If you know of an error or omission, please send a message to the <link href="mailto:fop-dev@xml.apache.org">fop-dev</link> mailing list.</p>
+    <p>
+      All lists on this page are in alphabetical order. Some of them may be incomplete.
+      If you know of an error or omission, please send a message to the 
+      <link href="mailto:fop-dev@xmlgraphics.apache.org">fop-dev</link> mailing list.</p>
     <section id="commit-active">
       <title>Active Committers</title>
       <ul>
diff --git a/src/documentation/resources/images/group-logo.gif b/src/documentation/resources/images/group-logo.gif
index 8c56dc678..2603d2733 100644
--- a/src/documentation/resources/images/group-logo.gif
+++ b/src/documentation/resources/images/group-logo.gif
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index 037466a49..fb75b2ffa 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -74,9 +74,9 @@ which will be used to configure the chosen Forrest skin.
 
   <!-- optional group logo
        default skin: renders it at the top-left corner -->
-  <group-name>Apache XML</group-name>
-  <group-description>The Apache XML Project provides commercial-quality standards-based XML solutions that are developed in an open and cooperative fashion, provides feedback to standards bodies (such as IETF and W3C) from an implementation perspective, and is a focus for XML-related activities within Apache projects</group-description>
-  <group-url>http://xml.apache.org/</group-url>
+  <group-name>Apache XML Graphics</group-name>
+  <group-description>Apache XML Graphics is responsible for the creation and maintenance of software for managing the conversion of XML formats to graphical output, and the creation and maintenance of related software components, based on software licensed to the Foundation</group-description>
+  <group-url>http://xmlgraphics.apache.org/</group-url>
   <group-logo>images/group-logo.gif</group-logo>
   <!-- Alternative static image:
   <group-logo>images/group-logo.gif</group-logo> -->
@@ -105,9 +105,9 @@ which will be used to configure the chosen Forrest skin.
     For some skins just set the attributes to blank.
   -->
   <trail location="alt">
-    <link1 name="apache" href="http://www.apache.org/"/>
-    <link2 name="xml.apache" href="http://xml.apache.org/"/>
-    <link3 name="xmlgraphics.apache" href="http://xmlgraphics.apache.org/"/>
+    <link1 name="apache.org" href="http://www.apache.org/"/>
+    <link2 name="XML Federation" href="http://xml.apache.org/"/>
+    <link3 name="xmlgraphics.apache.org" href="http://xmlgraphics.apache.org/"/>
   </trail>
 
   <!-- Configure the TOC, i.e. the Table of Contents.
@@ -119,7 +119,7 @@ which will be used to configure the chosen Forrest skin.
   @location ("page","menu","page,menu", "none")
    Where to show the TOC.
   -->
-  <toc max-depth="2" min-sections="1" location="page"/>
+  <toc max-depth="2" min-sections="3" location="page"/>
 
   <!-- Heading types can be clean|underlined|boxed  -->
   <headings type="underlined"/>