forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r527041 [4/5] - in /forrest/trunk/whiteboard/forrest2: core/ core/src/conf/ core/src/core/xdocs/samples/xslt/ core/src/docs/ core/src/examples/affiliateProductCatalogue/src/ core/src/examples/affiliateProductCatalogue/src/xdocs/ core/src/ex...
Date Tue, 10 Apr 2007 06:05:09 GMT
Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/faq.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/faq.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/faq.xml Mon Apr  9 23:05:03 2007
@@ -16,10 +16,8 @@
   limitations under the License.
 -->
 <!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V2.0//EN" "http://forrest.apache.org/dtd/faq-v20.dtd">
-
 <faqs>
   <title>Frequently Asked Questions</title>
-
   <faqsection id="docs">
     <title>Documentation</title>
     <faq id="forrest">
@@ -28,15 +26,17 @@
       </question>
       <answer>
         <p>
-          This project uses <a href="ext:forrest">Apache Forrest</a> to
-          generate documentation from XML.  Please download a copy of Forrest,
-          which can be used to <a
-            href="ext:forrest/validation">validate</a>, <a
-            href="ext:forrest/webapp">develop</a> and render a project site.
+          This project uses <a href="ext:forrest">Apache Forrest</a> to generate
+          documentation from XML. Please download a copy of Forrest, which can
+          be used to <a
+            href="ext:forrest/validation">validate</a>,
+          <a
+            href="ext:forrest/webapp">develop</a> and render a
+          project site.
         </p>
       </answer>
     </faq>
-    <!-- More faqs or parts here -->
+<!-- More faqs or parts here -->
   </faqsection>
   <faqsection id="motd">
     <title>Message of the day (MOTD).</title>
@@ -45,13 +45,13 @@
 	How do I enable MOTD?
       </question>
       <answer>
-	<p>
-	  There is example MOTD code in /src/documentation/skinconf.xml.
-	  Enable this and make sure the motd-option pattern URI points
-	  to the page or pages you want the message to appear.
-	</p>
+        <p>
+          There is example MOTD code in /src/documentation/skinconf.xml. Enable
+          this and make sure the motd-option pattern URI points to the page or
+          pages you want the message to appear.
+        </p>
       </answer>
     </faq>
   </faqsection>
-  <!-- More faqs or parts here -->
+<!-- More faqs or parts here -->
 </faqs>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/i18n.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/i18n.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/i18n.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/i18n.xml Mon Apr  9 23:05:03 2007
@@ -16,21 +16,20 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Internationalisation (i18n)</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Internationalisation (i18n)</title>
+  </header>
+  <body>
     <section id="intro">
       <title>Introduction</title>
       <p></p>
     </section>
-<fixme author="">
-This sample will explain and demonstrate the i18n capabilities.
-Issue <a href="http://issues.apache.org/jira/browse/FOR-707">FOR-707</a> has some discussion and doc links.
-We need to summarise it all into this demo.
-</fixme>
-
+    <fixme author="">
+      This sample will explain and demonstrate the i18n capabilities. Issue
+      <a href="http://issues.apache.org/jira/browse/FOR-707">FOR-707</a> has
+      some discussion and doc links. We need to summarise it all into this demo.
+    </fixme>
     <section id="locale-request-param">
       <title>Using the locale request parameter</title>
       <p>
@@ -38,14 +37,13 @@
         <a href="site:i18n-demo">this demo page</a>. To see alternative language
         versions of this page, append the <code>locale</code> request parameter,
         e.g. <code>localhost:8888/samples/demo-i18n.html?locale=fr</code>
-        
       </p>
       <p>
         There are some other laguage demos (de, fr, nl).
       </p>
-      <p>This only works in 'forrest run' mode.
-        There are other ways to switch, this is just one way of 
-        demonstrating these features.
+      <p>
+        This only works in 'forrest run' mode. There are other ways to switch,
+        this is just one way of demonstrating these features.
       </p>
     </section>
   </body>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/index.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/index.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/index.xml Mon Apr  9 23:05:03 2007
@@ -16,14 +16,17 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Samples</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Samples</title>
+  </header>
+  <body>
     <section id="please-contribute">
       <title>If something goes wrong..</title>
-      <p>Patches are welcome: <a href="http://forrest.apache.org/docs/faq.html">Forrest FAQ</a></p>
+      <p>
+        Patches are welcome:
+        <a href="http://forrest.apache.org/docs/faq.html">Forrest FAQ</a>
+      </p>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/linking.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/linking.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/linking.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/linking.xml Mon Apr  9 23:05:03 2007
@@ -20,59 +20,56 @@
   <header>
     <title>Demonstration of linking</title>
   </header>
-
   <body>
     <section id="overview">
       <title>Overview</title>
-      <p>Forrest has many powerful techniques for linking between documents
-      and for managing the site navigation. This document demonstrates those
-      techniques.
-      The document "<a href="ext:linking">Menus and Linking</a>" 
-      has the full details.
+      <p>
+        Forrest has many powerful techniques for linking between documents and
+        for managing the site navigation. This document demonstrates those
+        techniques. The document "<a href="ext:linking">Menus and Linking</a>"
+        has the full details.
       </p>
     </section>
-
     <section id="uri-space">
       <title>Building and maintaining consistent URI space</title>
       <p>
-      When Forrest builds your site, it starts from the front page. Like
-      a robot, it traverses all of the links that it finds in the documents
-      and builds the corresponding pages. Any new links are further traversed.
+        When Forrest builds your site, it starts from the front page. Like a
+        robot, it traverses all of the links that it finds in the documents and
+        builds the corresponding pages. Any new links are further traversed.
       </p>
       <p>
-      Sometimes those links lead to documents that are generated directly
-      from xml source files, sometimes they are generated from other source
-      via an intermediate xml format. Other times the links lead to raw
-      un-processed content.
+        Sometimes those links lead to documents that are generated directly from
+        xml source files, sometimes they are generated from other source via an
+        intermediate xml format. Other times the links lead to raw un-processed
+        content.
       </p>
       <p>
-       The site navigation configuration file "<code>site.xml</code>" provides
-       a way to manage this URI space. In the future, when documents are
-       re-arranged and renamed, the site.xml configuration will enable this
-       smoothly.
+        The site navigation configuration file "<code>site.xml</code>" provides
+        a way to manage this URI space. In the future, when documents are
+        re-arranged and renamed, the site.xml configuration will enable this
+        smoothly.
       </p>
     </section>
-
     <section id="resource-space">
       <title>Mapping the local resource space to the final URI space</title>
       <p>
-       For both generated and raw (un-processed) files, the top-level of the
-       URI space corresponds to the "<code>content/xdocs/</code>" directory,
-       i.e. the location of the "<code>site.xml</code>" configuration file.
+        For both generated and raw (un-processed) files, the top-level of the
+        URI space corresponds to the "<code>content/xdocs/</code>" directory,
+        i.e. the location of the "<code>site.xml</code>" configuration file.
       </p>
       <note>
-        In versions prior to 0.7 raw un-processed content was stored in
-        the "<code>content/</code>" directory. In 0.7 onwards, raw
-        un-processed data is stored alongside the xdocs. In addition,
-        in 0.6 and earlier, HTML documents could be stored in the xdocs
-        directory and served without processing. If you 
-        you wish to emulate the behaviour of 0.6 and earlier see the 
-        next section.
+        In versions prior to 0.7 raw un-processed content was stored in the
+        "<code>content/</code>" directory. In 0.7 onwards, raw un-processed data
+        is stored alongside the xdocs. In addition, in 0.6 and earlier, HTML
+        documents could be stored in the xdocs directory and served without
+        processing. If you you wish to emulate the behaviour of 0.6 and earlier
+        see the next section.
       </note>
       <p>
         A diagram will help.
       </p>
