You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-svn@forrest.apache.org by cr...@apache.org on 2007/04/10 06:44:05 UTC

svn commit: r527020 [13/20] - in /forrest/site: ./ docs_0_80/ docs_0_80/howto/ docs_0_80/howto/cvs-ssh/ docs_0_80/howto/multi/ dtdx/ plan/ pluginDocs/plugins_0_70/ pluginDocs/plugins_0_80/ procedures/ procedures/release/ skins/ tools/

Modified: forrest/site/dtdx/document-v20.txt
URL: http://svn.apache.org/viewvc/forrest/site/dtdx/document-v20.txt?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/dtdx/document-v20.txt (original)
+++ forrest/site/dtdx/document-v20.txt Mon Apr  9 21:44:00 2007
@@ -41,11 +41,13 @@
   -------------------------
 
     This is a simple paragraph. Most documents contain a fair amount of 
-    paragraphs. Paragraphs are called <p>.
+    paragraphs. Paragraphs are called <p>. 
 
-With the <p xml:space="preserve"> attribute, you can declare
-        that whitespace should    be   preserved, without implying it is in any other
-        way special.
+
+          With the <p xml:space="preserve"> attribute, you can declare
+          that whitespace should    be   preserved, without implying it is in any other
+          way special.
+        
 
     This next paragraph has a class attribute of 'quote'. CSS can be 
     used to present this <p class='quote'> in a different style than 
@@ -60,7 +62,7 @@
     potatoes, shrimp burger, shrimp sandwich. That- that's about it. 
 
     A number of in-line elements are available in the DTD, we will show 
-    them inside an unordered list (<ul>):
+    them inside an unordered list (<ul>): 
 
     * Here is a simple list item (<li>).
     * Have you seen the use of the <code> element in the previous item?
@@ -68,7 +70,7 @@
       text baseline.
     * There is a facility to emphasize certain words using the <em> <strong> 
       elements.
-    * We can use [Icon: feather] <icon>s too.
+    * We can use [Icon: feather]<icon>s too.
     * Another possibility is the <img> element: [Image: another feather], 
       which offers the ability to refer to an image map.
     * We have elements for hyperlinking: 
@@ -107,17 +109,17 @@
       
 
     So far for the in-line elements, let's look at some paragraph-level 
-    elements.
+    elements. 
 
                                 ** Fixme (SN) **
     The <fixme> element is used for stuff which still needs work. Mind 
-    the author attribute!
+    the author attribute! 
     ------------------------------------------------------------------------
 
                                    ** Note **
     Use the <note> element to draw attention to something, e.g. ...The 
     <code> element is used when the author can't express himself 
-    clearly using normal sentences ;-)
+    clearly using normal sentences ;-) 
     ------------------------------------------------------------------------
 
                                  ** Warning **
@@ -130,7 +132,7 @@
     using the label attribute. 
     ------------------------------------------------------------------------
 
-    Apart from unordered lists, we have ordered lists too, of course.
+    Apart from unordered lists, we have ordered lists too, of course. 
 
     1. Item 1
     2. Item 2
@@ -142,12 +144,12 @@
     This sample document, written in document-v20 XML can be presented 
     via Forrest in a number of different formats. The links in the 
     following list show this document in each of the currently 
-    available formats.
+    available formats. 
 
     Each of the formats can be made available as a link near the top of 
     the page. Actual placement of those links depends on the skin 
     currently in use. Those links are enabled in the skinconf.xml via 
-    the <disable-XXX-link> elements in the skinconf.xml
+    the <disable-XXX-link> elements in the skinconf.xml 
     
     +--------------------+--------------------+--------------------+
     | Presentation       | Description        | skinconf.xml       |
@@ -193,6 +195,7 @@
     |                    | information see    |                    |
     |                    | the Forrest        |                    |
     |                    | pod-output plugin. |                    |
+    |                    |                    |                    |
     +--------------------+--------------------+--------------------+
     
 
@@ -206,18 +209,18 @@
   Sections, the sequel
   --------------------
 
-    Just some second section.
+    Just some second section. 
 
     Section 2.1
     .-.-.-.-.-.
 
-      Which contains a subsection (2.1).
+      Which contains a subsection (2.1). 
 
   Showing preformatted source code
   --------------------------------
 
     Enough about these sections. Let's have a look at more interesting 
-    elements, <source> for instance:
+    elements, <source> for instance: 
     
     // This example is from the book _Java in a Nutshell_ by David Flanagan.
     // Written by David Flanagan.  Copyright (c) 1996 O'Reilly & Associates.
@@ -240,19 +243,21 @@
     write pointy brackets without needing to escape them with messy 
     &lt; entities ... 
     
+    
     <pointy>
       easy
     </pointy>
     
+            
 
 
     Please take care to still use a sensible line-length within your 
-    source elements.
+    source elements. 
 
   Using tables
   ------------
 
-    And now for a table:
+    And now for a table: 
     Table caption
     +--------------------+--------------------+--------------------+
     | heading cell 1     | heading cell 2     | heading cell 3     |
@@ -288,7 +293,7 @@
     those elements no longer exist but the functionality can be 
     duplicated by using the @class attribute. Even though the opening 
     of separate windows should be under the control of the user, these 
-    techniques can still be employed.
+    techniques can still be employed. 
     
     +--------------------------------+--------------------------------+
     | Document V1.3                  | Document V2.0                  |
@@ -313,7 +318,7 @@
   Changes between document-v13 and document-v20
   ---------------------------------------------
 
