forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r526964 [1/2] - in /forrest/trunk/main/fresh-site: ./ src/documentation/ src/documentation/content/ src/documentation/content/xdocs/ src/documentation/content/xdocs/samples/ src/documentation/content/xdocs/samples/locationmap/ src/documenta...
Date Tue, 10 Apr 2007 00:09:24 GMT
Author: crossley
Date: Mon Apr  9 17:09:22 2007
New Revision: 526964

URL: http://svn.apache.org/viewvc?view=rev&rev=526964
Log:
Whitespace changes only. Using xmlformat. Issue: FOR-644

Modified:
    forrest/trunk/main/fresh-site/forrest.properties.xml
    forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/index.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/sample.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/showonlywhenselected/page1.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/showonlywhenselected/page2.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/static.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/subdir/book-sample.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/svg.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/usemap.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/xml-entities.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/site.xml
    forrest/trunk/main/fresh-site/src/documentation/content/xdocs/tabs.xml
    forrest/trunk/main/fresh-site/src/documentation/resources/schema/catalog.xcat
    forrest/trunk/main/fresh-site/src/documentation/resources/stylesheets/hello2document.xsl
    forrest/trunk/main/fresh-site/src/documentation/sitemap.xmap
    forrest/trunk/main/fresh-site/src/documentation/skinconf.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_af.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_es.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_it.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_no.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_ru.xml
    forrest/trunk/main/fresh-site/src/documentation/translations/menu_sk.xml

Modified: forrest/trunk/main/fresh-site/forrest.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/forrest.properties.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/forrest.properties.xml (original)
+++ forrest/trunk/main/fresh-site/forrest.properties.xml Mon Apr  9 17:09:22 2007
@@ -16,14 +16,14 @@
   limitations under the License.
 -->
 <properties>
-  <!--
+<!--
     # codename: Dispatcher
     # Dispatcher is using a fallback mechanism for theming.
     # You can configure the theme name and its extension here
     -->
   <property name="dispatcher.theme" value="pelt"/>
   <property name="dispatcher.theme-ext" value=".fv"/>
-  <!--SVG example for project/group logo-->
+<!--SVG example for project/group logo-->
   <property name="group-name" value="group"/>
   <property name="project-name" value="project"/>
 </properties>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/locationmap.xml Mon Apr  9 17:09:22 2007
@@ -20,7 +20,7 @@
     <matchers default="lm">
       <matcher name="lm" src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
-    <!--
+<!--
       * Can contain any sitemap selector with the following syntax. * 
     <selectors default="exists">
       <selector name="exists" logger="sitemap.selector.exists"  
@@ -28,27 +28,24 @@
     </selectors>
     -->
   </components>
-
-  <!--
+<!--
     * Can contain a mount statement as a sibling to components and locator *
     <mount src="somelocation.xml"/>
   -->
-
   <locator>
-    <!--
+<!--
       * Can contain a mount within a selector where a selector is valid. 
     <select>
       <mount src="somelocation.xml"/>
     </select>
     -->
-
     <match pattern="project.rewrite.**">
       <location src="http://cocoon.apache.org/{1}.html"/>
     </match>
     <match pattern="project.remote.**.xml">
       <location src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml"/>
     </match>
-    <!-- 
+<!-- 
       * Can use a selector inside a match.  *
     <match pattern="somepattern/**">
       <select>
@@ -58,7 +55,7 @@
       </select>
     </match>
     -->
-    <!--
+<!--
      To locate all your source documents in a slide repository you can do:
 
     <match pattern="tabs.xml">

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/index.xml Mon Apr  9 17:09:22 2007
@@ -16,34 +16,38 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to MyProj</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to MyProj</title>
+  </header>
+  <body>
     <section id="status">
       <title>Congratulations</title>
-      <p>You have successfully generated and rendered an <a
-          href="ext:forrest">Apache Forrest</a> site.
-        This page is from the site template. It is found in
-        <code>src/documentation/content/xdocs/index.xml</code>
-        Please edit it and replace this text with content of your own.</p>
+      <p>
+        You have successfully generated and rendered an
+        <a
+          href="ext:forrest">Apache Forrest</a> site. This page is
+        from the site template. It is found in
+        <code>src/documentation/content/xdocs/index.xml</code> Please edit it
+        and replace this text with content of your own.
+      </p>
     </section>