-      <source><![CDATA[
+      <source>
+<![CDATA[
 The resource space          ==============>    The final URI space
 ------------------                             -------------------
 Generated content ...
@@ -87,82 +84,100 @@
  content/xdocs/hello.pdf                       hello.pdf
  content/xdocs/hello.sxw                       hello.sxw
  content/xdocs/subdir/hello.sxw                subdir/hello.sxw
-]]></source>
-
-  <section>
-    <title>How Plugins May Affect The URI Space</title>
-      <p>By using <a href="site:plugins">Forrest Input Plugins</a>
-      you can process some file formats, such as
-      OpenOffice.org documents and produce processed content from them. For example,
-      the file <code>content/xdocs/hello.sxw</code> can be used to produce a 
-      skinned version of the document at with the name <code>hello.html</code>.
-      Similarly, you can use <a href="site:plugins">Forrest Output 
-      Plugins</a> to create different output formats such as PDF, in this 
-      case <code>content/xdocs/hello.sxw</code> can produce 
-      <code>hello.pdf</code>.</p>
-      
-      <p>However, this does not affect the handling of raw content. That is, you 
-      can still retrieve the raw un-processed version with, for example, 
-      <code>hello.sxw</code>. If you want to prevent the user retrieving the 
-      un-processed version you will have to create matchers that intercept
-      these requests within your project sitemap.</p>
+]]>
+      </source>
+      <section>
+        <title>How Plugins May Affect The URI Space</title>
+        <p>
+          By using <a href="site:plugins">Forrest Input Plugins</a> you can
+          process some file formats, such as OpenOffice.org documents and
+          produce processed content from them. For example, the file
+          <code>content/xdocs/hello.sxw</code> can be used to produce a skinned
+          version of the document at with the name <code>hello.html</code>.
+          Similarly, you can use <a href="site:plugins">Forrest Output
+          Plugins</a> to create different output formats such as PDF, in this
+          case <code>content/xdocs/hello.sxw</code> can produce
+          <code>hello.pdf</code>.
+        </p>
+        <p>
+          However, this does not affect the handling of raw content. That is,
+          you can still retrieve the raw un-processed version with, for example,
+          <code>hello.sxw</code>. If you want to prevent the user retrieving the
+          un-processed version you will have to create matchers that intercept
+          these requests within your project sitemap.
+        </p>
       </section>
-  
     </section>
-
     <section id="generated">
       <title>Basic link to internal generated pages</title>
       <p>
-      When this type of link is encountered, Forrest will look for a
-      corresponding xml file, relative to this document (i.e. in
-      <code>content/xdocs/samples/</code>).
-      </p>
-      <p>A generated document in the current directory, which corresponds to
-      <code>content/xdocs/samples/sample.html</code> ...
-      </p>
-      <source><![CDATA[<a href="sample.html">]]><a href="sample.html">sample.html</a><![CDATA[</a>]]></source>
-      <p>In a sub-directory, which corresponds to
-      <code>content/xdocs/samples/subdir/index.html</code> ...
-      </p>
-      <source><![CDATA[<a href="subdir/index.html">]]><a href="subdir/index.html">subdir/index.html</a><![CDATA[</a>]]></source>
+        When this type of link is encountered, Forrest will look for a
+        corresponding xml file, relative to this document (i.e. in
+        <code>content/xdocs/samples/</code>).
+      </p>
+      <p>
+        A generated document in the current directory, which corresponds to
+        <code>content/xdocs/samples/sample.html</code> ...
+      </p>
+      <source>
+<![CDATA[<a href="sample.html">]]><a href="sample.html">sample.html</a>
+<![CDATA[</a>]]>
+      </source>
+      <p>
+        In a sub-directory, which corresponds to
+        <code>content/xdocs/samples/subdir/index.html</code> ...
+      </p>
+      <source>
+<![CDATA[<a href="subdir/index.html">]]><a href="subdir/index.html">subdir/index.html</a>
+<![CDATA[</a>]]>
+      </source>
     </section>
-
     <section id="raw">
       <title>Basic link to raw un-processed content</title>
       <p>
-      Raw content files are not intended for any processing, they are just
-      linked to (e.g. pre-prepared PDFs, zip archives).
-      These files are placed alongside your normal content in the 
-      "<code>content/xdocs</code>" directory.
-      </p>
-      <p>A raw document in the current directory, which corresponds to
-      <code>content/xdocs/samples/helloAgain.pdf</code> ...
-      </p>
-      <source><![CDATA[<a href="helloAgain.pdf">]]><a href="helloAgain.pdf">helloAgain.pdf</a><![CDATA[</a>]]></source>
-      <p>A raw document in a sub-directory, which corresponds to 
-      <code>content/xdocs/samples/subdir/hello.zip</code> ...
-      </p>
-      <source><![CDATA[<a href="subdir/hello.zip">]]><a href="subdir/hello.zip">subdir/hello.zip</a><![CDATA[</a>]]></source>
-      <p>A raw document at the next level up, which corresponds to 
-      <code>content/hello.pdf</code> ...
+        Raw content files are not intended for any processing, they are just
+        linked to (e.g. pre-prepared PDFs, zip archives). These files are placed
+        alongside your normal content in the "<code>content/xdocs</code>"
+        directory.
       </p>
-      <source><![CDATA[<a href="../hello.pdf">]]><a href="../hello.pdf">../hello.pdf</a><![CDATA[</a>]]></source>
-      
+      <p>
+        A raw document in the current directory, which corresponds to
+        <code>content/xdocs/samples/helloAgain.pdf</code> ...
+      </p>
+      <source>
+<![CDATA[<a href="helloAgain.pdf">]]><a href="helloAgain.pdf">helloAgain.pdf</a>
+<![CDATA[</a>]]>
+      </source>
+      <p>
+        A raw document in a sub-directory, which corresponds to
+        <code>content/xdocs/samples/subdir/hello.zip</code> ...
+      </p>
+      <source>
+<![CDATA[<a href="subdir/hello.zip">]]><a href="subdir/hello.zip">subdir/hello.zip</a>
+<![CDATA[</a>]]>
+      </source>
+      <p>
+        A raw document at the next level up, which corresponds to
+        <code>content/hello.pdf</code> ...
+      </p>
+      <source>
+<![CDATA[<a href="../hello.pdf">]]><a href="../hello.pdf">../hello.pdf</a>
+<![CDATA[</a>]]>
+      </source>
       <section id="no-decoration">
         <title>Serving (X)HTML content without Skinning</title>