-    * Renamed <link> to <a> 
+    * Renamed <link> to <a>
     * Removed <fork> and <jump> in favour of the <a> element. See 
       demonstration using class attribute on links [Link: #link-class]. 
 

Modified: forrest/site/dtdx/document-v20.xml
URL: http://svn.apache.org/viewvc/forrest/site/dtdx/document-v20.xml?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/dtdx/document-v20.xml (original)
+++ forrest/site/dtdx/document-v20.xml Mon Apr  9 21:44:00 2007
@@ -14,219 +14,244 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --><!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "document-v13.dtd">
-<document> 
-  <header> 
-    <title>The Apache Forrest xdocs document-v2.0 DTD</title> 
+<document>
+  <header>
+    <title>The Apache Forrest xdocs document-v2.0 DTD</title>
     <notice>The content of this document doesn't make any sense at all.</notice>
-    <abstract>This is a demonstration document using all possible elements in
-      the current Apache Forrest xdocs <code>document-v20.dtd</code>
-    </abstract> 
-  </header> 
-  <body> 
-    <note>
+    <abstract>
       This is a demonstration document using all possible elements in the
       current Apache Forrest xdocs <code>document-v20.dtd</code>
-      (See the <link href="#changes">DTD changes</link> section at the bottom.)
+    </abstract>
+  </header>
+  <body>
+    <note>
+      This is a demonstration document using all possible elements in the
+      current Apache Forrest xdocs <code>document-v20.dtd</code> (See the
+      <link href="#changes">DTD changes</link> section at the bottom.)
     </note>
     <section id="sample">
       <title>Sample Content</title>
-      <p><strong>Hint:</strong> See the xml source to see how the various
-      elements are used and see the
-      <link href="site:dtd-docs">DTD reference documentation</link>.
+      <p>
+        <strong>Hint:</strong> See the xml source to see how the various
+        elements are used and see the <link href="site:dtd-docs">DTD reference
+        documentation</link>.
       </p>
       <section id="block-inline">
         <title>Block and inline elements</title>
-      <p>This is a simple paragraph. Most documents contain a fair amount of
-        paragraphs. Paragraphs are called <code>&lt;p&gt;</code>.</p> 
-      <p xml:space="preserve">With the <code>&lt;p xml:space="preserve"&gt;</code> attribute, you can declare
-        that whitespace should    be   preserved, without implying it is in any other
-        way special.</p>
-      <p>
-        This next paragraph has a class attribute of 'quote'.  CSS can
-        be used to present this <code>&lt;p class='quote'&gt;</code> in
-        a different style than the other paragraphs.  The handling of
-        this quoted paragraph is defined in the &lt;extra-css&gt;
-        element in the skinconf.xml.
-      </p>
-      <p class="quote">
-        Anyway, like I was sayin', shrimp is the fruit of the sea. You can
-        barbecue it, boil it, broil it, bake it, sautee it. Dey's uh,
-        shrimp-kabobs, shrimp creole, shrimp gumbo. Pan fried, deep fried,
-        stir-fried. There's pineapple shrimp, lemon shrimp, coconut shrimp,
-        pepper shrimp, shrimp soup, shrimp stew, shrimp salad, shrimp and
-        potatoes, shrimp burger, shrimp sandwich. That- that's about it.
-      </p>
-      <p>A number of in-line elements are available in the DTD, we will show them
-        inside an unordered list (<code>&lt;ul&gt;</code>):</p> 
-      <ul> 
-        <li>Here is a simple list item (<code>&lt;li&gt;</code>).</li> 
-        <li>Have you seen the use of the <code>&lt;code&gt;</code> element in the
-          previous item?</li> 
-        <li>Also, we have <code>&lt;sub&gt;</code> and <code>&lt;sup&gt;</code>
+        <p>
+          This is a simple paragraph. Most documents contain a fair amount of
+          paragraphs. Paragraphs are called <code>&lt;p&gt;</code>.
+        </p>
+        <p xml:space="preserve">
+          With the <code>&lt;p xml:space="preserve"&gt;</code> attribute, you can declare
+          that whitespace should    be   preserved, without implying it is in any other
+          way special.
+        </p>
+        <p>
+          This next paragraph has a class attribute of 'quote'. CSS can be used
+          to present this <code>&lt;p class='quote'&gt;</code> in a different
+          style than the other paragraphs. The handling of this quoted paragraph
+          is defined in the &lt;extra-css&gt; element in the skinconf.xml.
+        </p>
+        <p class="quote">
+          Anyway, like I was sayin', shrimp is the fruit of the sea. You can
+          barbecue it, boil it, broil it, bake it, sautee it. Dey's uh,
+          shrimp-kabobs, shrimp creole, shrimp gumbo. Pan fried, deep fried,
+          stir-fried. There's pineapple shrimp, lemon shrimp, coconut shrimp,
+          pepper shrimp, shrimp soup, shrimp stew, shrimp salad, shrimp and
+          potatoes, shrimp burger, shrimp sandwich. That- that's about it.
+        </p>
+        <p>
+          A number of in-line elements are available in the DTD, we will show
+          them inside an unordered list (<code>&lt;ul&gt;</code>):
+        </p>
+        <ul>
+          <li>Here is a simple list item (<code>&lt;li&gt;</code>).</li>
+          <li>Have you seen the use of the <code>&lt;code&gt;</code> element in the
+          previous item?</li>
+          <li>Also, we have <code>&lt;sub&gt;</code> and <code>&lt;sup&gt;</code>
           elements to show content <sup>above</sup> or <sub>below</sub> the text
-          baseline.</li> 
-        <li>There is a facility to <em>emphasize</em> certain words using the
-          <code>&lt;em&gt;</code> <strong><code>&lt;strong&gt;</code></strong>
-          elements.</li> 
-        <li>We can use
-          <icon height="22" width="26" src="images/icon.png" alt="feather"/>
-          <code>&lt;icon&gt;</code>s too.</li> 
-        <li>Another possibility is the <code>&lt;img&gt;</code> element:
+          baseline.</li>
+          <li>There is a facility to <em>emphasize</em> certain words using the
+          <code>&lt;em&gt;</code><strong><code>&lt;strong&gt;</code></strong>
+          elements.</li>
+          <li>We can use
+          <icon height="22" width="26" src="images/icon.png" alt="feather"/><code>&lt;icon&gt;</code>s too.</li>
+          <li>Another possibility is the <code>&lt;img&gt;</code> element:
           <img src="images/icon.png" alt="another feather" height="22" width="26"/>,
-          which offers the ability to refer to an image map.</li> 
-        <li>We have elements for hyperlinking: 
-          <dl> 
-            <dt><code>&lt;a href="../index.html"&gt;</code></dt> 
-            <dd>Use this to
+          which offers the ability to refer to an image map.</li>
+          <li>We have elements for hyperlinking: 
+          <dl>
+              <dt><code>&lt;a href="../index.html"&gt;</code></dt>
+              <dd>Use this to
               <link href="../index.html" title="Example of a document via link">link</link>
               to another document. As per normal, this will open the new document
-              in the same browser window.</dd> 
-
-            <dt><code>&lt;a href="#section"&gt;</code></dt> 
-            <dd>Use this to
+              in the same browser window.</dd>
+              <dt><code>&lt;a href="#section"&gt;</code></dt>
+              <dd>Use this to
               <link href="#section" title="Example of a document via local anchor">link</link>
               to the named anchor in the current document.
-            </dd> 
-
-            <dt><code>&lt;a href="../index.html#status"&gt;</code></dt> 
-            <dd>Use this to
+            </dd>
+              <dt><code>&lt;a href="../index.html#status"&gt;</code></dt>
+              <dd>Use this to
               <link href="../index.html#status" title="Example of a document via link and anchor">link</link>
               to another document and go to the named anchor. This will open
               the new document in the same browser window.
-            </dd> 
-            <dt>Targetted window control with jump and fork.</dt> 
-            <dd>See demonstration
+            </dd>
+              <dt>Targetted window control with jump and fork.</dt>
+              <dd>See demonstration
              <link href="#link-class">using class attribute on links</link>.
-            </dd> 
-        </dl></li> 
-
-        <li>Oh, by the way, a definition list <code>&lt;dl&gt;</code> was used inside
+            </dd>
+            </dl></li>
+          <li>Oh, by the way, a definition list <code>&lt;dl&gt;</code> was used inside
           the previous list item. We could put another 
-          <ul> 
-            <li>unordered list</li> 
-            <li>inside the list item</li> 
-          </ul>
-          <table>
-            <caption>A sample nested table</caption>
-            <tr><td colspan="1" rowspan="1">Or even tables.. </td><td colspan="1" rowspan="1">
-                <table><tr><td colspan="1" rowspan="1">inside tables..</td></tr></table>
-            </td></tr>
-            <tr><td colspan="1" rowspan="1">or inside lists, but I believe this liberty gets quickly quite
-                hairy as you see.</td></tr>
-          </table>
-        </li>
-      </ul> 
-      <p>So far for the in-line elements, let's look at some paragraph-level
-        elements.</p> 
-      <fixme author="SN">The <code>&lt;fixme&gt;</code> element is used for stuff
-        which still needs work. Mind the <code>author</code> attribute!</fixme> 
-      <note>Use the <code>&lt;note&gt;</code> element to draw attention to something, e.g. ...The <code>&lt;code&gt;</code> element is used when the author can't
-        express himself clearly using normal sentences ;-)</note>
-      <warning>Sleep deprivation can be the result of being involved in an open
-        source project. (a.k.a. the <code>&lt;warning&gt;</code> element).
-      </warning>
-      <note label="Important">If you want your own labels for notes and
-        warnings, specify them using the <code>label</code> attribute.
-      </note>
-      <p>Apart from unordered lists, we have ordered lists too, of course.</p> 
-      <ol> 
-        <li>Item 1</li> 
-        <li>Item 2</li> 
-        <li>This should be 3 if my math is still OK.</li> 
-      </ol>
+          <ul>
+              <li>unordered list</li>
+              <li>inside the list item</li>
+            </ul>
+            <table>
+              <caption>A sample nested table</caption>
+              <tr>
+                <td colspan="1" rowspan="1">Or even tables.. </td>
+                <td colspan="1" rowspan="1">
+                  <table>
+                    <tr>
+                      <td colspan="1" rowspan="1">inside tables..</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td colspan="1" rowspan="1">or inside lists, but I believe this liberty gets quickly quite
+                hairy as you see.</td>
+              </tr>
+            </table></li>
+        </ul>
+        <p>
+          So far for the in-line elements, let's look at some paragraph-level
+          elements.
+        </p>
+        <fixme author="SN">
+          The <code>&lt;fixme&gt;</code> element is used for stuff which still
+          needs work. Mind the <code>author</code> attribute!
+        </fixme>
+        <note>
+          Use the <code>&lt;note&gt;</code> element to draw attention to
+          something, e.g. ...The <code>&lt;code&gt;</code> element is used when
+          the author can't express himself clearly using normal sentences ;-)
+        </note>
+        <warning>
+          Sleep deprivation can be the result of being involved in an open
+          source project. (a.k.a. the <code>&lt;warning&gt;</code> element).
+        </warning>
+        <note label="Important">
+          If you want your own labels for notes and warnings, specify them using
+          the <code>label</code> attribute.
+        </note>
+        <p>
+          Apart from unordered lists, we have ordered lists too, of course.
+        </p>
+        <ol>
+          <li>Item 1</li>
+          <li>Item 2</li>
+          <li>This should be 3 if my math is still OK.</li>
+        </ol>
       </section>