-
     <section id="examples">
       <title>Using examples as templates</title>
       <p>
-        This demo site has many examples. See the menu at the left.
-        The sources for these examples are in the directory
+        This demo site has many examples. See the menu at the left. The sources
+        for these examples are in the directory
         <code>src/documentation/content/xdocs/</code>
       </p>
       <p>
-        The sources for the Apache Forrest website are also included
-        in your distribution at <code>$FORREST_HOME/site-author/</code>
+        The sources for the Apache Forrest website are also included in your
+        distribution at <code>$FORREST_HOME/site-author/</code>
+      </p>
+      <p>
+        You can also extend the functionality of Forrest via
+        <a href="site:plugins">plugins</a>, these will often come with more
+        samples for you to out.
       </p>
-      <p>You can also extend the functionality of Forrest via 
-      <a href="site:plugins">plugins</a>,
-      these will often come with more samples for you to out.</p>
     </section>
   </body>
 </document>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml Mon Apr  9 17:09:22 2007
@@ -16,18 +16,25 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Ascii Art sample</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Ascii Art sample</title>
+  </header>
+  <body>
     <section>
       <title>Sample Ascii Art</title>
-      <p>To create a <code>.png</code> image like the one below with ASCII art, just save 
-         the text file with the <code>.aart</code> extension and then link from any page
-         as an image (<code>&lt;image src="asci-art-file.png"/&gt;</code>).</p> 
-      <p><img src="cocoon-pyramid.png" alt="cocoon pyramid of management-(logic-content-style)"/></p> 
-      <p>Here is the source file that has created the above image.</p>         
+      <p>
+        To create a <code>.png</code> image like the one below with ASCII art,
+        just save the text file with the <code>.aart</code> extension and then
+        link from any page as an image (<code>&lt;image
+        src="asci-art-file.png"/&gt;</code>).
+      </p>
+      <p>
+        <img src="cocoon-pyramid.png" alt="cocoon pyramid of management-(logic-content-style)"/>
+      </p>
+      <p>
+        Here is the source file that has created the above image.
+      </p>
       <source>
  
          +-------------------+
@@ -39,18 +46,20 @@
    | logic +--+ content +--+ style |  
    +-------+  +---------+  +-------+  
  
-      </source>  
-      <p>An ascii art pad recognized following ascii characters:</p>  
-        <ul>
-          <li> '-' horizontal SVG line</li>
-          <li>'|' vertical SVG line</li>
-          <li> '+' corner</li>
-          <li> \ oblique line</li>
-          <li> String starting with letter, digit, or '_' is converted to a SVG text.</li>
-        </ul>
+      </source>
+      <p>
+        An ascii art pad recognized following ascii characters:
+      </p>
+      <ul>
+        <li> '-' horizontal SVG line</li>
+        <li>'|' vertical SVG line</li>
+        <li> '+' corner</li>
+        <li> \ oblique line</li>
+        <li> String starting with letter, digit, or '_' is converted to a SVG text.</li>
+      </ul>
     </section>
-  </body> 
-  <footer> 
+  </body>
+  <footer>
     <legal>Copyright 2002-2005 The Apache Software Foundation or its licensors, as applicable.</legal>
   </footer>
 </document>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml Mon Apr  9 17:09:22 2007