-        
-        <p>Prior to version 0.7, the raw un-processed content was stored in
-        the "<code>content/</code>" directory. In 0.7 onwards, raw
-        un-processed data is stored alongside the xdocs. In addition
-        in 0.6 and earlier, HTML files could be stored in the xdocs 
-        directory and they would be served without further processing.
-        As described above, this is not the case in 0.7 where HTML files
-        are, by default, skinned by Forrest.</p>
-        
-        <p>If you 
-        you wish to emulate the behaviour of 0.6 and earlier then you
-        must add the following to your project sitemap.</p>
-        
+        <p>
+          Prior to version 0.7, the raw un-processed content was stored in the
+          "<code>content/</code>" directory. In 0.7 onwards, raw un-processed
+          data is stored alongside the xdocs. In addition in 0.6 and earlier,
+          HTML files could be stored in the xdocs directory and they would be
+          served without further processing. As described above, this is not the
+          case in 0.7 where HTML files are, by default, skinned by Forrest.
+        </p>
+        <p>
+          If you you wish to emulate the behaviour of 0.6 and earlier then you
+          must add the following to your project sitemap.
+        </p>
         <source>
 &lt;map:match pattern="**.html"&gt;
  &lt;map:select type="exists"&gt;
@@ -185,22 +200,23 @@
  &lt;/map:select&gt;
 &lt;/map:match&gt;
         </source>
-        
-        <p>The above allows us to create links to un-processed skinned files stored
-        in the <code>{project:content}</code> or <code>{project:content.xdocs}</code> 
-        directory. For example:  
-        &lt;a href="/test1.html"&gt;HTML content&lt;/a&gt;. However, it will
-        break the 0.7 behaviour of skinning HTML content. For this reason the old
-        ".ehtml" extension can be used to embed HTML content in a Forrest skinned
-        site </p>
-                
-        <p>Note that you can change the matchers above to selectively serve some
-        content as raw un-processed content, whilst still serving other content
-        as skinned documents. For example, the following snippet would allow
-        you to serve the content of an old, deprecated site without processing
-        from Forrest, whilst still allowing all other content to be processed 
-        by Forrest in the normal way:</p>
-        
+        <p>
+          The above allows us to create links to un-processed skinned files
+          stored in the <code>{project:content}</code> or
+          <code>{project:content.xdocs}</code> directory. For example: &lt;a
+          href="/test1.html"&gt;HTML content&lt;/a&gt;. However, it will break
+          the 0.7 behaviour of skinning HTML content. For this reason the old
+          ".ehtml" extension can be used to embed HTML content in a Forrest
+          skinned site
+        </p>
+        <p>
+          Note that you can change the matchers above to selectively serve some
+          content as raw un-processed content, whilst still serving other
+          content as skinned documents. For example, the following snippet would
+          allow you to serve the content of an old, deprecated site without
+          processing from Forrest, whilst still allowing all other content to be
+          processed by Forrest in the normal way:
+        </p>
         <source>
 &lt;map:match pattern="old_site/**.html"&gt;
  &lt;map:select type="exists"&gt;
@@ -214,81 +230,106 @@
   &lt;/map:when&gt;
 &lt;/map:match&gt;
         </source>
-        
-        <p>For example, <a href="/old_site/test1.html">HTML content</a>.</p>
+        <p>
+          For example, <a href="/old_site/test1.html">HTML content</a>.
+        </p>
       </section>
     </section>
-
     <section id="url">
       <title>Full URL to external documents</title>
-      <p>A full URL ...</p>
-      <source><![CDATA[<a href="http://forrest.apache.org/">]]><a href="http://forrest.apache.org/">http://forrest.apache.org/</a><![CDATA[</a>]]></source>
-      <p>A full URL with a fragment identifier ...</p>
-      <source><![CDATA[<a href="http://forrest.apache.org/faq.html#link_raw">]]><a href="http://forrest.apache.org/faq.html#link_raw">http://forrest.apache.org/faq.html#link_raw</a><![CDATA[</a>]]></source>
       <p>
-      Note that Forrest does not traverse external links to look for
-      other links.
+        A full URL ...
+      </p>
+      <source>
+<![CDATA[<a href="http://forrest.apache.org/">]]><a href="http://forrest.apache.org/">http://forrest.apache.org/</a>
+<![CDATA[</a>]]>
+      </source>
+      <p>
+        A full URL with a fragment identifier ...
+      </p>
+      <source>
+<![CDATA[<a href="http://forrest.apache.org/faq.html#link_raw">]]><a href="http://forrest.apache.org/faq.html#link_raw">http://forrest.apache.org/faq.html#link_raw</a>
+<![CDATA[</a>]]>
+      </source>
+      <p>
+        Note that Forrest does not traverse external links to look for other
+        links.
       </p>
     </section>
-
     <section id="site">
       <title>Using site.xml to manage the links</title>
-      <p>As you will have discovered, using pathnames with ../../ etc. will
-      get very nasty. Real problems occur when you use a smart text editor
-      that tries to manage the links for you. For example, it will have
-      trouble linking to the raw content files which are not yet in their
-      final location.
+      <p>
+        As you will have discovered, using pathnames with ../../ etc. will get
+        very nasty. Real problems occur when you use a smart text editor that
+        tries to manage the links for you. For example, it will have trouble
+        linking to the raw content files which are not yet in their final
+        location.
       </p>
       <p>
-      Links and filenames are bound to change and re-arrange. It is
-      essential to only change those links in one central place, not in every
-      document.
+        Links and filenames are bound to change and re-arrange. It is essential
+        to only change those links in one central place, not in every document.
       </p>
       <p>
-      The "<code>site.xml</code>" configuration file to the rescue. It maps
-      symbolic names to actual resources.
+        The "<code>site.xml</code>" configuration file to the rescue. It maps
+        symbolic names to actual resources.
       </p>
-
       <section id="site-simple">
         <title>Basic link to internal generated pages</title>
-        <p>This single entry ...</p>
-        <source><![CDATA[<index label="Index" href="index.html"/>]]></source>
         <p>
-        enables a simple link to a generated document, which corresponds to 
-        <code>content/xdocs/index.xml</code> ...
+          This single entry ...
         </p>
-        <source><![CDATA[<a href="site:index">]]><a href="site:index">site:index</a><![CDATA[</a>]]></source>
+        <source>
+<![CDATA[<index label="Index" href="index.html"/>]]>
+        </source>
+        <p>
+          enables a simple link to a generated document, which corresponds to
+          <code>content/xdocs/index.xml</code> ...
+        </p>
+        <source>
+<![CDATA[<a href="site:index">]]><a href="site:index">site:index</a>
+<![CDATA[</a>]]>
+        </source>
       </section>
-
       <section id="site-compound">
         <title>Group some items</title>
-        <p>This compound entry ...</p>
-        <source><![CDATA[
+        <p>
+          This compound entry ...
+        </p>
+        <source>
+<![CDATA[
   <samples label="Samples" href="samples/" tab="samples">
     <faq label="FAQ" href="faq.html"/>
     ...
   </samples>
-]]></source>
+]]>
+        </source>
         <p>
-        enables a link to a generated document, which corresponds to 
-        <code>content/xdocs/samples/index.xml</code> ...
+          enables a link to a generated document, which corresponds to
+          <code>content/xdocs/samples/index.xml</code> ...
         </p>
-        <source><![CDATA[<a href="site:samples">]]><a href="site:samples">site:samples</a><![CDATA[</a>]]></source>
+        <source>
+<![CDATA[<a href="site:samples">]]><a href="site:samples">site:samples</a>
+<![CDATA[</a>]]>
+        </source>
         <p>
-        and a link to a generated document, which corresponds to 
-        <code>content/xdocs/samples/faq.xml</code> ...
+          and a link to a generated document, which corresponds to
+          <code>content/xdocs/samples/faq.xml</code> ...
         </p>
         <source>