-
       <section id="presentations">
         <title>Various presentation formats</title>
-
-        <p>This sample document, written in document-v20 XML can be presented
-        via Forrest in a number of different formats. The links in the
-        following list show this document in each of the currently available
-        formats.</p>
-
-        <p>Each of the formats can be made available as a link near the top of
-        the page. Actual placement of those links depends on the skin
-        currently in use. Those links are enabled in the skinconf.xml via the
-        &lt;disable-XXX-link&gt; elements in the skinconf.xml</p>
-
+        <p>
+          This sample document, written in document-v20 XML can be presented via
+          Forrest in a number of different formats. The links in the following
+          list show this document in each of the currently available formats.
+        </p>
+        <p>
+          Each of the formats can be made available as a link near the top of
+          the page. Actual placement of those links depends on the skin
+          currently in use. Those links are enabled in the skinconf.xml via the
+          &lt;disable-XXX-link&gt; elements in the skinconf.xml
+        </p>
         <table>
           <tr>
             <th colspan="1" rowspan="1">Presentation Format</th>
-
             <th colspan="1" rowspan="1">Description</th>
-
             <th colspan="1" rowspan="1">skinconf.xml Element</th>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><link href="document-v20.html">HTML</link></td>
-
+            <td colspan="1" rowspan="1"><link href="document-v20.html">HTML</link>
+            </td>
             <td colspan="1" rowspan="1">This document in HTML format. </td>
-
             <td colspan="1" rowspan="1">Always generated by default. Cannot be turned off.</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><link href="document-v20.xml">XML</link></td>
-
+            <td colspan="1" rowspan="1"><link href="document-v20.xml">XML</link>
+            </td>
             <td colspan="1" rowspan="1">This document in its raw XML format.</td>
-
             <td colspan="1" rowspan="1">&lt;disable-xml-link&gt;. By default, set to true, meaning
             that this link will not be shown.</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><link href="document-v20.pdf">PDF</link></td>
-
+            <td colspan="1" rowspan="1"><link href="document-v20.pdf">PDF</link>
+            </td>
             <td colspan="1" rowspan="1">This document as Adobe PDF</td>
-
             <td colspan="1" rowspan="1">&lt;disable-pdf-link&gt;. By default, set to false, meaning
             that this link will be shown.</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><link href="document-v20.txt">Text</link></td>
-
-            <td colspan="1" rowspan="1"><p>This document as straight text.</p>
-            <p>For additional information see the Forrest text-output
-            plugin.</p></td>
-
+            <td colspan="1" rowspan="1"><link href="document-v20.txt">Text</link>
+            </td>
+            <td colspan="1" rowspan="1">
+              <p>
+                This document as straight text.
+              </p>
+              <p>
+                For additional information see the Forrest text-output plugin.
+              </p>
+            </td>
             <td colspan="1" rowspan="1">&lt;disable-txt-link&gt;. By default, set to true, meaning
             that this link will not be shown.</td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><link href="document-v20.pod">POD</link></td>