@@ -16,39 +16,42 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Custom Schema</title> 
-  </header> 
-  <body> 
-    <p>Forrest comes with a set of schemas for common documents, however, if you have existing documents
-    that use a different schema you will want to tell Forrest how to work with them. The best way of doing
-    this is to <a href="ext:forrest/buildPlugin">build a plugin</a>
-    so that you can easily reuse the functionality on different projects. Plugins also allow you to share
-    this new functionality with other users, and to benefit from their contributions to your work.</p>
-    
-    <p>If you don't want to build a plugin you can make Forrest process them within your project sitemap 
-    (but this won't really save you any work since the process is almost the same). This sample site has
-    a demonstration of using a custom DTD. If you request <a href="site:custom-example">&lt;a href="custom.html"&gt;</a>
-    you can see the results.
-      </p>
-      <p>
-        Look at the project <code>sitemap.xmap</code> to see how it is done.
-        View the xml source at
-        "src/documentation/content/samples/custom.xml" and
-        refer to the DTD and its configuration at
-        "src/documentation/resources/schema/".
-        See the project sitemap at "src/documentation/sitemap.xmap" for how
-        the custom doctype is processed and the stylesheet is applied.
-      </p>
-      <p>
-        See the
-        <a href="ext:forrest/new_content_type">full story</a>
-        about handling custom document types.
-      </p>
-
-    <note>Adding custom schemas with a plugin has the added benefit of being able to add the schema
-    definition to the catalog file rather than having to reference it directly from within the XML
-    document.</note>
+<document>
+  <header>
+    <title>Custom Schema</title>
+  </header>
+  <body>
+    <p>
+      Forrest comes with a set of schemas for common documents, however, if you
+      have existing documents that use a different schema you will want to tell
+      Forrest how to work with them. The best way of doing this is to
+      <a href="ext:forrest/buildPlugin">build a plugin</a> so that you can
+      easily reuse the functionality on different projects. Plugins also allow
+      you to share this new functionality with other users, and to benefit from
+      their contributions to your work.
+    </p>
+    <p>
+      If you don't want to build a plugin you can make Forrest process them
+      within your project sitemap (but this won't really save you any work since
+      the process is almost the same). This sample site has a demonstration of
+      using a custom DTD. If you request <a href="site:custom-example">&lt;a
+      href="custom.html"&gt;</a> you can see the results.
+    </p>
+    <p>
+      Look at the project <code>sitemap.xmap</code> to see how it is done. View
+      the xml source at "src/documentation/content/samples/custom.xml" and refer
+      to the DTD and its configuration at "src/documentation/resources/schema/".
+      See the project sitemap at "src/documentation/sitemap.xmap" for how the
+      custom doctype is processed and the stylesheet is applied.
+    </p>
+    <p>
+      See the <a href="ext:forrest/new_content_type">full story</a> about
+      handling custom document types.
+    </p>
+    <note>
+      Adding custom schemas with a plugin has the added benefit of being able to
+      add the schema definition to the catalog file rather than having to
+      reference it directly from within the XML document.
+    </note>
   </body>
 </document>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml Mon Apr  9 17:09:22 2007
@@ -16,30 +16,29 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Wilkommen zu "MyProj"</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Wilkommen zu "MyProj"</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Bravo!</title>
-      <p>Sie haben ein <a href="ext:forrest">Apache Forrest</a> basiertes 
-        Projekt generiert. Diese Seite wird von einer xdocs konformen Datei 
+      <p>
+        Sie haben ein <a href="ext:forrest">Apache Forrest</a> basiertes Projekt
+        generiert. Diese Seite wird von einer xdocs konformen Datei
         <code>src/documentation/content/xdocs/samples/demo-i18n.de.xml</code>
       </p>
     </section>
-    
     <section id="see-english">
       <title>Übersetzungen</title>
       <p>
-        Im Site-Skeleton ist nur diese Seite übersetzt, um die i18n-Features
-        zu testen.
+        Im Site-Skeleton ist nur diese Seite übersetzt, um die i18n-Features zu
+        testen.
       </p>
       <p>
         Für mehr Informationen, konsultieren Sie bitte die
         <a href="site:i18n">i18n</a>.
       </p>
     </section>
-
   </body>
 </document>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml Mon Apr  9 17:09:22 2007
@@ -16,26 +16,27 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Bienvenue sur "MyProj"</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Bienvenue sur "MyProj"</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Félicitations</title>
-      <p>Vous avez généré un site basé sur <a
-          href="ext:forrest">Apache Forrest</a>.
-        Cette page provient du squelette de site fourni avec Forrest,
-        son contenu se trouve dans le fichier 
+      <p>
+        Vous avez généré un site basé sur
+        <a
+          href="ext:forrest">Apache Forrest</a>. Cette page provient
+        du squelette de site fourni avec Forrest, son contenu se trouve dans le
+        fichier
         <code>src/documentation/content/xdocs/samples/demo-i18n.fr.xml</code>
       </p>
     </section>
-
     <section id="see-english">
       <title>Traductions</title>
       <p>
-        Ce squelette de site n'est pas traduit, seule cette page est fournie
-        en français pour tester le mécanisme i18n.
+        Ce squelette de site n'est pas traduit, seule cette page est fournie en
+        français pour tester le mécanisme i18n.
       </p>
       <p>
         Pour plus d'infos, voir la <a href="site:i18n">i18n</a>.

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml Mon Apr  9 17:09:22 2007
@@ -16,16 +16,18 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welkom bij MijnProject</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welkom bij MijnProject</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Gefeliciteerd!</title>
-      <p>U hebt succesvol een <a
-          href="ext:forrest">Apache Forrest</a> site aangemaakt.
-        Deze pagina komt uit een site template. Dit template vind u in 
+      <p>
+        U hebt succesvol een <a
+          href="ext:forrest">Apache Forrest</a>
+        site aangemaakt. Deze pagina komt uit een site template. Dit template
+        vind u in
         <code>src/documentation/content/xdocs/samples/demo-i18n.nl.xml</code>
       </p>
     </section>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml Mon Apr  9 17:09:22 2007
@@ -16,20 +16,21 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Welcome to MyProj</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Welcome to MyProj</title>
+  </header>
+  <body>
     <section id="overview">
       <title>Congratulations</title>
-      <p>You have successfully generated and rendered an <a
-          href="ext:forrest">Apache Forrest</a> site.
-        This page is from the site template. It is found in
+      <p>
+        You have successfully generated and rendered an
+        <a
+          href="ext:forrest">Apache Forrest</a> site. This page is
+        from the site template. It is found in
         <code>src/documentation/content/xdocs/samples/demo-i18n.xml</code>
       </p>
     </section>
-
     <section id="see-english">
       <title>Translations</title>
       <p>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html Mon Apr  9 17:09:22 2007
@@ -72,8 +72,8 @@
 <!-- Search Google -->
 <form target="_blank" action="http://www.google.com/search" method="get" id="google-demo">
 <input value="forrest.apache.org" name="as_sitesearch" type="hidden">
-<input type=hidden name=ie value=UTF-8>
-<input type=hidden name=oe value=UTF-8>
+<input type="hidden" name="ie" value="UTF-8">
+<input type="hidden" name="oe" value="UTF-8">
 <a href="http://www.google.com/">
 <img src="http://www.google.com/logos/Logo_40wht.gif" 
 border="0" alt="Google Search" align="middle" width="150" height="55"></a>

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml Mon Apr  9 17:09:22 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/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml Mon Apr  9 17:09:22 2007
@@ -20,159 +20,155 @@
 <howto>
   <header>
     <title>How to write a How-To</title>
-
     <version>0.3</version>
-
-    <abstract>This How-To describes the steps necessary to write a How-To
-    document. Writing documentation is a valuable way to give back to the
-    community.</abstract>
-
+    <abstract>
+      This How-To describes the steps necessary to write a How-To document.
+      Writing documentation is a valuable way to give back to the community.
+    </abstract>
     <last-modified-content-date date="2005-07-18" />
   </header>
-
   <audience title="Intended Audience">
-    <p>Users who are ready to share their knowledge and experiences with the
-    community.</p>
+    <p>
+      Users who are ready to share their knowledge and experiences with the
+      community.
+    </p>
   </audience>
-
   <purpose title="Purpose">
-    <p>These guidelines are based on successful how-to document structures
-    used by other open source projects with diverse author groups. Following
-    these tried and true guidelines will help to ensure the effectiveness of
-    your work.</p>
+    <p>
+      These guidelines are based on successful how-to document structures used
+      by other open source projects with diverse author groups. Following these
+      tried and true guidelines will help to ensure the effectiveness of your
+      work.
+    </p>
   </purpose>
-
   <prerequisites title="Prerequisites">
-    <p>How-To authors should have:</p>
-
+    <p>
+      How-To authors should have:
+    </p>
     <ul>
       <li>A unique How-To topic, related to using Forrest, which fulfills a
       specific need. Look at existing How-Tos to find a niche for your work.
       Consider posting your idea for the How-To to user mailing list, to make
       sure another author's draft is not already in process.</li>
-
       <li>A sufficient ability in English to write the document. However, we would
       rather that you just make a start, as the community can help to
       fine-tune the document.</li>
-      
       <li>Copy this template document "howto-howto.xml" to be modified with
       your own content as necessary.</li>
-
       <li>An understanding of the How-To document structure. Just use this
       template document and you will be safe.
       Make sure you run '<code>forrest validate-xdocs</code>' before
       contributing your document.</li>
     </ul>
-
   </prerequisites>
-
   <steps title="Steps">
-    <p>Here is how to proceed.</p>
-
+    <p>
+      Here is how to proceed.
+    </p>
     <section id="overview">
       <title>Write the Overview</title>
-
-      <p>An overview helps potential readers to determine quickly if a
-      particular How-To matches their interests or needs. In a few sentences,
-      summarize the main points of your How-To. Make sure to include any
-      critical definitions which will help readers evaluate the utility of
-      your How-To. Consider writing the overview last, after you have
-      completed all other sections.</p>
+      <p>
+        An overview helps potential readers to determine quickly if a particular
+        How-To matches their interests or needs. In a few sentences, summarize
+        the main points of your How-To. Make sure to include any critical
+        definitions which will help readers evaluate the utility of your How-To.
+        Consider writing the overview last, after you have completed all other
+        sections.
+      </p>
     </section>
-
     <section id="audience">
       <title>Describe your Intended Audience</title>
-
-      <p>If your How-To is targetted at a specific audience, describe it here.
-      For example, potential readers will have different levels of skill using
-      Forrest. They will also bring different areas of expertise and
-      backgrounds to their How-To learning experience. When you clarify your
-      target audience up front, you will save all other readers time and
-      confusion.</p>
+      <p>
+        If your How-To is targetted at a specific audience, describe it here.
+        For example, potential readers will have different levels of skill using
+        Forrest. They will also bring different areas of expertise and
+        backgrounds to their How-To learning experience. When you clarify your
+        target audience up front, you will save all other readers time and
+        confusion.
+      </p>
     </section>
-
     <section id="purpose">
       <title>State the Purpose</title>
-
-      <p>State the purpose of your How-To. Explain how the reader will benefit
-      by reading it. Give your reader an incentive or two to continue.</p>
+      <p>
+        State the purpose of your How-To. Explain how the reader will benefit by
+        reading it. Give your reader an incentive or two to continue.
+      </p>
     </section>
-
     <section id="prerequisites">
       <title>List any Prerequisites</title>
-
-      <p>Inform your reader about any required knowledge, configuration, or
-      resources they may need before stepping through your How-To. Assist them
-      in this preparation by linking to other useful resources on the Forrest
-      site or the web. Helping your readers to prepare increases the
-      likelihood that they will continue reading your How-To.</p>
+      <p>
+        Inform your reader about any required knowledge, configuration, or
+        resources they may need before stepping through your How-To. Assist them
+        in this preparation by linking to other useful resources on the Forrest
+        site or the web. Helping your readers to prepare increases the
+        likelihood that they will continue reading your How-To.
+      </p>
     </section>
-
     <section id="steps">
       <title>Describe the Steps of your How-To</title>
-
-      <p>In a precise, step-by-step approach, walk your reader through the
-      process. Make sure your reader can reproduce your intended result by
-      following your exact steps. Make the learning process efficient by
-      supplying sample code snippets or configuration details as
-      necessary.</p>
+      <p>
+        In a precise, step-by-step approach, walk your reader through the
+        process. Make sure your reader can reproduce your intended result by
+        following your exact steps. Make the learning process efficient by
+        supplying sample code snippets or configuration details as necessary.
+      </p>
     </section>
-
     <section id="extension">
       <title>Extend the Learning</title>
-
-      <p>Provide your reader with a few real-world examples of how the
-      techniques or capabilities gained from your How-To could be applied.
-      Reward the reader for successfully completing the How-To with a few
-      ideas about how it will pay off.</p>
+      <p>
+        Provide your reader with a few real-world examples of how the techniques
+        or capabilities gained from your How-To could be applied. Reward the
+        reader for successfully completing the How-To with a few ideas about how
+        it will pay off.
+      </p>
     </section>
-
     <section id="summarize">
       <title>Summarize the Entire Process</title>
-
-      <p>In a few sentences, remind the reader what they have just learned.
-      This helps to reinforce the main points of your How-To.</p>
+      <p>
+        In a few sentences, remind the reader what they have just learned. This
+        helps to reinforce the main points of your How-To.
+      </p>
     </section>
-
     <section id="tips">
       <title>Additional Tips or FAQs</title>
-
-      <p>In some cases, step-by-step instructions simply aren't enough. Use
-      this section to pass on any other tips or frequently asked questions.
-      Anticipating the needs of your readers will increase the overall success
-      of your writing effort.</p>
+      <p>
+        In some cases, step-by-step instructions simply aren't enough. Use this
+        section to pass on any other tips or frequently asked questions.
+        Anticipating the needs of your readers will increase the overall success
+        of your writing effort.
+      </p>
     </section>
-
     <section id="references">
       <title>References</title>
-
-      <p>Remember to acknowledge any third-party resources or individuals who
-      contributed to the development of your How-To. Consider providing links
-      for those motivated readers who want to learn more.</p>
+      <p>
+        Remember to acknowledge any third-party resources or individuals who
+        contributed to the development of your How-To. Consider providing links
+        for those motivated readers who want to learn more.
+      </p>
     </section>
-
     <section id="contribute">
       <title>Submit via the project issue tracker</title>
-
-      <p>Create an attachment for your How-To document, and submit it via the
-      project issue tracker.</p>
+      <p>
+        Create an attachment for your How-To document, and submit it via the
+        project issue tracker.
+      </p>
     </section>
-
     <section id="feedback">
       <title>Get some feedback</title>
-
-      <p>When the committers have added your document then it will be
-      available for everyone to to build upon and enhance. Feedback will
-      happen via the mailing lists.</p>
+      <p>
+        When the committers have added your document then it will be available
+        for everyone to to build upon and enhance. Feedback will happen via the
+        mailing lists.
+      </p>
     </section>
   </steps>
-
   <extension title="Extension">
-    <p>Solutions can be extended to cover many different problem domains. A
-    nearly unlimited number of potential How-To topics, from simple to
-    complex, are available right now, limited only by your imagination.</p>
+    <p>
+      Solutions can be extended to cover many different problem domains. A
+      nearly unlimited number of potential How-To topics, from simple to
+      complex, are available right now, limited only by your imagination.
+    </p>
   </extension>
-
   <faqs id="faqs">
     <title>Frequently Asked Questions</title>
     <faqsection id="faq-general">
@@ -180,51 +176,51 @@
       <faq id="faq-difference">
         <question>What is the difference between a How-To and a
         tutorial?</question>
-
         <answer>
-          <p>The goal of a How-To is to help the reader to accomplish a specific
-          task with clear and consise instructions. While tutorials may contain
-          How-To-like instructions and content, they also include additional
-          background and conceptual content to help teach their readers higher
-          order concepts along the way. How-Tos are concerned about filling an
-          immediate, short-term need. Tutorials often provide long-term
-          knowledge which can be applied across a range of needs.</p>
+          <p>
+            The goal of a How-To is to help the reader to accomplish a specific
+            task with clear and consise instructions. While tutorials may
+            contain How-To-like instructions and content, they also include
+            additional background and conceptual content to help teach their
+            readers higher order concepts along the way. How-Tos are concerned
+            about filling an immediate, short-term need. Tutorials often provide
+            long-term knowledge which can be applied across a range of needs.
+          </p>
         </answer>
       </faq>
     </faqsection>
-
     <faqsection id="faq-style">
       <title>Style issues</title>
       <faq id="spelling">
         <question>What spelling convention should I follow?</question>
-
         <answer>
-          <p>Use whatever spelling convention (American, British, etc.) that is
-          most intuitive to you.</p>
+          <p>
+            Use whatever spelling convention (American, British, etc.) that is
+            most intuitive to you.
+          </p>
         </answer>
       </faq>
     </faqsection>
   </faqs>
-
   <tips title="Tips">
     <section id="tip-dtd">
       <title>How-To dtd</title>
-
-      <p>The document structure is likely to change at some time. Please note that
-      this HOWTO page is likely to change as well.</p>
+      <p>
+        The document structure is likely to change at some time. Please note
+        that this HOWTO page is likely to change as well.
+      </p>
     </section>
   </tips>
-
   <references title="References">
-    <p>This is not the first, nor will it be the last, How-To on writing
-    How-Tos. For other ideas and opinions on the matter, check out the
-    following sources.</p>
-
+    <p>
+      This is not the first, nor will it be the last, How-To on writing How-Tos.
+      For other ideas and opinions on the matter, check out the following
+      sources.
+    </p>
     <ul>
       <li>Joel D. Canfield's <a
       href="http://www.evolt.org/article/How_To_Write_A_How_To/9741/18250/index.html">How
       to Write a How-To</a> on evolt.org.</li>
-
       <li>The Linux Documentation Project's <a
       href="http://www.tldp.org/HOWTO/HOWTO-INDEX/index.html">HOWTO</a>
       index page provides many excellent How-To documents to inspire your

Modified: forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml Mon Apr  9 17:09:22 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/main/fresh-site/src/documentation/content/xdocs/samples/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/index.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/index.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/index.xml Mon Apr  9 17:09:22 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/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml Mon Apr  9 17:09:22 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>{properties:content}</code> or <code>{properties: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>{properties:content}</code> or
+          <code>{properties: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="{properties:resources.images}{1}.{2}" />
@@ -367,18 +430,25 @@
         <location src="{properties: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 report 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/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml?view=diff&rev=526964&r1=526963&r2=526964
==============================================================================
--- forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml (original)
+++ forrest/trunk/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml Mon Apr  9 17:09:22 2007
@@ -16,17 +16,19 @@
   limitations under the License.
 -->
 <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" "http://forrest.apache.org/dtd/document-v20.dtd">
-<document> 
-  <header> 
-    <title>Locationmaps</title> 
-  </header> 
-  <body> 
+<document>
+  <header>
+    <title>Locationmaps</title>
+  </header>
+  <body>
     <section id="overview">
       <title>About Locationmaps</title>
-      <p>A locationmap defines a mapping from requests to location strings.</p>
-
-      <p>It was conceived to:</p>  
-
+      <p>
+        A locationmap defines a mapping from requests to location strings.
+      </p>
+      <p>
+        It was conceived to:
+      </p>
       <ul>
         <li>Provide a more powerful means for semantic linking.</li>
         <li>Enable Forrest with a standard configuration override mechanism.</li>
@@ -34,81 +36,96 @@
         the concrete source space, so that a change in the concrete sources
         does not impact on the sitemap</li>
       </ul>
-
-      <p>The syntax of a locationmap resembles that of the sitemap in that it also makes use
-      of Matchers and Selectors to traverse a tree of nodes towards a leaf. In the case of
-      the locationmap however the leaf does not identify a pipeline but instead identifies
-      a location string.</p>
+      <p>
+        The syntax of a locationmap resembles that of the sitemap in that it
+        also makes use of Matchers and Selectors to traverse a tree of nodes
+        towards a leaf. In the case of the locationmap however the leaf does not
+        identify a pipeline but instead identifies a location string.
+      </p>
     </section>
-    
     <section id="examples">
       <title>Locationmap Examples</title>
       <section>
         <title>Retrieving an XDoc via HTTP</title>
-        
-        
-        <p>Normally files are generated from <code>{properties:content.xdocs}</code>.
-        Using the Locationmap it is possible to make these files come from elsewhere.
-        This is useful if you want to pull files from different directory structures,
-        oe even remote repositories.</p>
-        
-        <p>The target of "/remote.**.html"
-        is generated from a source retrieved from the Forrest SVN.</p>
-        
-        <note>Because the above URL retrieves the source file from SVN it will
-        only work if you are online. For this reason we have not enabled this link
-        as it would stop you building this site offline. However, if you are online 
-        you can enter the URL into the browser and it will work (however, note the 
-        issue described below, regarding the site: and ext: protocols).</note>
-        
-        <p>Go to <code>http://localhost:8888/remote.index.html</code>
-          which will virtually re-load this page. However, rather than use
-          the local xml source, the locationamp has retrieved the up-to-date
-          source directly from the svn server.
-          Similarly <code>http://localhost:8888/remote.samples/index.html</code>
+        <p>
+          Normally files are generated from
+          <code>{properties:content.xdocs}</code>. Using the Locationmap it is
+          possible to make these files come from elsewhere. This is useful if
+          you want to pull files from different directory structures, oe even
+          remote repositories.
+        </p>
+        <p>
+          The target of "/remote.**.html" is generated from a source retrieved
+          from the Forrest SVN.
+        </p>
+        <note>
+          Because the above URL retrieves the source file from SVN it will only
+          work if you are online. For this reason we have not enabled this link
+          as it would stop you building this site offline. However, if you are
+          online you can enter the URL into the browser and it will work
+          (however, note the issue described below, regarding the site: and ext:
+          protocols).
+        </note>
+        <p>
+          Go to <code>http://localhost:8888/remote.index.html</code> which will
+          virtually re-load this page. However, rather than use the local xml
+          source, the locationamp has retrieved the up-to-date source directly
+          from the svn server. Similarly
+          <code>http://localhost:8888/remote.samples/index.html</code>
+        </p>
+        <p>
+          The match in src/documentation/content/locationmap.xml for this demo
+          is ...
         </p>
-        <p>The match in src/documentation/content/locationmap.xml for this demo is ...</p>
-        
         <source>
  &lt;match pattern="project.remote.**.xml"&gt;
    &lt;location src="http://svn.apache.org/repos/asf/forrest/trunk/main/fresh-site/src/documentation/content/xdocs/{1}.xml" /&gt;
  &lt;/match&gt;
         </source>
-        <p>Since we are using the locationmap naming convention, our new match get resolved
-          via the core forrest.xmap and we do not have to change any other files.</p>
-      <source><![CDATA[
+        <p>
+          Since we are using the locationmap naming convention, our new match
+          get resolved via the core forrest.xmap and we do not have to change
+          any other files.
+        </p>
+        <source>
+<![CDATA[
 <map:match pattern="**.xml">
   <map:generate src="{lm:project.{0}}"/>
   <map:serialize type="xml"/>
 </map:match>
-]]></source>
-        <p>Note that because this is a wildcard matcher you can request any page
-        from SVN simply by requesting 
-        <code>/remote.PATH/TO/FILE/FILENAME.html</code>. In addition, we
-        can request any other output format available via Forrest plugins.</p>
-        
-        <p>When including resources from remote repositories one has to
-        be careful about things like <code>site:</code> and <code>ext:</code>
-        linking. If the targets are not defined in the local 
-        <code>site.xml</code> file then these links will be broken, which
-        is the normal situation.</p>
-        
+]]>
+        </source>
+        <p>
+          Note that because this is a wildcard matcher you can request any page
+          from SVN simply by requesting
+          <code>/remote.PATH/TO/FILE/FILENAME.html</code>. In addition, we can
+          request any other output format available via Forrest plugins.
+        </p>
+        <p>
+          When including resources from remote repositories one has to be
+          careful about things like <code>site:</code> and <code>ext:</code>
+          linking. If the targets are not defined in the local
+          <code>site.xml</code> file then these links will be broken, which is
+          the normal situation.
+        </p>
       </section>
-
       <section>
         <title>Link Rewriting</title>
-        <p>The locationmap can be used to rewrite URLs when the page is generated.
-        For example, when the locationmap has:</p>
+        <p>
+          The locationmap can be used to rewrite URLs when the page is
+          generated. For example, when the locationmap has:
+        </p>
         <source>
  &lt;match pattern="project.rewrite.**"&gt;
    &lt;location src="http://cocoon.apache.org/{1}.html" /&gt;
  &lt;/match&gt;
         </source>
-        <p><a href="lm:rewrite.index">This link is rewritten to
-        an offsite address</a> not
-        specified in the link, which has <code>href="lm:rewrite.index"</code>.</p>
+        <p>
+          <a href="lm:rewrite.index">This link is rewritten to an offsite
+          address</a> not specified in the link, which has
+          <code>href="lm:rewrite.index"</code>.
+        </p>
       </section>
-
     </section>
   </body>
 </document>



Mime
View raw message