-<![CDATA[<a href="site:faq">]]><a href="site:faq">site:faq</a><![CDATA[</a>]]>
+<![CDATA[<a href="site:faq">]]><a href="site:faq">site:faq</a>
+<![CDATA[</a>]]>
 which can also be a complete reference
-<![CDATA[<a href="site:samples/faq">]]><a href="site:samples/faq">site:samples/faq</a><![CDATA[</a>]]>
+<![CDATA[<a href="site:samples/faq">]]><a href="site:samples/faq">site:samples/faq</a>
+<![CDATA[</a>]]>
         </source>
       </section>
-
       <section id="site-fragment">
         <title>Fragment identifiers</title>
-        <p>This compound entry ...</p>
-        <source><![CDATA[
+        <p>
+          This compound entry ...
+        </p>
+        <source>
+<![CDATA[
   <samples label="Samples" href="samples/" tab="samples">
     <sample label="Apache document" href="sample.html">
       <top href="#top"/>
@@ -296,69 +337,91 @@
     </sample>
     ...
   </samples>
-]]></source>
+]]>
+        </source>
         <p>
-        enables a link to a fragment identifier within the
-        <code>samples/sample.html</code> document ...
+          enables a link to a fragment identifier within the
+          <code>samples/sample.html</code> document ...
         </p>
-        <source><![CDATA[<a href="site:samples/sample/section">]]><a href="site:samples/sample/section">site:samples/sample/section</a><![CDATA[</a>]]></source>
+        <source>
+<![CDATA[<a href="site:samples/sample/section">]]><a href="site:samples/sample/section">site:samples/sample/section</a>
+<![CDATA[</a>]]>
+        </source>
       </section>
-
       <section id="site-raw">
         <title>Define items for raw content</title>
-        <p>This entry ...</p>
-        <source><![CDATA[<hello_print href="hello.pdf"/>]]></source>
         <p>
-        enables a link to a raw document, which corresponds to 
-        <code>content/hello.pdf</code> ...
+          This entry ...
         </p>
-        <source><![CDATA[<a href="site:hello_print">]]><a href="site:hello_print">site:hello_print</a><![CDATA[</a>]]></source>
-
+        <source>
+<![CDATA[<hello_print href="hello.pdf"/>]]>
+        </source>
+        <p>
+          enables a link to a raw document, which corresponds to
+          <code>content/hello.pdf</code> ...
+        </p>
+        <source>
+<![CDATA[<a href="site:hello_print">]]><a href="site:hello_print">site:hello_print</a>
+<![CDATA[</a>]]>
+        </source>
       </section>
-
       <section id="site-ext">
         <title>External links</title>
-        <p>This compound entry ...</p>
-        <source><![CDATA[
+        <p>
+          This compound entry ...
+        </p>
+        <source>
+<![CDATA[
   <external-refs>
     <forrest href="http://forrest.apache.org/">
       <linking href="docs/linking.html"/>
       <webapp href="docs/your-project.html#webapp"/>
     </forrest>
   </external-refs>
-]]></source>
+]]>
+        </source>
         <p>
-        enables a link to an external URL ...
+          enables a link to an external URL ...
         </p>
-        <source><![CDATA[<a href="ext:forrest">]]><a href="ext:forrest">ext:forrest</a><![CDATA[</a>]]></source>
+        <source>
+<![CDATA[<a href="ext:forrest">]]><a href="ext:forrest">ext:forrest</a>
+<![CDATA[</a>]]>
+        </source>
         <p>
-        and a link to another external URL ...
+          and a link to another external URL ...
         </p>
         <source>
-<![CDATA[<a href="ext:linking">]]><a href="ext:linking">ext:linking</a><![CDATA[</a>]]>
+<![CDATA[<a href="ext:linking">]]><a href="ext:linking">ext:linking</a>
+<![CDATA[</a>]]>
 which can also be a complete reference
-<![CDATA[<a href="ext:forrest/linking">]]><a href="ext:forrest/linking">ext:forrest/linking</a><![CDATA[</a>]]>
+<![CDATA[<a href="ext:forrest/linking">]]><a href="ext:forrest/linking">ext:forrest/linking</a>
+<![CDATA[</a>]]>
         </source>
         <p>
-        and a link to another external URL with a fragment identifier ...
+          and a link to another external URL with a fragment identifier ...
         </p>
         <source>
-<![CDATA[<a href="ext:webapp">]]><a href="ext:webapp">ext:webapp</a><![CDATA[</a>]]>
+<![CDATA[<a href="ext:webapp">]]><a href="ext:webapp">ext:webapp</a>
+<![CDATA[</a>]]>
 which can also be a complete reference
-<![CDATA[<a href="ext:forrest/webapp">]]><a href="ext:forrest/webapp">ext:forrest/webapp</a><![CDATA[</a>]]>
+<![CDATA[<a href="ext:forrest/webapp">]]><a href="ext:forrest/webapp">ext:forrest/webapp</a>
+<![CDATA[</a>]]>
         </source>
       </section>
     </section>
-
     <section id="images">
       <title>Images</title>
       <p>
-        Images (and other resources) are handled by the main/webapp/resource.xmap sitemap.
-        It uses the main/webapp/locationmap.xml to look in various locations for images.
-        As usual, the first match wins.
+        Images (and other resources) are handled by the
+        main/webapp/resource.xmap sitemap. It uses the
+        main/webapp/locationmap.xml to look in various locations for images. As
+        usual, the first match wins.
       </p>
-      <p> Here is the locationmap snippet ... </p>
-      <source><![CDATA[
+      <p>
+        Here is the locationmap snippet ...
+      </p>
+      <source>
+<![CDATA[
     <match pattern="project.images.**.*">
       <select>
         <location src="{project:resources.images}{1}.{2}" />
@@ -367,18 +430,25 @@
         <location src="{project:content.xdocs}{1}.{2}" />
       </select>
     </match>
-]]></source>
-      <p>Which means look first in a project-defined images directory, then in the
-        default location (which is usually src/documentation/resources/images/),
-        then in the old default location (src/documentation/content/xdocs/images/),
-        then relative to the root of your xdocs.</p>
-      <p>
-        The document author specifies the final image locations with these various
-        "<code>src=</code>" links. Behind-the-scenes Cocoon handles the requests
-        using the sitemap and locationmap.
+]]>
+      </source>
+      <p>
+        Which means look first in a project-defined images directory, then in
+        the default location (which is usually
+        src/documentation/resources/images/), then in the old default location
+        (src/documentation/content/xdocs/images/), then relative to the root of
+        your xdocs.
       </p>
-      <p>This sample has the following image locations:</p>
-      <source><![CDATA[
+      <p>
+        The document author specifies the final image locations with these
+        various "<code>src=</code>" links. Behind-the-scenes Cocoon handles the
+        requests using the sitemap and locationmap.
+      </p>
+      <p>
+        This sample has the following image locations:
+      </p>
+      <source>
+<![CDATA[
     src/documentation/resources/images/ellipse-2.svg
     src/documentation/resources/images/icon-a.png
     src/documentation/resources/images/icon-b.png
@@ -387,42 +457,33 @@
     src/documentation/content/xdocs/samples/icon-d.png
     src/documentation/content/xdocs/samples/ellipse.svg
     src/documentation/content/xdocs/samples/cocoon-pyramid.aart
-]]></source>
-      <p>Here is the effect of the various image links ...</p>
+]]>
+      </source>
+      <p>
+        Here is the effect of the various image links ...
+      </p>
       <ol>