-
-            <td colspan="1" rowspan="1"><p>This document as Perl POD (Plain Old Documentation). Text
-            with minimal formatting directives. If on a *nix system with perl
-            installed, see "man perlpod".</p>
-            <p>For additional information see the Forrest pod-output
-            plugin.</p></td>
-
+            <td colspan="1" rowspan="1"><link href="document-v20.pod">POD</link>
+            </td>
+            <td colspan="1" rowspan="1">
+              <p>
+                This document as Perl POD (Plain Old Documentation). Text with
+                minimal formatting directives. If on a *nix system with perl
+                installed, see "man perlpod".
+              </p>
+              <p>
+                For additional information see the Forrest pod-output plugin.
+              </p>
+            </td>
             <td colspan="1" rowspan="1">&lt;disable-pod-link&gt;. By default, set to true, meaning
             that this link will not be shown.</td>
           </tr>
         </table>
       </section>
-      <section id="section"> 
+      <section id="section">
         <title>Using sections</title>
-        <p>You can use sections to put some structure in your document.
+        <p>
+          You can use sections to put some structure in your document.
         </p>
-      </section> 
+      </section>
       <section id="sub-section">
         <title>Sections, the sequel</title>
-        <p>Just some second section.</p> 
+        <p>
+          Just some second section.
+        </p>
         <section id="sub-sub-section">
           <title>Section 2.1</title>
-          <p>Which contains a subsection (2.1).</p> 
-        </section> 
-      </section> 
-
+          <p>
+            Which contains a subsection (2.1).
+          </p>
+        </section>
+      </section>
       <section id="source">
-        <title>Showing preformatted source code</title> 
-        <p>Enough about these sections. Let's have a look at more interesting
-          elements, <code>&lt;source&gt;</code> for instance:</p> 
+        <title>Showing preformatted source code</title>
+        <p>
+          Enough about these sections. Let's have a look at more interesting
+          elements, <code>&lt;source&gt;</code> for instance:
+        </p>
         <source xml:space="preserve"><![CDATA[
 // This example is from the book _Java in a Nutshell_ by David Flanagan.
 // Written by David Flanagan.  Copyright (c) 1996 O'Reilly & Associates.
@@ -243,23 +268,28 @@
         g.drawString("Hello World", 25, 50);
     }
 }]]></source>
-        <p>CDATA sections are used within 
-          <code>&lt;source&gt;</code> elements so that you can write pointy
-           brackets without needing to escape them with messy
-          <code>&amp;lt;</code> entities ...
-        </p> 
+        <p>
+          CDATA sections are used within <code>&lt;source&gt;</code> elements so
+          that you can write pointy brackets without needing to escape them with
+          messy <code>&amp;lt;</code> entities ...
+        </p>
         <source xml:space="preserve"><![CDATA[
+
 <pointy>
   easy
 </pointy>
-]]></source>
-        <p>Please take care to still use a sensible line-length within your
-          source elements.</p>
-      </section>
 
+        ]]></source>
+        <p>
+          Please take care to still use a sensible line-length within your
+          source elements.
+        </p>
+      </section>
       <section id="table">
         <title>Using tables</title>
-        <p>And now for a table:</p>
+        <p>
+          And now for a table:
+        </p>
         <table>
           <caption>Table caption</caption>
           <tr>
@@ -280,7 +310,7 @@
                 <tr>
                   <th colspan="1" rowspan="1">column 1</th>
                   <th colspan="1" rowspan="1">column 2</th>
-                </tr> 
+                </tr>
                 <tr>
                   <td colspan="1" rowspan="1">cell A</td>
                   <td colspan="1" rowspan="1">cell B</td>
@@ -288,65 +318,82 @@
               </table>
             </td>
             <td colspan="1" rowspan="1">
-              <ul><li>and can include most other elements</li><li>such as lists</li></ul>
+              <ul>
+                <li>and can include most other elements</li>
+                <li>such as lists</li>
+              </ul>
             </td>
           </tr>
-        </table> 
+        </table>
       </section>
-
       <anchor id="second-figure-anchor"/>
-      <section id="figure"> 
+      <section id="figure">
         <title>Using figures</title>
-        <p>And a <code>&lt;figure&gt;</code> to end all of this.
-          Note that this can also be implemented with an
-          <code>&lt;img&gt;</code> element.
+        <p>
+          And a <code>&lt;figure&gt;</code> to end all of this. Note that this
+          can also be implemented with an <code>&lt;img&gt;</code> element.
         </p>
-        <figure src="images/project-logo.png" alt="The fine Forrest logo" width="220" height="65"/>	
+        <figure src="images/project-logo.png" alt="The fine Forrest logo" width="220" height="65"/>
       </section>
       <section id="link-class">
         <title>Using class attribute on links</title>
-
-        <p>The document-v13 had elements &lt;fork&gt; and &lt;jump&gt;. In
-        document-v20, those elements no longer exist but the functionality can
-        be duplicated by using the @class attribute.
-        Even though the opening of separate windows should be under the
-        control of the user, these techniques can still be employed.</p>
-
+        <p>
+          The document-v13 had elements &lt;fork&gt; and &lt;jump&gt;. In
+          document-v20, those elements no longer exist but the functionality can
+          be duplicated by using the @class attribute. Even though the opening
+          of separate windows should be under the control of the user, these
+          techniques can still be employed.
+        </p>
         <table>
           <tr>
-            <th colspan="1" rowspan="1"><p>Document V1.3</p></th>
-
-            <th colspan="1" rowspan="1"><p>Document V2.0</p></th>
+            <th colspan="1" rowspan="1">
+              <p>
+                Document V1.3
+              </p>
+            </th>
+            <th colspan="1" rowspan="1">
+              <p>
+                Document V2.0
+              </p>
+            </th>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><p>&lt;fork href="../index.html"&gt;</p></td>
-
+            <td colspan="1" rowspan="1">
+              <p>
+                &lt;fork href="../index.html"&gt;
+              </p>
+            </td>
             <td colspan="1" rowspan="1"><link class="fork" href="../index.html">&lt;a class="fork"
-            href="../index.html"&gt;</link></td>
+            href="../index.html"&gt;</link>
+            </td>
           </tr>
-
           <tr>
-            <td colspan="1" rowspan="1"><p>&lt;jump href="../index.html"&gt;</p></td>
-
-            <td colspan="1" rowspan="1"><p><link class="jump" href="../index.html">&lt;a class="jump"
-            href="../index.html"&gt;</link></p></td>
+            <td colspan="1" rowspan="1">
+              <p>
+                &lt;jump href="../index.html"&gt;
+              </p>
+            </td>
+            <td colspan="1" rowspan="1">
+              <p>
+                <link class="jump" href="../index.html">&lt;a class="jump"
+                href="../index.html"&gt;</link>
+              </p>
+            </td>
           </tr>
         </table>
       </section>
     </section>
