Bugzilla #34316

Documentation improvements
(applied with modifications)
Submitted by: renaud.richardet.at.gmail.com

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

diff --git a/src/documentation/content/xdocs/dev/index.xml b/src/documentation/content/xdocs/dev/index.xml
index 2a9b1ff686e44d64d7a80040cd797a47eab29107..603fbb5befac58ead07374cda2e2fdd1f64492aa 100644 (file)
--- a/src/documentation/content/xdocs/dev/index.xml
+++ b/src/documentation/content/xdocs/dev/index.xml
@@ -30,13 +30,12 @@ This certainly includes programmers, but may also include those contributing to
       <p>For basic and user information on FOP, please visit the <link href="http://xml.apache.org/fop">FOP homepage</link>.</p>
     </section>
     <section id="lines">
-      <title>Development Lines</title>
-      <p>There are currently two lines of development on the FOP product:</p>
+      <title>Development</title>
+      <p>There are currently two branches of FOP :</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 "maintenance branch" 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. 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.</li>
+        <li>The main development line is the future of FOP. 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>
       </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>
     </section>
     <section id="involved">

diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index 1904e3b8669b5360e56d904d5fd9698680ff1cf0..8608754cbe8bb0b2925b4b33392da6a9ba66f2e2 100644 (file)
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-  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.
@@ -132,6 +132,27 @@
         <p>The short answer is "Don't ask." For more details, see <link href="gethelp.html#limitations">Understand FOP's Limitations</link>.</p>
       </answer>
     </faq>
+    <faq id="next-release">
+      <question>When is the next released planned?</question>
+      <answer>
+        <p> This depends on progress made so it is not possible to predict any dates. However, we think that at the
+        current rate of progress we can start releasing again in the second half of 2005. If you want to speed up
+        the process, consider to <link href="dev/index.html#involved">contribute</link> to FOP</p>
+      </answer>
+    </faq>
+    <faq id="redesign">
+      <question>Why did you redesign FOP?</question>
+      <answer>
+        <p>The core redesign of FOP was necessary in order to be able to adress following issues:</p>
+        <ul>
+          <li>Keeps and Breaks</li>
+          <li>XSL-FO Compliance in general</li>
+          <li>Process Files of Arbitrary Size</li>
+          <li>Minimize Memory Use</li>
+          <li>Table Layout</li>
+        </ul>
+      </answer>
+    </faq>
     <faq id="contribute">
       <question>How can I contribute?</question>
       <answer>