-        <li>
-          <img src="/images/icon-a.png" alt="Icon" />
-          <code>&lt;img src="/images/icon-a.png"</code>
+        <li><img src="/images/icon-a.png" alt="Icon" /><code>&lt;img src="/images/icon-a.png"</code>
           ... The source file is found in src/documentation/resources/images/ directory.
         </li>
-        <li>
-          <img src="/images/sub-dir/icon-c.png" alt="Icon" />
-          <code>&lt;img src="/images/sub-dir/icon-c.png"</code>
+        <li><img src="/images/sub-dir/icon-c.png" alt="Icon" /><code>&lt;img src="/images/sub-dir/icon-c.png"</code>
           ... The source file is found in src/documentation/resources/images/sub-dir/ directory.
         </li>
-        <li>
-          <img src="/images/icon-e.png" alt="Icon" />
-          <code>&lt;img src="/images/icon-e.png"</code>
+        <li><img src="/images/icon-e.png" alt="Icon" /><code>&lt;img src="/images/icon-e.png"</code>
           ... The source file is not found in the normal src/documentation/resources/images/
           so Cocoon looks in the next location and finds the source in
           src/documentation/content/xdocs/images/ directory.
           This supports backward-compatibility for this old default location.
         </li>
-        <li>
-          <img src="images/icon-a.png" alt="Icon" />
-          <code>&lt;img src="images/icon-a.png"</code>
+        <li><img src="images/icon-a.png" alt="Icon" /><code>&lt;img src="images/icon-a.png"</code>
           ... same as example 1 above. Except this time the generated image is relative to the document.
         </li>
-        <li>
-          <img src="../images/icon-a.png" alt="Icon" />
-          <code>&lt;img src="../images/icon-a.png"</code>
+        <li><img src="../images/icon-a.png" alt="Icon" /><code>&lt;img src="../images/icon-a.png"</code>
           ... Relative reference. Forrest "absolutizes" the URLs to be like the URLs
           in examples 1 and 2 and 3. Then Cocoon looks in the normal locations as described above.
           The source file is found in src/documentation/resources/images/ directory.
         </li>
-        <li>
-          <img src="../../images/icon-b.png" alt="Icon" />
-          <code>&lt;img src="../../images/icon-b.png"</code>
+        <li><img src="../../images/icon-b.png" alt="Icon" /><code>&lt;img src="../../images/icon-b.png"</code>
           ... Broken relative reference (it points up beyond the document root).
           Never mind, Forrest "absolutizes" the URLs to be like the URLs in examples 1 and 2 and 3. 
           The source file is found in src/documentation/resources/images/ directory.
@@ -431,9 +492,8 @@
           It is better to use absolute /image/ URLs or be very careful about using
           such relative links (Forrest will not repart an error).
         </li>
-      <li>
-        <img src="/images/ellipse-2.png" alt="Icon" /><br />
-        <code>&lt;img src="/images/ellipse-2.png"</code>
+        <li><img src="/images/ellipse-2.png" alt="Icon" />
+          <br /><code>&lt;img src="/images/ellipse-2.png"</code>
         ... Cocoon tried the various locations for a PNG image called
         ellipse-2.png but did not find one anywhere. So the next sitemap match
         looks for a corresponding
@@ -450,31 +510,33 @@
         </li>
 -->
       </ol>
-      <p>The image links shown above are handled by the resources.xmap using
-      special matches for the "images" directory in the URI.
+      <p>
+        The image links shown above are handled by the resources.xmap using
+        special matches for the "images" directory in the URI.
+      </p>
+      <p>
+        The main/webapp/resources.xmap has another section to deal specifically
+        with PNG images. It looks first for an SVG source file which will be
+        used to generate the PNG image. If that is not found then it looks for
+        an ASCII art source file. Then looks for a pre-prepared PNG image.
       </p>
-      <p>The main/webapp/resources.xmap has another section to deal specifically with PNG images. It looks first for an SVG source file which will be used to generate the PNG image. If that is not found then it looks for an ASCII art source file. Then looks for a pre-prepared PNG image.</p>
       <ol>
-       <li>
-        <img src="ellipse.png" alt="Icon" /><br />
-        <code>&lt;img src="ellipse.png"</code>
+        <li><img src="ellipse.png" alt="Icon" />
+          <br /><code>&lt;img src="ellipse.png"</code>
         ... Cocoon tried the various locations for a PNG image called
         ellipse-2.png but did not find one anywhere. So the next sitemap match
         looks for a corresponding
         ellipse-2.svg and generates the PNG image on-the-fly.
         The source file is found in the current directory src/documentation/content/xdocs/samples/
       </li>
-      <li>
-        <img src="cocoon-pyramid.png" alt="Icon"/><br />
-        <code>&lt;img src="cocoon-pryamid.png"</code>
+        <li><img src="cocoon-pyramid.png" alt="Icon"/>
+          <br /><code>&lt;img src="cocoon-pryamid.png"</code>
         ... ASCII Art. Cocoon did not find a PNG image, nor an SVG file.
         So the next sitemap match looks for a corresponding
         cocoon-pryamid.aart and generates the PNG image on-the-fly.
         The source file is found in the current directory src/documentation/content/xdocs/samples/
         </li>
-        <li>
-          <img src="icon-d.png" alt="Icon" />
-          <code>&lt;img src="icon-d.png"</code>
+        <li><img src="icon-d.png" alt="Icon" /><code>&lt;img src="icon-d.png"</code>
           ... Relative to this document.
           The source file is found in the current directory src/documentation/content/xdocs/samples/
         </li>
@@ -482,11 +544,11 @@
       <note>
         You might wonder why the above images all show correctly in dynamic
         'forrest run' mode, but some appear to be broken during static docs
-        generation 'forrest site' mode. The latter is for generating a set
-        of static docs for deployment to a server. If you used URLs beginning
-        with a slash, "/images/...", then that is their location. So the
-        generated docs on the
-        "<a href="ext:forrest-zone">forrest zone</a>" demos appear to be broken.
+        generation 'forrest site' mode. The latter is for generating a set of
+        static docs for deployment to a server. If you used URLs beginning with
+        a slash, "/images/...", then that is their location. So the generated
+        docs on the "<a href="ext:forrest-zone">forrest zone</a>" demos appear
+        to be broken.
       </note>
     </section>
   </body>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/sample.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/sample.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/sample.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/sample.xml Mon Apr  9 23:05:03 2007
@@ -16,223 +16,246 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.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 <a href="#changes">DTD changes</a> 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
+      <a href="#changes">DTD changes</a> 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
+      <p>
+        <strong>Hint:</strong> See the xml source to see how the various
+        elements are used and see the
 <!-- FOR-321 workaround
       <a href="ext:dtd-docs">DTD reference documentation</a>.
 -->
-      <a href="http://forrest.apache.org/docs/dtd-docs.html">DTD reference documentation</a>.
+        <a href="http://forrest.apache.org/docs/dtd-docs.html">DTD reference
+        documentation</a>.
       </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
               <a href="../index.html" title="Example of a document via link">link</a>
               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
               <a href="#section" title="Example of a document via local anchor">link</a>
               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
               <a href="../index.html#status" title="Example of a document via link and anchor">link</a>
               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
              <a href="#link-class">using class attribute on links</a>.