-
     <section id="changes">
       <title>DTD changes</title>
-      <p>See the generated
-        <link href="site:dtd-docs">DTD reference documentation</link>.
+      <p>
+        See the generated <link href="site:dtd-docs">DTD reference
+        documentation</link>.
       </p>
       <section id="changes-20">
         <title>Changes between document-v13 and document-v20</title>
         <ul>
           <li>Renamed <strong>&lt;link&gt;</strong>
-             to <strong>&lt;a&gt;</strong>
-          </li>
+             to <strong>&lt;a&gt;</strong></li>
           <li>Removed <strong>&lt;fork&gt;</strong>
              and <strong>&lt;jump&gt;</strong> in favour of the
              <strong>&lt;a&gt;</strong> element. See demonstration
@@ -390,8 +437,8 @@
         </ul>
       </section>
     </section>
-  </body> 
-  <footer> 
-    <legal>This is a legal notice, so it is <strong>important</strong>.</legal> 
+  </body>
+  <footer>
+    <legal>This is a legal notice, so it is <strong>important</strong>.</legal>
   </footer>
 </document>

Modified: forrest/site/dtdx/dtd-docs.html
URL: http://svn.apache.org/viewvc/forrest/site/dtdx/dtd-docs.html?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/dtdx/dtd-docs.html (original)
+++ forrest/site/dtdx/dtd-docs.html Mon Apr  9 21:44:00 2007
@@ -328,21 +328,27 @@
 <a name="N1000D"></a><a name="overview"></a>
 <h2 class="underlined_10">Overview</h2>
 <div class="section">
-<p>We use the
+<p>
+        We use the
         <a href="http://www.apache.org/~andyc/neko/doc/dtd/index.html">NekoDTD</a>
-        tool packaged as a Cocoon Generator to automatically generate
-        some hyperlinked DTD reference documentation. Note that these references
-        do not reflect the modularity of our DTDs, they are primarily
-        "user-oriented help" documentation.</p>
-<p>The actual DTDs are located in the Forrest distribution at
+        tool packaged as a Cocoon Generator to automatically generate some
+        hyperlinked DTD reference documentation. Note that these references do
+        not reflect the modularity of our DTDs, they are primarily
+        "user-oriented help" documentation.
+      </p>
+<p>
+        The actual DTDs are located in the Forrest distribution at
         <span class="codefrag">main/webapp/resources/schema/</span>
+      
 </p>
 </div>
     
-<a name="N10020"></a><a name="dtdx"></a>
+<a name="N10021"></a><a name="dtdx"></a>
 <h2 class="underlined_10">The generated documentation</h2>
 <div class="section">
-<p>Generated documentation for Apache Forrest document-v20 ...</p>
+<p>
+        Generated documentation for Apache Forrest document-v20 ...
+      </p>
 <ul>
         
 <li>
@@ -358,7 +364,9 @@
 </li>
       
 </ul>
-<p>Generated documentation for Apache Forrest document-v13 ...</p>
+<p>
+        Generated documentation for Apache Forrest document-v13 ...
+      </p>
 <ul>
         
 <li>

Modified: forrest/site/events.html
URL: http://svn.apache.org/viewvc/forrest/site/events.html?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/events.html (original)
+++ forrest/site/events.html Mon Apr  9 21:44:00 2007
@@ -299,13 +299,12 @@
 <a name="N10013"></a><a name="forrest-friday"></a>
 <h3 class="underlined_5">ForrestFriday monthly get-together</h3>
 <p>
-          On the second Friday of each month we have a 24-hour get-together using
-          IRC and other collaborative tools, to work on Forrest development and
-          get to know each other. See how to
+          On the second Friday of each month we have a 24-hour get-together
+          using IRC and other collaborative tools, to work on Forrest
+          development and get to know each other. See how to
           <a href="forrest-friday.html">participate</a>.
         </p>
 </div>
-
     
 <a name="N10022"></a><a name="past"></a>
 <h2 class="underlined_10">Past events</h2>
@@ -313,10 +312,10 @@
 <a name="N10028"></a><a name="apachecon-us-2006"></a>
 <h3 class="underlined_5">ApacheCon US 2006 (9-13 October 2006)</h3>
 <p>
-         
-<a href="http://www.us.apachecon.com/">ApacheCon US 2006</a>
-         - Please make plans to join us for the conference in
-         Austin, Texas, USA on 9-13 October 2006.
+          
+<a href="http://www.us.apachecon.com/">ApacheCon US 2006</a> - Please
+          make plans to join us for the conference in Austin, Texas, USA on 9-13
+          October 2006.
         </p>
 <p>
           Apart from all of the general ApacheCon events, there are a number of
@@ -325,17 +324,18 @@
 <a name="N10038"></a><a name="WE21-austin-2006"></a>
 <h4>ApacheCon Session: WE21: Single Source Publishing with Apache Forrest</h4>
 <p>
-            Wednesday 11 October - Official ApacheCon session
-            conducted by Ferdinand Soethe.
-            <a href="http://www.us.apachecon.com/html/sessions.html">Read more</a>.
+            Wednesday 11 October - Official ApacheCon session conducted by
+            Ferdinand Soethe.
+            <a href="http://www.us.apachecon.com/html/sessions.html">Read
+            more</a>.
           </p>
 <a name="N10047"></a><a name="apachecon-eu-2006"></a>
 <h3 class="underlined_5">ApacheCon EU 2006 (26-30 June)</h3>
 <p>
-         
-<a href="http://apachecon.com/2006/EU/">ApacheCon EU 2006</a>
-         - Please make plans to join us for the conference in
-         Dublin, Ireland on 26-30 June 2006.
+          
+<a href="http://apachecon.com/2006/EU/">ApacheCon EU 2006</a> - Please
+          make plans to join us for the conference in Dublin, Ireland on 26-30
+          June 2006.
         </p>
 <p>
           Apart from all of the general ApacheCon events, there are a number of
@@ -344,21 +344,24 @@
 <a name="N10057"></a><a name="FR19-dublin-2006"></a>
 <h4>ApacheCon Session: FR19: Single Source Publishing with Apache Forrest</h4>
 <p>
