From: Clay Leeds <clay@apache.org>
Date: Sat, 20 Nov 2004 14:56:32 +0000 (+0000)
Subject: * removed alt.design
X-Git-Tag: Root_Temp_KnuthStylePageBreaking~349
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e0a17efd5229f18d3a555c300a8bba105d237e3a;p=xmlgraphics-fop.git

* removed alt.design
* changed nagoya.a.o to mail-archives.a.o


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

diff --git a/src/documentation/content/xdocs/dev/index.xml b/src/documentation/content/xdocs/dev/index.xml
index 75e1bac56..ceffb3eaa 100644
--- a/src/documentation/content/xdocs/dev/index.xml
+++ b/src/documentation/content/xdocs/dev/index.xml
@@ -31,11 +31,10 @@ This certainly includes programmers, but may also include those contributing to
     </section>
     <section id="lines">
       <title>Development Lines</title>
-      <p>There are currently three lines of development on the FOP product:</p>
+      <p>There are currently two lines of development on the FOP product:</p>
       <ul>
         <li>The oldest is the one that releases are currently generated from, and is also called the "maintenance branch". Because of limitations in its design, the FOP committers decided to freeze new development on this branch, and are providing only bug fixes. This branch is tagged as "fop-0_20_2-maintain" in the CVS repository.</li>
         <li>The main development line is the future of FOP. It was spawned from the "maintenance" branch, but had to quickly be "broken" so that the needed redesign could be dropped into place. It is currently not as mature as the "maintenance" branch, but has far greater long-term prospects. It is also known as the "root" or "trunk" or "redesign".</li>
-        <li>The "Alt Design" is exactly that: an alternative design approach. Because its efforts are largely complementary and parallel to the main development branch, and because it is expected to be merged at some point into the trunk, it is <link href="../design/alt.design/index.html">documented separately</link>. The authors of this effort are currently in the process of merging their work into the trunk.</li>
       </ul>
       <p>Please note that patches for enhancements to the maintenance branch will generally not be considered. Bug fixes are welcome there, but new developers are strongly encouraged to apply their efforts to the trunk development line.</p>
       <p>Because there is a fair amount of common information between the maintenance and trunk development lines, we attempt to document them together, highlighting differences only where needed.</p>
@@ -90,7 +89,7 @@ To review the archives, you have several options:
               <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>
               <li>
-The <link href="http://nagoya.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://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>
               <li>
 The <link href="http://xml.apache.org/mail/fop-dev/">Apache Mailing List archive</link>.