-            </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>Or even tables.. </td><td>
-                <table><tr><td>inside tables..</td></tr></table>
-            </td></tr>
-            <tr><td>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>Or even tables.. </td>
+                <td>
+                  <table>
+                    <tr>
+                      <td>inside tables..</td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
+              <tr>
+                <td>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
-        &#60;disable-XXX-link&#62; 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
+          &#60;disable-XXX-link&#62; elements in the skinconf.xml
+        </p>
         <table>
           <tr>
             <th>Presentation Format</th>
-
             <th>Description</th>
-
             <th>skinconf.xml Element</th>
           </tr>
-
           <tr>
-            <td><a href="sample.html">HTML</a></td>
-
+            <td><a href="sample.html">HTML</a>
+            </td>
             <td>This document in HTML format. </td>
-
             <td>Always generated by default. Cannot be turned off.</td>
           </tr>
-
           <tr>
-            <td><a href="sample.xml">XML</a></td>
-
+            <td><a href="sample.xml">XML</a>
+            </td>
             <td>This document in its raw XML format.</td>
-
             <td>&#60;disable-xml-link&#62;. By default, set to true, meaning
             that this link will not be shown.</td>
           </tr>
-
           <tr>
-            <td><a href="sample.pdf">PDF</a></td>
-
+            <td><a href="sample.pdf">PDF</a>
+            </td>
             <td>This document as Adobe PDF</td>
-
             <td>&#60;disable-pdf-link&#62;. By default, set to false, meaning
             that this link will be shown.</td>
           </tr>
-
           <tr>
             <td>Text</td>
-
-            <td><p>This document as straight text.</p>
-            <p>For additional information see the Forrest text-output
-            plugin.</p></td>
-
+            <td>
+              <p>
+                This document as straight text.
+              </p>
+              <p>
+                For additional information see the Forrest text-output plugin.
+              </p>
+            </td>
             <td>&#60;disable-txt-link&#62;. By default, set to true, meaning
             that this link will not be shown.</td>
           </tr>
-
           <tr>
             <td>POD</td>
-
-            <td><p>This document as Perl POD (Plain Old Documentation). Text
-            with minimal formatting directives. If on a *nix system with perl
-            installed, see &#34;man perlpod&#34;.</p>
-            <p>For additional information see the Forrest pod-output
-            plugin.</p></td>
-
+            <td>
+              <p>
+                This document as Perl POD (Plain Old Documentation). Text with
+                minimal formatting directives. If on a *nix system with perl
+                installed, see &#34;man perlpod&#34;.
+              </p>
+              <p>
+                For additional information see the Forrest pod-output plugin.
+              </p>
+            </td>
             <td>&#60;disable-pod-link&#62;. 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>
 // This example is from the book _Java in a Nutshell_ by David Flanagan.
 // Written by David Flanagan.  Copyright (c) 1996 O'Reilly &amp; Associates.
@@ -249,23 +272,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> 
-        <source><![CDATA[
+        <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>
+<![CDATA[
 <pointy>
   easy
 </pointy>
-]]></source>
-        <p>Please take care to still use a sensible line-length within your
-          source elements.</p>
+]]>
+        </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>
@@ -286,7 +314,7 @@
                 <tr>
                   <th>column 1</th>
                   <th>column 2</th>
-                </tr> 
+                </tr>
                 <tr>
                   <td>cell A</td>
                   <td>cell B</td>
@@ -294,68 +322,86 @@
               </table>
             </td>
             <td>
-              <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><p>Document V1.3</p></th>
-
-            <th><p>Document V2.0</p></th>
+            <th>
+              <p>
+                Document V1.3
+              </p>
+            </th>
+            <th>
+              <p>
+                Document V2.0
+              </p>
+            </th>
           </tr>
-
           <tr>
-            <td><p>&lt;fork href="../index.html"&gt;</p></td>
-
+            <td>
+              <p>
+                &lt;fork href="../index.html"&gt;
+              </p>
+            </td>
             <td><a class="fork" href="../index.html">&lt;a class="fork"
-            href="../index.html"&gt;</a></td>
+            href="../index.html"&gt;</a>
+            </td>
           </tr>
-
           <tr>
-            <td><p>&lt;jump href="../index.html"&gt;</p></td>
-
-            <td><p><a class="jump" href="../index.html">&lt;a class="jump"
-            href="../index.html"&gt;</a></p></td>
+            <td>
+              <p>
+                &lt;jump href="../index.html"&gt;
+              </p>
+            </td>
+            <td>
+              <p>
+                <a class="jump" href="../index.html">&lt;a class="jump"
+                href="../index.html"&gt;</a>
+              </p>
+            </td>
           </tr>
         </table>
       </section>
     </section>
-
     <section id="changes">
       <title>DTD changes</title>
-      <p>See the generated
+      <p>
+        See the generated
 <!-- FOR-321 workaround
       <a href="ext:dtd-docs">DTD reference documentation</a>.
 -->
-      <a href="http://forrest.apache.org/docs/dtd-docs.html">DTD reference documentation</a>.
+        <a href="http://forrest.apache.org/docs/dtd-docs.html">DTD reference
+        documentation</a>.
       </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
@@ -399,8 +445,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/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/static.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/static.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/static.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/static.xml Mon Apr  9 23:05:03 2007
@@ -16,45 +16,46 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Static content - including raw un-processed files and documents</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Static content - including raw un-processed files and documents</title>
+  </header>
+  <body>
     <section>
       <title>Linking to static content</title>
       <p>
-        You can place some types of raw content into the xdocs directory. For example,
-        you can place a PDF file in <code>src/documentation/content/xdocs</code> and link
-        to it normally, 
-        <strong>&lt;a href="../hello.pdf"&gt;</strong><a href="../hello.pdf">hello.pdf</a><strong>&lt;/a&gt;</strong>
-        However, note that if the file is one that Forrest is able to process, for example
-        an HTML file, these files will be processed accordingly.</p>
-      
+        You can place some types of raw content into the xdocs directory. For
+        example, you can place a PDF file in
+        <code>src/documentation/content/xdocs</code> and link to it normally,
+        <strong>&lt;a
+        href="../hello.pdf"&gt;</strong><a href="../hello.pdf">hello.pdf</a><strong>&lt;/a&gt;</strong>
+        However, note that if the file is one that Forrest is able to process,
+        for example an HTML file, these files will be processed accordingly.
+      </p>
       <p>
-        It is also worth noting that files in the xdocs directory will only be copied 
-        into your final site if there is a link to them somewhere in the site. See the next
-        section for details of how to include content that is not linked.</p>
-        
+        It is also worth noting that files in the xdocs directory will only be
+        copied into your final site if there is a link to them somewhere in the
+        site. See the next section for details of how to include content that is
+        not linked.
+      </p>
       <p>
-        For more information see the
-        <a href="site:linking">Linking demonstration</a>.</p>
+        For more information see the <a href="site:linking">Linking
+        demonstration</a>.
+      </p>
     </section>
-    
     <section>
       <title>Including Static Content that is Not Linked</title>
-      
       <p>
-        You can include raw HTML, PDFs, plain-text, and other files. In your final site by
-        placing them in the <code>src/documentation/content</code> directory. Files in this
-        directory will be copied over automatically but will not be processed in any way by
-        Forrest, that is they will be linked to as raw files.</p>
-        
+        You can include raw HTML, PDFs, plain-text, and other files. In your
+        final site by placing them in the <code>src/documentation/content</code>
+        directory. Files in this directory will be copied over automatically but
+        will not be processed in any way by Forrest, that is they will be linked
+        to as raw files.
+      </p>
       <p>