-            Friday 30 June - Official ApacheCon session
-              conducted by Ferdinand Soethe. <a href="http://www.eu.apachecon.com/konferenzen/psecom,id,488,track,3,nodeid,,_language,uk.html#session-fr19">Read
-              more ...</a>
+            Friday 30 June - Official ApacheCon session conducted by Ferdinand
+            Soethe.
+            <a href="http://www.eu.apachecon.com/konferenzen/psecom,id,488,track,3,nodeid,,_language,uk.html#session-fr19">Read
+            more ...</a>
           
 </p>
 <div class="note">
 <div class="label">Note</div>
-<div class="content">This session was re-scheduled for Friday 30 June 14:30-15:30.</div>
+<div class="content">
+            This session was re-scheduled for Friday 30 June 14:30-15:30.
+          </div>
 </div>
 <a name="N10069"></a><a name="apachecon-us-2005"></a>
 <h3 class="underlined_5">ApacheCon US 2005 (10-14 December)</h3>
 <p>
           
-<a href="http://apachecon.com/2005/US/">ApacheCon US 2005</a>
-          took place in San Diego, California, USA on 10-14 December 2005.
+<a href="http://apachecon.com/2005/US/">ApacheCon US 2005</a> took
+          place in San Diego, California, USA on 10-14 December 2005.
         </p>
 <p>
           Apart from all of the general ApacheCon events, there is one
@@ -370,75 +373,78 @@
             Tuesday 13 December at 09:00 to 10:00 - Official ApacheCon session
             conducted by Ferdinand Soethe. See the
             <a href="http://apachecon.com/2005/US/html/sessions.html">ApacheCon
-            Schedule</a> Session TU01.
-            The event is only open to ApacheCon attendees.
+            Schedule</a> Session TU01. The event is only open to ApacheCon
+            attendees.
           </p>
 <a name="N10088"></a><a name="apachecon-eu-2005"></a>
 <h3 class="underlined_5">ApacheCon Europe 2005 (18-22 July)</h3>
 <p>
-        
-<a href="http://apachecon.com/2005/EU/">ApacheCon Europe 2005</a>
-        in Stuttgart, Germany on 18-22 July 2005. For the first time there is
-        a session related to Apache Forrest.
-      </p>
-<p>
-        Apart from all of the general ApacheCon events, there are a number of
-        Forrest-specific events. In chronological order ...
-      </p>
+          
+<a href="http://apachecon.com/2005/EU/">ApacheCon Europe 2005</a> in
+          Stuttgart, Germany on 18-22 July 2005. For the first time there is a
+          session related to Apache Forrest.
+        </p>
+<p>
+          Apart from all of the general ApacheCon events, there are a number of
+          Forrest-specific events. In chronological order ...
+        </p>
 <a name="N10098"></a><a name="ht-stuttgart-2005"></a>
 <h4>Apache committers hackathon</h4>
 <p>
-          Monday 18 July and Tuesday 19 July all day - Open to any Apache
-          committer. Among the many topics, some of us will informally chat
-          about Apache Forrest and maybe fix some bugs. We will probably
-          collaborate with the Apache Lenya committers too.
-        </p>
+            Monday 18 July and Tuesday 19 July all day - Open to any Apache
+            committer. Among the many topics, some of us will informally chat
+            about Apache Forrest and maybe fix some bugs. We will probably
+            collaborate with the Apache Lenya committers too.
+          </p>
 <a name="N100A2"></a><a name="ws-stuttgart-2005"></a>
 <h4>Apache Forrest workshop on Views</h4>
 <p>
-          Monday 18 July commencing at 18:30 - We will go out to dinner and then
-          meet for a developers workshop specifically about the new Views plugin
-          development. Topics will include Views, XHTML2 internal format, and
-          general project planning. Discussions will be technical and will assume
-          knowledge of Forrest. We will certainly answer questions to ensure that
-          people understand the background. However the main aim is an intensive
-          project design session.
-          The event is open to anybody, you don't need to be attending ApacheCon.
-          Venue and Directions: Gather at the foyer of the ApacheCon.
-        </p>
+            Monday 18 July commencing at 18:30 - We will go out to dinner and
+            then meet for a developers workshop specifically about the new Views
+            plugin development. Topics will include Views, XHTML2 internal
+            format, and general project planning. Discussions will be technical
+            and will assume knowledge of Forrest. We will certainly answer
+            questions to ensure that people understand the background. However
+            the main aim is an intensive project design session. The event is
+            open to anybody, you don't need to be attending ApacheCon. Venue and
+            Directions: Gather at the foyer of the ApacheCon.
+          </p>
 <a name="N100AC"></a><a name="ua-stuttgart-2005"></a>
 <h4>Usability professionals meeting</h4>
 <p>
-          Tuesday 19 July commencing at 18:30 - Johannes Schaefer will
-          present Apache Forrest to an informal meeting of usability
-          professionals. The event is open to other German-speaking people.
-          See
-          <a href="http://www.gui-design.de/ak/ak_050719.htm">further information</a>.
-        </p>
+            Tuesday 19 July commencing at 18:30 - Johannes Schaefer will present
+            Apache Forrest to an informal meeting of usability professionals.
+            The event is open to other German-speaking people. See
+            <a href="http://www.gui-design.de/ak/ak_050719.htm">further
+            information</a>.
+          </p>
 <a name="N100BA"></a><a name="rf-stuttgart-2005"></a>
 <h4>ApacheCon Session: Single Source Publishing with Apache Forrest</h4>
 <p>
-          Wednesday 20 July at 14:30 to 15:30 - Official ApacheCon session
-          conducted by Ross Gardler and Ferdinand Soethe. See the
-          <a href="http://apachecon.com/2005/EU/html/sessions.html">ApacheCon
-          Schedule</a> Session WE16.
-          The event is only open to ApacheCon attendees.
-        </p>
+            Wednesday 20 July at 14:30 to 15:30 - Official ApacheCon session
+            conducted by Ross Gardler and Ferdinand Soethe. See the
+            <a href="http://apachecon.com/2005/EU/html/sessions.html">ApacheCon
+            Schedule</a> Session WE16. The event is only open to ApacheCon
+            attendees.
+          </p>
 <a name="N100C8"></a><a name="gt-stuttgart-2005"></a>
 <h4>Apache Forrest get-together</h4>
 <p>
-          Wednesday 20 July commencing at 20:00 - Informal get together to
-          discuss any topic related to Apache Forrest. Follows on from
-          the session earlier in the day. Please come and meet other
-          Forrest developers and users. Describe your own use cases.
-          The event is open to anybody, you don't need to be attending ApacheCon.
-          Venue and Directions: Gather at the foyer of the ApacheCon at 20:00.
-          The event will be held at Stuttgart University of Applied Sciences
-          Many thanks to HfT.
-          See (<a href="http://www.hft-stuttgart.de/Hochschule/wirueberuns/Lageplan/">HfT map</a>)
-          which is just a few steps north-west of the ApacheCon-site:</p>
+            Wednesday 20 July commencing at 20:00 - Informal get together to
+            discuss any topic related to Apache Forrest. Follows on from the
+            session earlier in the day. Please come and meet other Forrest
+            developers and users. Describe your own use cases. The event is open
+            to anybody, you don't need to be attending ApacheCon. Venue and
+            Directions: Gather at the foyer of the ApacheCon at 20:00. The event
+            will be held at Stuttgart University of Applied Sciences Many thanks
+            to HfT. See
+            (<a href="http://www.hft-stuttgart.de/Hochschule/wirueberuns/Lageplan/">HfT
+            map</a>) which is just a few steps north-west of the ApacheCon-site:
+          </p>
 <p>
-<img alt="map of sites" src="apacheconsites.jpg"></p>
+            
+<img alt="map of sites" src="apacheconsites.jpg">
+          </p>
 </div>
   
 </div>

Modified: forrest/site/events.pdf
URL: http://svn.apache.org/viewvc/forrest/site/events.pdf?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
Binary files - no diff available.

Modified: forrest/site/flyer.html
URL: http://svn.apache.org/viewvc/forrest/site/flyer.html?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/flyer.html (original)
+++ forrest/site/flyer.html Mon Apr  9 21:44:00 2007
@@ -194,39 +194,36 @@
 <h1>Apache Forrest: documentation framework</h1>
     
 <p>
-      Apache Forrest
-      (<a href="http://forrest.apache.org/">forrest.apache.org</a>)
-      is a publishing framework that transforms
-      input from various sources into a unified presentation
-      in one or more output formats. The modular and extensible
-      plugin architecture is based on Apache Cocoon and relevant
-      standards, which separates presentation from content.
-      Forrest can generate static documents, or be used as a
-      dynamic server, or be deployed by its automated facility.
+      Apache Forrest (<a href="http://forrest.apache.org/">forrest.apache.org</a>) is a
+      publishing framework that transforms input from various sources into a
+      unified presentation in one or more output formats. The modular and
+      extensible plugin architecture is based on Apache Cocoon and relevant
+      standards, which separates presentation from content. Forrest can generate
+      static documents, or be used as a dynamic server, or be deployed by its
+      automated facility.
     </p>
     
 <p>
-      By <strong>separating content from
-      presentation</strong>, providing <strong>content templates</strong>
-      and <strong>pre-written skins</strong>, Forrest is unequalled at enabling
-      content producers to get their message out fast.  This separation of
-      concerns makes Forrest excellent
-      to publish <strong>project documentation</strong> (notably software projects),
+      By <strong>separating content from presentation</strong>, providing
+      <strong>content templates</strong> and <strong>pre-written skins</strong>,
+      Forrest is unequalled at enabling content producers to get their message
+      out fast. This separation of concerns makes Forrest excellent to publish
+      <strong>project documentation</strong> (notably software projects),
       <strong>intranets</strong>, and <strong>home pages</strong>.
     </p>
     
 <p>
-      Forrest is
-      built on one of the world's leading XML application frameworks, 
-      <a href="http://cocoon.apache.org/2.1/">Apache Cocoon</a>, which provides advanced
-      users with extremely powerful publishing capabilities.
+      Forrest is built on one of the world's leading XML application frameworks,
+      <a href="http://cocoon.apache.org/2.1/">Apache Cocoon</a>, which provides advanced users with
+      extremely powerful publishing capabilities.
     </p>
     
 <ul>
       
 <li>Multiple task-specific source XML formats can be used
           (<a href="howto-howto.html">How-To</a>,
-        <a href="docs_0_80/faq.html"><acronym title="Frequently Asked Questions">FAQ</acronym></a>,
+        <a href="docs_0_80/faq.html">
+        <acronym title="Frequently Asked Questions">FAQ</acronym></a>,
         <a href="docs_0_70/changes.html">changelogs</a> and
         <a href="todo.html">todo lists</a> supported natively).
         Source formats include: Apache xdocs xml format, plain html
@@ -270,15 +267,13 @@
 </ul>
     
 <p>
-      Unique amongst comparable documentation tools, Forrest generates
-      sites that can run both <strong>interactively</strong> as a dynamic
-      web application, or as statically rendered pages.
-      Running as a webapp has a major advantage during development:
-      content can be written, and
-      then the rendered output viewed almost instantly in a web browser.
-      This <a href="docs_0_70/your-project.html#webapp">webapp technique</a>
-      enables the edit/review cycle to be faster than command-line
-      transformation tools.
+      Unique amongst comparable documentation tools, Forrest generates sites
+      that can run both <strong>interactively</strong> as a dynamic web
+      application, or as statically rendered pages. Running as a webapp has a
+      major advantage during development: content can be written, and then the
+      rendered output viewed almost instantly in a web browser. This
+      <a href="docs_0_70/your-project.html#webapp">webapp technique</a> enables the
+      edit/review cycle to be faster than command-line transformation tools.
     </p>
   
 </div>

Modified: forrest/site/forrest-contract.html
URL: http://svn.apache.org/viewvc/forrest/site/forrest-contract.html?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/forrest-contract.html (original)
+++ forrest/site/forrest-contract.html Mon Apr  9 21:44:00 2007
@@ -192,8 +192,10 @@
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
 <h1>Our Contract</h1>
-<div class="abstract">This document describes, in a very techy bullet-style way, how
-      to use Apache Forrest.</div>
+<div class="abstract">
+      This document describes, in a very techy bullet-style way, how to use
+      Apache Forrest.
+    </div>
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
@@ -206,15 +208,15 @@
 <a href="#project-can">TheProject can:</a>
 </li>
 </ul>
-</div> 
+</div>
     
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-      This document describes the formal contract between
-      <strong>Apache Forrest</strong> and
-      the <strong>Project (your development team)</strong> that is using it for generating
-      its documentation, hereafter referred to as "TheProject".
+      This document describes the formal contract between <strong>Apache
+      Forrest</strong> and the <strong>Project (your development team)</strong>
+      that is using it for generating its documentation, hereafter referred to
+      as "TheProject".
     </div>
 </div>
     
@@ -227,17 +229,18 @@
       <span class="codefrag">{projecthome}/src/documentation</span>
     
 </div>
-</div> 
-
+</div>
     
 <a name="N1002C"></a><a name="forrest-will"></a>
 <h2 class="underlined_10">Apache Forrest will:</h2>
 <div class="section">
-<p>Provide infrastructure ...</p>
-<ul> 
+<p>
+        Provide infrastructure ...
+      </p>
+<ul>
         
 <li>Use Apache Cocoon to generate the HTML and PDF documentation for