-        You can also have sub-directories such as 
-        <code>src/documentation/content/samples/subdir/</code> which
-        reflects your main
-        <code>xdocs/</code> tree. The raw files will then end up
+        You can also have sub-directories such as
+        <code>src/documentation/content/samples/subdir/</code> which reflects
+        your main <code>xdocs/</code> tree. The raw files will then end up
         beside your documents.
       </p>
     </section>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/book-sample.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/book-sample.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/book-sample.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/book-sample.xml Mon Apr  9 23:05:03 2007
@@ -16,32 +16,27 @@
   limitations under the License.
 -->
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "http://forrest.apache.org/dtd/book-cocoon-v10.dtd">
-
 <!-- Sample book.xml file.  If this file is renamed to 'book.xml', it will be
 used to define the menu in this subdirectory, instead of that generated from
 the usual site.xml mechanism. The normal relative and absolute hrefs are also
 available. -->
-
 <book software="MyProj"
   title="MyProj"
   copyright="@year@ The Apache Software Foundation"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
   <menu label="About">
-    <!-- using the normal site.xml linking mechanism -->
+<!-- using the normal site.xml linking mechanism -->
     <menu-item label="Index" href="site:index"/>
-    <!-- using relative URIs with relative path -->
+<!-- using relative URIs with relative path -->
     <menu-item label="Sample page" href="../sample.html"/>
-    <!-- using relative URIs with absolute path -->
+<!-- using relative URIs with absolute path -->
     <menu-item label="Sample ihtml page" href="/samples/ihtml-sample.html"/>
-    <!-- using the normal site.xml linking mechanism -->
+<!-- using the normal site.xml linking mechanism -->
     <menu-item label="FAQ" href="site:faq"/>
     <menu-item label="Changes" href="site:changes"/>
     <menu-item label="Todo" href="site:todo"/>
   </menu>
-
   <menu label="Subdir">
     <menu-item label="index" href="site:subdir/index"/>
   </menu>
-
 </book>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/index.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/index.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/subdir/index.xml Mon Apr  9 23:05:03 2007
@@ -17,22 +17,22 @@
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
-   <header>
-      <title>Page generated from a sub-directory</title>
-
-      <authors>
-        <person name="Joe Bloggs" email="joe@joescompany.org" />
-       </authors>
-   </header>
-
-   <body>
-     <section>
-       <title>A sub-directory</title>
-       <p>This was generated from a sub-directory.</p>
-       <p>When creating new subdirectories, remember that these <em>must</em>
-         be declared in site.xml or each directory must have a book.xml file.
-       </p>
-      </section>
-   </body>
+  <header>
+    <title>Page generated from a sub-directory</title>
+    <authors>
+      <person name="Joe Bloggs" email="joe@joescompany.org" />
+    </authors>
+  </header>
+  <body>
+    <section>
+      <title>A sub-directory</title>
+      <p>
+        This was generated from a sub-directory.
+      </p>
+      <p>
+        When creating new subdirectories, remember that these <em>must</em> be
+        declared in site.xml or each directory must have a book.xml file.
+      </p>
+    </section>
+  </body>
 </document>
-

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/svg.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/svg.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/svg.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/svg.xml Mon Apr  9 23:05:03 2007
@@ -16,25 +16,24 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Using Scalable Vector Graphics (SVG)</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Using Scalable Vector Graphics (SVG)</title>
+  </header>
+  <body>
     <p>
-      Forrest can deliver raw SVG files for capable browsers, e.g. Firefox.
-      See <a href="ellipse.svg">example</a>.
+      Forrest can deliver raw SVG files for capable browsers, e.g. Firefox. See
+      <a href="ellipse.svg">example</a>.
     </p>
     <p>
-      Forrest can convert SVG files into Portable Network Graphic (PNG).
-      See <a href="ellipse.png">example</a>. Note that Forrest will first
-      look for a pre-prepared PNG file, and if not found then it will
-      generate the PNG from the SVG.
+      Forrest can convert SVG files into Portable Network Graphic (PNG). See
+      <a href="ellipse.png">example</a>. Note that Forrest will first look for a
+      pre-prepared PNG file, and if not found then it will generate the PNG from
+      the SVG.
     </p>
     <p>
-      Be careful. We only provide a local copy of the SVG 1.0 DTD
-      so if you use SVG 1.1 then there will be network trips
-      for the DTDs. 
+      Be careful. We only provide a local copy of the SVG 1.0 DTD so if you use
+      SVG 1.1 then there will be network trips for the DTDs.
       <a href="http://forrest.apache.org/docs/dev/validation.html#catalog">Configure</a>
       your local catalog entity resolver for your local DTD copies.
     </p>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/usemap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/usemap.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/usemap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/usemap.xml Mon Apr  9 23:05:03 2007
@@ -16,11 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Interactive client-side imagemaps - the usemap attribute</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Interactive client-side imagemaps - the usemap attribute</title>
+  </header>
+  <body>
     <section id="demo">
       <title>Imagemap demo</title>
       <p>
@@ -40,7 +40,8 @@
     </section>
     <section id="source">
       <title>Source code</title>
-      <source><![CDATA[
+      <source>
+<![CDATA[
       <p>
         <img src="/images/usemap.gif" usemap="#my-map"
           alt="usemap demo" width="256" height="256"/>
@@ -55,7 +56,8 @@
              alt="Default" href="http://www.apache.org"/>
         </map>
       </p>
-]]></source>
+]]>
+      </source>
     </section>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/xml-entities.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/xml-entities.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/xml-entities.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/samples/xml-entities.xml Mon Apr  9 23:05:03 2007
@@ -21,53 +21,51 @@
     "symbols-project-v10.ent"> 
   %symbols-project;
 ]>
-<document> 
-  <header> 
-    <title>Using XML entities for character replacements</title> 
-  </header> 
-  <body> 
-    <p>
-      All of the normal xml character entities are available for use
-      in your source documents.
-      So you can use "<code>&amp;trade;</code>"
-      for the trademark symbol (&trade;)
-      and use "<code>&amp;ouml;</code>"
-      for special accents (&ouml;).
-    </p>
-    <p>
-      Forrest also has some default sets of symbols. There is one set
-      for the core of Forrest. These are automatically available
-      for use in the "document-v*" series of document types.
-      (If you want to use them in another document type, then you
-      need to specify them in the document type declaration of your
-      xml instance documents or in your custom DTD. See below.)
-    </p>
-    <p>
-      For example,
-      use "<code>&amp;for-s;</code>" to represent the strong
-      text string "&for-s;". See the list of available symbols at
+<document>
+  <header>
+    <title>Using XML entities for character replacements</title>
+  </header>
+  <body>
+    <p>
+      All of the normal xml character entities are available for use in your
+      source documents. So you can use "<code>&amp;trade;</code>" for the
+      trademark symbol (&trade;) and use "<code>&amp;ouml;</code>" for special
+      accents (&ouml;).
+    </p>
+    <p>
+      Forrest also has some default sets of symbols. There is one set for the
+      core of Forrest. These are automatically available for use in the
+      "document-v*" series of document types. (If you want to use them in
+      another document type, then you need to specify them in the document type
+      declaration of your xml instance documents or in your custom DTD. See
+      below.)
+    </p>
+    <p>
+      For example, use "<code>&amp;for-s;</code>" to represent the strong text
+      string "&for-s;". See the list of available symbols at
       <code>main/webapp/resources/schema/entity/symbols-core-v10.ent</code>