-          TheProject.</li> 
+          TheProject.</li>
         
 <li>Provide default Cocoon sitemaps, Cocoon pipelines, skins and other
          theme abilities, document type definitions (DTDs) and other appropriate schema.
@@ -252,37 +255,37 @@
       
 </ul>
 </div>
-
     
 <a name="N10049"></a><a name="project-must"></a>
 <h2 class="underlined_10">TheProject must:</h2>
 <div class="section">
-<p>Provide content and configuration ...</p>
-<ul> 
+<p>
+        Provide content and configuration ...
+      </p>
+<ul>
         
 <li>Provide XML content in <span class="codefrag">{docroot}/content/xdocs</span>
           according to the Forrest DTDs, or one of the other input formats.
-        </li> 
+        </li>
         
 <li>Provide navigation metadata using the configuration files
           <span class="codefrag">site.xml</span> and <span class="codefrag">tabs.xml</span>
-        
 </li>
         
 <li>Provide the skin configuation file in
           <span class="codefrag">{docroot}/skinconf.xml</span>
-        
 </li>
       
 </ul>
-</div> 
-
+</div>
     
-<a name="N1006B"></a><a name="project-can"></a>
+<a name="N10069"></a><a name="project-can"></a>
 <h2 class="underlined_10">TheProject can:</h2>
 <div class="section">
-<p>Add extra abilities ...</p>
-<ul> 
+<p>
+        Add extra abilities ...
+      </p>
+<ul>
         
 <li>Specify other properties (e.g. additional plugins) in 
           <span class="codefrag">{docroot}/forrest.properties</span>
@@ -292,35 +295,34 @@
           <span class="codefrag">{docroot}/skins/{your-skin-name}</span> (Check the current
           Forrest skins and the related pipelines to see what they are doing.
           Bear in mind that the provided skins are able to be configured and
-          may already meet your needs.)</li> 
+          may already meet your needs.)</li>
         
 <li>Provide own DTDs to handle other specialised document types in
-          <span class="codefrag">{docroot}/resources/schema/dtd</span> 
+          <span class="codefrag">{docroot}/resources/schema/dtd</span>
           
-<ul> 
+<ul>
             
 <li>and extra stylesheets to convert own grammar to the
-              intermediate 'document' structure.</li> 
+              intermediate 'document' structure.</li>
             
 <li>and declare those extra DTDs in
               <span class="codefrag">{docroot}/resources/schema/catalog.xcat</span>
-</li> 
+</li>
           
 </ul>
-        
-</li> 
+</li>
         
 <li>Provide its own overwriting versions of sitemaps
           (<span class="codefrag">{docroot}/sitemap.xmap</span> and other *.xmap files)
           ... (be sure you know what you are doing since you are then leaving
           the area where other people can help you out.
-        </li> 
+        </li>
         
 <li>Develop its own additional functionality using plugins.
         </li>
       
 </ul>
-</div> 
+</div>
   
 </div>
 <!--+

Modified: forrest/site/forrest-contract.pdf
URL: http://svn.apache.org/viewvc/forrest/site/forrest-contract.pdf?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
Binary files - no diff available.

Modified: forrest/site/forrest-friday.html
URL: http://svn.apache.org/viewvc/forrest/site/forrest-friday.html?view=diff&rev=527020&r1=527019&r2=527020
==============================================================================
--- forrest/site/forrest-friday.html (original)
+++ forrest/site/forrest-friday.html Mon Apr  9 21:44:00 2007
@@ -261,15 +261,14 @@
         and lasts for 24 hours.
       </p>
 <p>
-        The next event will take place on <strong>?? ?? 2006</strong>.
-(Note: See recent mail discussion - not happening until further notice.)
-        See 
-        <a href="http://www.timeanddate.com/worldclock/fixedtime.html?year=2006&month=07&day=14&hour=6&min=0&sec=0">start time</a>
-        and
-        <a href="http://www.timeanddate.com/worldclock/meetingtime.html?day=14&month=07&year=2006&p1=136&p2=48&p3=176&p4=240&p5=224&p6=213">zone overlap</a>.
+        The next event will take place on <strong>?? ?? 2006</strong>. (Note:
+        See recent mail discussion - not happening until further notice.) See
+        <a href="http://www.timeanddate.com/worldclock/fixedtime.html?year=2006&month=07&day=14&hour=6&min=0&sec=0">start
+        time</a> and
+        <a href="http://www.timeanddate.com/worldclock/meetingtime.html?day=14&month=07&year=2006&p1=136&p2=48&p3=176&p4=240&p5=224&p6=213">zone
+        overlap</a>.
       </p>
 </div>
-
     
 <a name="N10028"></a><a name="purpose"></a>
 <h2 class="underlined_10">Purpose</h2>
@@ -278,12 +277,12 @@
         The day is devoted to working collaboratively to solve particular issues
         and getting to know each other. In the weeks leading up to each event,
         decide on the dev mailing list what the main topic should be. Probably
-        something that needs groups work (e.g. moving the internal format to
-        be XHTML2).
+        something that needs groups work (e.g. moving the internal format to be
+        XHTML2).
       </p>
 <p>
-        There will also be an effort to clean up the
-        <a href="issues.html">Issue Tracker</a>.
+        There will also be an effort to clean up the <a href="issues.html">Issue
+        Tracker</a>.
       </p>
 <p>
         The dev mailing list is still the main form of communication and all
@@ -298,7 +297,6 @@
         This is not a user help forum, please do that on the user mailing list.
       </p>
 </div>
-
     
 <a name="N10042"></a><a name="how"></a>
 <h2 class="underlined_10">How to participate</h2>
@@ -338,7 +336,6 @@
           processes to ensure that project PMC members are participating.
           Instructions are in our SVN at
           <a href="https://svn.apache.org/repos/private/committers/docs/freenode-cloaks.txt">https://svn.apache.org/repos/private/committers/docs/freenode-cloaks.txt</a>
-        
 </li>
         
 <li>
@@ -352,9 +349,8 @@
       
 </ul>
 </div>
-
     
-<a name="N1007C"></a><a name="op"></a>
+<a name="N1007B"></a><a name="op"></a>
 <h2 class="underlined_10">Notes for channel operator</h2>
 <div class="section">
 <ul>
@@ -387,12 +383,10 @@
         
 <li>
           Set the channel mode: <span class="codefrag">/mode +n</span>
-        
 </li>
         
 <li>
           Declare today's topic: <span class="codefrag">/topic ForrestFriday: XHTML2 core and Jira cleanup</span>
-        
 </li>
         
 <li>Ask cheche to start the logger bot and tell the URL for the live logfile.