-      which shows that that example entity was declared as
-      <code><![CDATA[<strong>Apache Forrest</strong>]]></code>.
+      which shows that that example entity was declared as <code>
+<![CDATA[<strong>Apache Forrest</strong>]]>
+      </code>.
     </p>
     <p>
-      You can supply lists of symbols for your own project too.
-      Create a fresh site with 'forrest seed' and see the set
+      You can supply lists of symbols for your own project too. Create a fresh
+      site with 'forrest seed' and see the set
       <code>src/documentation/resources/schema/symbols-project-v10.ent</code>
     </p>
     <p>
-      For example,
-      use "<code>&amp;myp-t;</code>" to represent the project name
+      For example, use "<code>&amp;myp-t;</code>" to represent the project name
       together with trademark symbol "&myp-t;".
     </p>
     <p>
-      The set of project symbols is already configured. To use the symbols
-      in your documents, add to the document type declaration. For example,
-      see the source for this document
+      The set of project symbols is already configured. To use the symbols in
+      your documents, add to the document type declaration. For example, see the
+      source for this document
       (<code>src/documentation/content/xdocs/samples/xml-entites.xml</code>)
       which declares the project symbol set ...
     </p>
-    <source><![CDATA[
+    <source>
+<![CDATA[
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd" [
 <!ENTITY % symbols-project
@@ -77,6 +75,7 @@
 ]>
 <document> 
   ...
-]]></source>
+]]>
+    </source>
   </body>
 </document>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/site.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/site.xml Mon Apr  9 23:05:03 2007
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Forrest site.xml
 
@@ -29,7 +28,6 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-
 <!-- The label attribute of the outer "site" element will only show
   in the linkmap (linkmap.html).
   Use elements project-name and group-name in skinconfig to change name of 
@@ -38,10 +36,8 @@
   always use index.html when you request http://yourHost/
   See FAQ: "How can I use a start-up-page other than index.html?"
 -->
-
 <site label="MyProj" href="" xmlns="http://apache.org/forrest/linkmap/1.0"
   tab="">
-
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to MyProj"/>
   </about>
@@ -78,10 +74,10 @@
       <index label="Index" href="index.html" description="Page generated from a
         sub-directory"/>
     </subdir>
-      <showonlywhenselected label="Conditional display of menuitems" href="showonlywhenselected/">
-          <page1 label="Always visible page" href="page1.html"/>
-          <page2 label="Visible only when current" href="page2.html" type="showWhenSelected"/>    
-      </showonlywhenselected>  
+    <showonlywhenselected label="Conditional display of menuitems" href="showonlywhenselected/">
+      <page1 label="Always visible page" href="page1.html"/>
+      <page2 label="Visible only when current" href="page2.html" type="showWhenSelected"/>
+    </showonlywhenselected>
   </samples>
   <plugins label="Plugins" href="pluginDocs/plugins_0_70/" tab="plugins">
     <index label="Index" href="index.html" description="List of plugins
@@ -91,7 +87,7 @@
     <hello_print href="hello.pdf"/>
     <test1 href="test1.html"/>
   </files>
-  <!--
+<!--
   The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">
     <whole_site_html label="Whole Site HTML" href="wholesite.html"/>
@@ -111,5 +107,4 @@
     <cocoon href="http://cocoon.apache.org/"/>
     <xml.apache.org href="http://xml.apache.org/"/>
   </external-refs>
-
 </site>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/tabs.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/tabs.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/forrest1SeedSite/src/xdocs/tabs.xml Mon Apr  9 23:05:03 2007
@@ -16,13 +16,11 @@
   limitations under the License.
 -->
 <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-
 <tabs software="MyProj"
   title="MyProj"
   copyright="Foo"
   xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <!-- The rules for tabs are:
+<!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -32,7 +30,6 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-
   <tab id="" label="Home" dir="" indexfile="index.html"/>
   <tab id="samples" label="Samples" dir="samples" indexfile="sample.html">
     <tab id="samples-index" label="Index" dir="samples" indexfile="index.html"/>
@@ -43,9 +40,8 @@
     <tab label="Xerces" href="http://xml.apache.org/xerces"/>
   </tab>
   <tab id="plugins" label="Plugins" dir="pluginDocs/plugins_0_70" indexfile="index.html"/>
-  <!-- Add new tabs here, eg:
+<!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->
-
 </tabs>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/forrestContext.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/forrestContext.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/forrestContext.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/forrestContext.xml Mon Apr  9 23:05:03 2007
@@ -16,29 +16,22 @@
   limitations under the License.
 -->
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
 <beans>
-
-	<!-- ============================================= -->
-	<!--                  Readers                      -->
-	<!-- ============================================= -->
-
-	<bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
-	<bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
-	
-	<!-- ============================================= -->
-	<!--               Input Plugins                   -->
-	<!-- ============================================= -->
-
-	<!-- ============================================= -->
-	<!--               Output Plugins                  -->
-	<!-- ============================================= -->
-
-	<bean id="html"
+<!-- ============================================= -->
+<!--                  Readers                      -->
+<!-- ============================================= -->
+  <bean id="http" class="org.apache.forrest.core.reader.HTTPReader"></bean>
+  <bean id="file" class="org.apache.forrest.core.reader.FileReader"></bean>
+<!-- ============================================= -->
+<!--               Input Plugins                   -->
+<!-- ============================================= -->
+<!-- ============================================= -->
+<!--               Output Plugins                  -->
+<!-- ============================================= -->
+  <bean id="html"
 		class="org.apache.forrest.core.plugin.XSLTOutputPlugin">
-		<property name="pattern" value="html" />
-		<property name="xsltPath"
+    <property name="pattern" value="html" />
+    <property name="xsltPath"
 			value="/xdocs/samples/xslt/internal-to-html.xsl" />
-	</bean>
-
+  </bean>
 </beans>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/locationmap.xml Mon Apr  9 23:05:03 2007
@@ -19,11 +19,9 @@
   <location regexp="(.*).xhtml2">
     <source href="classpath:/xdocs/$(1).xhtml2"/>
   </location>
-  
   <location regexp="(.*)/(.*).html">
     <source href="classpath:/xdocs/$(2).xhtml2"/>
   </location>
-
   <location regexp="(.*).html">
     <source href="classpath:/xdocs/$(1).xhtml2"/>
   </location>

Modified: forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2?view=diff&rev=527041&r1=527040&r2=527041
==============================================================================
--- forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2 (original)
+++ forrest/trunk/whiteboard/forrest2/core/src/examples/helloWorld/src/xdocs/bonjourMonde.xhtml2 Mon Apr  9 23:05:03 2007
@@ -20,12 +20,10 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.w3.org/2002/06/xhtml2/ http://www.w3.org/MarkUp/SCHEMA/xhtml2.xsd"
 >
-  <head> 
+  <head>
     <title>XHTML 2 Bonjour Monde</title>
-  </head> 
-  <body> 
-    <h>Bonjour Monde</h>
-    
-    <a href="helloWorld.html">English</a>
+  </head>
+  <body>
+    <h>Bonjour Monde</h><a href="helloWorld.html">English</a>
   </body>
-</html>
\ No newline at end of file
+</html>



Mime
View raw message