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

svn commit: r529915 [1/20] - in /forrest/site: ./ docs_0_70/ docs_0_70/howto/ docs_0_70/howto/cvs-ssh/ docs_0_70/howto/multi/ docs_0_80/ docs_0_80/howto/ docs_0_80/howto/cvs-ssh/ docs_0_80/howto/multi/ dtdx/ plan/ pluginDocs/ pluginDocs/plugins_0_70/ p...

Author: crossley
Date: Wed Apr 18 01:36:14 2007
New Revision: 529915

URL: http://svn.apache.org/viewvc?view=rev&rev=529915
Log:
Automatic publish from forrestbot

Modified:
    forrest/site/.htaccess
    forrest/site/abs-linkmap
    forrest/site/abs-menulinks
    forrest/site/asf-infrastructure.html
    forrest/site/committed.html
    forrest/site/compliance.html
    forrest/site/contrib.html
    forrest/site/contrib.pdf
    forrest/site/doap.xml
    forrest/site/docs_0_70/body-index.html
    forrest/site/docs_0_70/build.html
    forrest/site/docs_0_70/build.pdf
    forrest/site/docs_0_70/cap.html
    forrest/site/docs_0_70/cap.pdf
    forrest/site/docs_0_70/catalog.html
    forrest/site/docs_0_70/catalog.pdf
    forrest/site/docs_0_70/changes.html
    forrest/site/docs_0_70/changes.pdf
    forrest/site/docs_0_70/changes.rss
    forrest/site/docs_0_70/changes.xml
    forrest/site/docs_0_70/compliance.html
    forrest/site/docs_0_70/dreams.html
    forrest/site/docs_0_70/faq.html
    forrest/site/docs_0_70/faq.pdf
    forrest/site/docs_0_70/faq.xml
    forrest/site/docs_0_70/forrest-contract.html
    forrest/site/docs_0_70/forrest-contract.pdf
    forrest/site/docs_0_70/howto/cvs-ssh/howto-cvs-ssh.html
    forrest/site/docs_0_70/howto/cvs-ssh/howto-cvs-ssh.pdf
    forrest/site/docs_0_70/howto/forrest.xmap.html
    forrest/site/docs_0_70/howto/howto-asf-mirror.html
    forrest/site/docs_0_70/howto/howto-asf-mirror.pdf
    forrest/site/docs_0_70/howto/howto-buildPlugin.html
    forrest/site/docs_0_70/howto/howto-buildPlugin.pdf
    forrest/site/docs_0_70/howto/howto-corner-images.html
    forrest/site/docs_0_70/howto/howto-corner-images.pdf
    forrest/site/docs_0_70/howto/howto-custom-html-source.html
    forrest/site/docs_0_70/howto/howto-custom-html-source.pdf
    forrest/site/docs_0_70/howto/howto-editcss.html
    forrest/site/docs_0_70/howto/howto-editcss.pdf
    forrest/site/docs_0_70/howto/howto-forrest-from-maven.html
    forrest/site/docs_0_70/howto/howto-forrest-from-maven.pdf
    forrest/site/docs_0_70/howto/howto-howto.html
    forrest/site/docs_0_70/howto/howto-howto.pdf
    forrest/site/docs_0_70/howto/howto-pdf-tab.html
    forrest/site/docs_0_70/howto/howto-pdf-tab.pdf
    forrest/site/docs_0_70/howto/howto-view-contracts.html
    forrest/site/docs_0_70/howto/howto-view-contracts.pdf
    forrest/site/docs_0_70/howto/howto-view-dsl.html
    forrest/site/docs_0_70/howto/howto-view-dsl.pdf
    forrest/site/docs_0_70/howto/howto-view-install.html
    forrest/site/docs_0_70/howto/index.html
    forrest/site/docs_0_70/howto/multi/howto-multi.html
    forrest/site/docs_0_70/howto/multi/step1.html
    forrest/site/docs_0_70/howto/multi/step1.pdf
    forrest/site/docs_0_70/howto/multi/step2.html
    forrest/site/docs_0_70/howto/multi/step3.html
    forrest/site/docs_0_70/howto/project_sitemap.xmap.html
    forrest/site/docs_0_70/howto/sitemap.xmap.html
    forrest/site/docs_0_70/index.html
    forrest/site/docs_0_70/index.pdf
    forrest/site/docs_0_70/index.xml
    forrest/site/docs_0_70/libre-intro.html
    forrest/site/docs_0_70/libre-intro.pdf
    forrest/site/docs_0_70/linking.html
    forrest/site/docs_0_70/linking.pdf
    forrest/site/docs_0_70/menu-index.html
    forrest/site/docs_0_70/primer.html
    forrest/site/docs_0_70/primer.pdf
    forrest/site/docs_0_70/project-sitemap.html
    forrest/site/docs_0_70/searching.html
    forrest/site/docs_0_70/searching.pdf
    forrest/site/docs_0_70/sitemap-ref.html
    forrest/site/docs_0_70/sitemap-ref.pdf
    forrest/site/docs_0_70/skin-package.html
    forrest/site/docs_0_70/skins.html
    forrest/site/docs_0_70/tab-index.html
    forrest/site/docs_0_70/todo.html
    forrest/site/docs_0_70/upgrading_07.html
    forrest/site/docs_0_70/upgrading_07.pdf
    forrest/site/docs_0_70/validation.html
    forrest/site/docs_0_70/validation.pdf
    forrest/site/docs_0_70/views.html
    forrest/site/docs_0_70/your-project.html
    forrest/site/docs_0_70/your-project.pdf
    forrest/site/docs_0_80/body-index.html
    forrest/site/docs_0_80/build.html
    forrest/site/docs_0_80/build.pdf
    forrest/site/docs_0_80/cap.html
    forrest/site/docs_0_80/catalog.html
    forrest/site/docs_0_80/catalog.pdf
    forrest/site/docs_0_80/changes.html
    forrest/site/docs_0_80/changes.pdf
    forrest/site/docs_0_80/changes.rss
    forrest/site/docs_0_80/changes.xml
    forrest/site/docs_0_80/dreams.html
    forrest/site/docs_0_80/dreams.pdf
    forrest/site/docs_0_80/faq.html
    forrest/site/docs_0_80/faq.pdf
    forrest/site/docs_0_80/glossary.html
    forrest/site/docs_0_80/glossary.pdf
    forrest/site/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.html
    forrest/site/docs_0_80/howto/howto-asf-mirror.html
    forrest/site/docs_0_80/howto/howto-buildPlugin.html
    forrest/site/docs_0_80/howto/howto-buildPlugin.pdf
    forrest/site/docs_0_80/howto/howto-corner-images.html
    forrest/site/docs_0_80/howto/howto-corner-images.pdf
    forrest/site/docs_0_80/howto/howto-custom-html-source.html
    forrest/site/docs_0_80/howto/howto-custom-html-source.pdf
    forrest/site/docs_0_80/howto/howto-editcss.html
    forrest/site/docs_0_80/howto/howto-forrest-from-maven.html
    forrest/site/docs_0_80/howto/howto-pdf-tab.html
    forrest/site/docs_0_80/howto/howto-pdf-tab.pdf
    forrest/site/docs_0_80/howto/index.html
    forrest/site/docs_0_80/howto/index.pdf
    forrest/site/docs_0_80/howto/multi/howto-multi.html
    forrest/site/docs_0_80/howto/multi/step1.html
    forrest/site/docs_0_80/howto/multi/step2.html
    forrest/site/docs_0_80/howto/multi/step3.html
    forrest/site/docs_0_80/index.html
    forrest/site/docs_0_80/index.pdf
    forrest/site/docs_0_80/libre-intro.html
    forrest/site/docs_0_80/linking.html
    forrest/site/docs_0_80/linking.pdf
    forrest/site/docs_0_80/locationmap.html
    forrest/site/docs_0_80/locationmap.pdf
    forrest/site/docs_0_80/menu-index.html
    forrest/site/docs_0_80/primer.html
    forrest/site/docs_0_80/primer.pdf
    forrest/site/docs_0_80/project-sitemap.html
    forrest/site/docs_0_80/project-sitemap.pdf
    forrest/site/docs_0_80/searching.html
    forrest/site/docs_0_80/sitemap-explain.html
    forrest/site/docs_0_80/sitemap-explain.pdf
    forrest/site/docs_0_80/sitemap-ref.html
    forrest/site/docs_0_80/sitemap-ref.pdf
    forrest/site/docs_0_80/skin-package.html
    forrest/site/docs_0_80/skins.html
    forrest/site/docs_0_80/skins.pdf
    forrest/site/docs_0_80/status-themes.html
    forrest/site/docs_0_80/status-themes.pdf
    forrest/site/docs_0_80/tab-index.html
    forrest/site/docs_0_80/upgrading_08.html
    forrest/site/docs_0_80/upgrading_08.pdf
    forrest/site/docs_0_80/validation.html
    forrest/site/docs_0_80/validation.pdf
    forrest/site/docs_0_80/your-project.html
    forrest/site/docs_0_80/your-project.pdf
    forrest/site/documentation_bestpractices.html
    forrest/site/dtdx/document-v12.html
    forrest/site/dtdx/document-v12.pdf
    forrest/site/dtdx/document-v13.dtdx.html
    forrest/site/dtdx/document-v13.html
    forrest/site/dtdx/document-v13.pdf
    forrest/site/dtdx/document-v13.pod
    forrest/site/dtdx/document-v20.dtdx.html
    forrest/site/dtdx/document-v20.html
    forrest/site/dtdx/document-v20.pdf
    forrest/site/dtdx/document-v20.pod
    forrest/site/dtdx/document-v20.txt
    forrest/site/dtdx/dtd-docs.html
    forrest/site/dtdx/faq-v13.dtdx.html
    forrest/site/dtdx/faq-v20.dtdx.html
    forrest/site/dtdx/howto-v13.dtdx.html
    forrest/site/dtdx/howto-v20.dtdx.html
    forrest/site/events.html
    forrest/site/events.pdf
    forrest/site/flyer.html
    forrest/site/flyer.pdf
    forrest/site/forrest-contract.html
    forrest/site/forrest-friday.html
    forrest/site/forrest-issues.html
    forrest/site/forrest-issues.pdf
    forrest/site/guidelines.html
    forrest/site/guidelines.pdf
    forrest/site/gump.html
    forrest/site/howto-dev.html
    forrest/site/howto-dev.pdf
    forrest/site/howto-howto.html
    forrest/site/howto-howto.pdf
    forrest/site/index.html
    forrest/site/index.pdf
    forrest/site/issues.html
    forrest/site/license.html
    forrest/site/linkmap.html
    forrest/site/linkmap.pdf
    forrest/site/live-sites.html
    forrest/site/mail-lists.html
    forrest/site/mail-lists.pdf
    forrest/site/mirrors.html
    forrest/site/mirrors.pdf
    forrest/site/plan/index.html
    forrest/site/plan/internal-xhtml.html
    forrest/site/pluginDocs/index.html
    forrest/site/pluginDocs/index.pdf
    forrest/site/pluginDocs/plugins_0_70/index.html
    forrest/site/pluginDocs/plugins_0_70/index.pdf
    forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.html
    forrest/site/pluginDocs/plugins_0_70/pluginInfrastructure.pdf
    forrest/site/pluginDocs/plugins_0_70/usingPlugins.html
    forrest/site/pluginDocs/plugins_0_70/usingPlugins.pdf
    forrest/site/pluginDocs/plugins_0_80/index.html
    forrest/site/pluginDocs/plugins_0_80/index.pdf
    forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.html
    forrest/site/pluginDocs/plugins_0_80/pluginInfrastructure.pdf
    forrest/site/pluginDocs/plugins_0_80/usingPlugins.html
    forrest/site/pluginDocs/plugins_0_80/usingPlugins.pdf
    forrest/site/procedures/How_to_publish_docs.html
    forrest/site/procedures/How_to_publish_docs.pdf
    forrest/site/procedures/release/How_to_release.html
    forrest/site/procedures/release/How_to_release.pdf
    forrest/site/proposal-asf-forrestbot.html
    forrest/site/roles.html
    forrest/site/subversion_bestpractices.html
    forrest/site/svn.html
    forrest/site/svn.pdf
    forrest/site/thanks.html
    forrest/site/thanks.pdf
    forrest/site/todo.html
    forrest/site/tools/eclipse.html
    forrest/site/tools/forrestbar.html
    forrest/site/tools/forrestbot-web-interface.html
    forrest/site/tools/forrestbot.html
    forrest/site/tools/forrestbot.pdf
    forrest/site/tools/index.html
    forrest/site/tools/xxe.html
    forrest/site/versions/index.html
    forrest/site/versions/index.pdf
    forrest/site/who.html
    forrest/site/who.pdf
    forrest/site/zone.html

Modified: forrest/site/.htaccess
URL: http://svn.apache.org/viewvc/forrest/site/.htaccess?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/.htaccess (original)
+++ forrest/site/.htaccess Wed Apr 18 01:36:14 2007
@@ -14,33 +14,24 @@
 Redirect /plugins/0.8-dev http://forrest.apache.org/plugins/0.8
 
 # Maintain some old URLs to point to current release
-Redirect /docs/plugins http://forrest.apache.org/pluginDocs/plugins_0_70
+Redirect /docs/plugins http://forrest.apache.org/pluginDocs/plugins_0_80
 
 # Some convenience URLs.
-Redirect /docs/dev http://forrest.apache.org/docs_0_80
-Redirect /pluginDocs/dev http://forrest.apache.org/pluginDocs/plugins_0_80
+Redirect /docs/dev http://forrest.apache.org/docs_0_90
+Redirect /pluginDocs/dev http://forrest.apache.org/pluginDocs/plugins_0_90
 
 # Some special docs need to point to the development version
-RedirectMatch ^/faq(.*) http://forrest.apache.org/docs_0_80/faq$1
-RedirectMatch ^/docs/faq(.*) http://forrest.apache.org/docs_0_80/faq$1
-RedirectMatch ^/changes(.*) http://forrest.apache.org/docs_0_80/changes$1
+RedirectMatch ^/faq(.*) http://forrest.apache.org/docs_0_90/faq$1
+RedirectMatch ^/docs/faq(.*) http://forrest.apache.org/docs_0_90/faq$1
+RedirectMatch ^/changes(.*) http://forrest.apache.org/docs_0_90/changes$1
 
 Options -MultiViews
 
 # Some convenience URLs.
-Redirect /docs http://forrest.apache.org/docs_0_70
-Redirect /howto http://forrest.apache.org/docs_0_70/howto
+Redirect /docs http://forrest.apache.org/docs_0_80
+Redirect /howto http://forrest.apache.org/docs_0_80/howto
 
 # Some moved documents
-RedirectMatch ^/docs/docs_0_80/howto/howto-structurer-install(.*) http://forrest.apache.org/docs_0_80/howto/howto-dispatcher-install$1
-RedirectMatch ^/docs_0_80/howto/howto-dispatcher-install(.*) http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.internal.dispatcher/how/howto-dispatcher-quickstart$1
-RedirectMatch ^/docs_0_80/howto/howto-structurer-dsl(.*) http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.internal.dispatcher/how/howto-dispatcher-structurer$1
-RedirectMatch ^/docs_0_80/howto/howto-dispatcher-quickstart(.*) http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.internal.dispatcher/how/howto-dispatcher-quickstart$1
-RedirectMatch ^/docs_0_80/howto/howto-structurer-contracts(.*) http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.internal.dispatcher/how/howto-dispatcher-contracts.html
-RedirectMatch ^/docs_0_80/compliance(.*) http://forrest.apache.org/compliance$1
-RedirectMatch ^/docs_0_80/forrest-contract(.*) http://forrest.apache.org/forrest-contract$1
-RedirectMatch ^/docs_0_80/howto/howto-howto(.*) http://forrest.apache.org/howto-howto$1
-RedirectMatch ^/docs_0_80/howto/howto-dev(.*) http://forrest.apache.org/howto-dev$1
 
 # handle all DTDs etc.
 <Files ~ "\.(dtd|mod)$">

Modified: forrest/site/abs-linkmap
URL: http://svn.apache.org/viewvc/forrest/site/abs-linkmap?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/abs-linkmap (original)
+++ forrest/site/abs-linkmap Wed Apr 18 01:36:14 2007
@@ -124,9 +124,9 @@
 <!-- FIXME: Might not need these when we have the local docs happening -->
         <versions>
           <overview href="http://forrest.apache.org/docs/../docs.html"/>
+          <v0.9 href="http://forrest.apache.org/docs/../0.9/"/>
           <v0.8 href="http://forrest.apache.org/docs/../0.8/"/>
           <v0.7 href="http://forrest.apache.org/docs/../0.7/"/>
-          <v0.6 href="http://forrest.apache.org/docs/../0.6/"/>
         </versions>
       </docs>
     </forrest>
@@ -177,14 +177,15 @@
   </external-refs>
   <versions tab="docs">
     <overview label="Overview" href="versions/index.html"/>
-    <v0.8 label="0.8-dev" href="site:index"/>
-    <v0.7 label="0.7 (current)" href="site:v0.70//index"/>
-    <v0.6 label="0.6" href="site:v0.60//index"/>
+    <v0.9 label="0.9-dev" href="site:index"/>
+    <v0.8 label="0.8 (current)" href="site:v0.80//index"/>
+    <v0.7 label="0.7" href="site:v0.70//index"/>
   </versions>
   <pluginVersions tab="plugins">
     <overview label="Overview" href="pluginDocs/index.html"/>
-    <v0.8 label="0.8-dev" href="site:plugins/index"/>
-    <v0.7 label="0.7 (current)" href="site:v0.70//plugins/index"/>
+    <v0.9 label="0.9-dev" href="site:plugins/index"/>
+    <v0.8 label="0.8 (current)" href="site:v0.80//plugins/index"/>
+    <v0.7 label="0.7" href="site:v0.70//plugins/index"/>
   </pluginVersions>
   <tools label="Tools" href="tools/" tab="tools">
     <index label="Index" href="tools/index.html"/>
@@ -200,14 +201,143 @@
        version of a document with the site:protocol by specifiying an access 
        path such as 'site:v0.70/documentation/faq'
        
-       To create a new release:
-       
-       -  copy first versioned element below and insert right after this comment
-       -  edit version-element name to reflect new version number
-       -  FIXME: Add instructions for fixing directories and adjusting links in files  
-       
+       To create a new release see f.a.o/procedures/release/How_to_release.html
        -->
-  <v0.80 label="Documentation in development" description="Set of documents for the in-development version, i.e. SVN head">
+  <v0.90 label="Documentation in development" description="Set of documents for the in-development version, i.e. SVN head">
+    <documentation label="0.90-dev" href="docs_0_90/" tab="v0_90">
+      <index label="Overview" href="docs_0_90/index.html"/>
+<!-- FIXME: Needed to avoid moving files -->
+      <catalog href="docs_0_90/catalog.html"/>
+      <project-sitemap href="docs_0_90/project-sitemap.html"/>
+      <upgrading_09 href="docs_0_90/upgrading_09.html"/>
+<!-- FIXME: i don't understand what the previous FIXME means. Why do we need those entries without labels? -->
+<!-- Insert all instructional documentation here -->
+      <your-project label="Using Forrest" href="docs_0_90/your-project.html">
+        <new_content_type href="docs_0_90/your-project.html#adding_new_content_type"/>
+        <new_dtd href="docs_0_90/your-project.html#new_dtd"/>
+        <webapp href="docs_0_90/your-project.html#webapp"/>
+        <skins href="docs_0_90/your-project.html#skins"/>
+        <new-skin href="docs_0_90/your-project.html#new_skin"/>
+        <invoking_from_ant href="docs_0_90/your-project.html#invoking_from_ant"/>
+      </your-project>
+      <howto label="How-To" href="docs_0_90/howto/">
+        <overview label="Overview" href="docs_0_90/howto/index.html"/>
+        <ForrestInstall label="Install Forrest">
+          <build label="Building Forrest from Source" href="docs_0_90/howto/../build.html" description="Build and install the current                     unreleased version">
+            <run href="docs_0_90/howto/../build.html#run"/>
+          </build>
+        </ForrestInstall>
+        <upgrading_09Ref label="Upgrading to 0.9" href="site:upgrading_09"/>
+        <ForrestUse label="Use Forrest"/>
+        <ForrestCustomize label="Customize Forrest" description="Adapt and tune Forrest for your needs">
+          <sitemap-explain label="Sitemaps explained" href="docs_0_90/howto/../sitemap-explain.html"/>
+          <custom-html-source label="Custom html source" href="docs_0_90/howto/howto-custom-html-source.html"/>
+          <project-sitemapRef label="Project sitemap" href="site:project-sitemap"/>
+          <editcss label="Edit CSS (WYSIWYG)" href="docs_0_90/howto/howto-editcss.html"/>
+          <pdf-tab label="Create tab PDF" href="docs_0_90/howto/howto-pdf-tab.html" description="Generate one pdf-document for all pages of a tab"/>
+          <corner-css label="CSS corner SVG" href="docs_0_90/howto/howto-corner-images.html"/>
+        </ForrestCustomize>
+        <ForrestIntegrate label="Integrate Forrest with tools">
+          <maven label="Maven Integration" href="docs_0_90/howto/howto-forrest-from-maven.html"/>
+          <catalogRef1 label="Using DTD Catalogs" href="site:catalog"/>
+        </ForrestIntegrate>
+        <ForrestExtend label="Extend Forrest" description="Extend Forrest with new functionalities">
+          <buildPlugin label="Build a Plugin" href="docs_0_90/howto/howto-buildPlugin.html"/>
+          <skin-package label="Package new Skins" href="docs_0_90/howto/../skin-package.html"/>
+        </ForrestExtend>
+        <asf-mirror label="Download mirror" href="docs_0_90/howto/howto-asf-mirror.html"/>
+        <documentationCreate label="Adding Documentation" description="Instructions to enhance Forrest by writing                 new pieces of documentation.">
+          <write-howto label="Write a How-to" href="site:write-howto" description="Instructions for writing                 a new howto-document"/>
+          <multi label="Multipage HowTo" href="docs_0_90/howto/multi/">
+            <intro label="Introduction" href="docs_0_90/howto/multi/howto-multi.html"/>
+            <step1 label="Step 1" href="docs_0_90/howto/multi/step1.html"/>
+            <step2 label="Step 2" href="docs_0_90/howto/multi/step2.html"/>
+            <step3 label="Step 3" href="docs_0_90/howto/multi/step3.html"/>
+          </multi>
+        </documentationCreate>
+      </howto>
+      <faq label="FAQs" href="docs_0_90/faq.html">
+        <build_msg_a href="docs_0_90/faq.html#build_msg_a"/>
+        <docbook href="docs_0_90/faq.html#docbook"/>
+        <docs href="docs_0_90/faq.html#docs"/>
+        <checksums href="docs_0_90/faq.html#checksums"/>
+        <edit-content href="docs_0_90/faq.html#edit-content"/>
+        <ignoring_javadocs href="docs_0_90/faq.html#ignoring_javadocs"/>
+        <jobs href="docs_0_90/faq.html#jobs"/>
+        <link_raw href="docs_0_90/faq.html#link_raw"/>
+        <logs href="docs_0_90/faq.html#logs"/>
+        <pdf_images href="docs_0_90/faq.html#pdf_images"/>
+        <rawHTML href="docs_0_90/faq.html#rawHTML"/>
+        <single-document href="docs_0_90/faq.html#single-document"/>
+        <tab-index href="docs_0_90/faq.html#tab-index"/>
+        <cli-xconf href="docs_0_90/faq.html#cli-xconf"/>
+        <pageBreaks href="docs_0_90/faq.html#pageBreaks"/>
+        <site-xml href="docs_0_90/faq.html#site-xml"/>
+        <requirements href="docs_0_90/faq.html#requirements"/>
+        <xml-entities href="docs_0_90/faq.html#xml-entities"/>
+      </faq>
+      <whitepapers label="Background" description="Background documentation about Forrest and the technologies used">
+        <linking label="Menus and Linking" href="docs_0_90/linking.html">
+          <menu_generation href="docs_0_90/linking.html#menu_generation"/>
+          <tab-site href="docs_0_90/linking.html#tab-site"/>
+        </linking>
+        <searching label="Search Options in Forrest" href="docs_0_90/searching.html"/>
+        <locationmap label="Locationmap" href="docs_0_90/locationmap.html">
+          <namingConvention href="docs_0_90/locationmap.html#namingConvention"/>
+        </locationmap>
+        <sitemap-ref label="Sitemap Reference" href="docs_0_90/sitemap-ref.html">
+          <linkrewriting_impl href="docs_0_90/sitemap-ref.html#linkrewriting_impl"/>
+          <menu_generation_impl href="docs_0_90/sitemap-ref.html#menu_generation_impl"/>
+          <source_pipelines href="docs_0_90/sitemap-ref.html#source_pipelines"/>
+          <forrest_xmap href="docs_0_90/sitemap-ref.html#forrest_xmap"/>
+        </sitemap-ref>
+        <skins label="Skins" href="docs_0_90/skins.html" description="About default skins, their naming and features"/>
+        <status-themes label="Dispatcher versus Skins" href="docs_0_90/status-themes.html"/>
+        <cap label="Sourcetype Action" href="docs_0_90/cap.html"/>
+        <validation label="XML validation and entity resolution" href="docs_0_90/validation.html">
+          <catalog href="docs_0_90/validation.html#catalog"/>
+          <debug-catalog href="docs_0_90/validation.html#debug-catalog"/>
+        </validation>
+      </whitepapers>
+      <changes label="Changes" href="docs_0_90/changes.html"/>
+      <changes-rss href="docs_0_90/changes.rss"/>
+      <glossary label="Glossary" href="docs_0_90/glossary.html"/>
+      <samples label="Reference docs">
+        <dtd-docs-container label="DTD documentation">
+          <dtd-docs label="Overview" href="docs_0_90/../dtdx/dtd-docs.html"/>
+          <document-v20-dtd label="document-v20" href="docs_0_90/../dtdx/document-v20.dtdx.html"/>
+          <howto-v20-dtd label="howto-v20" href="docs_0_90/../dtdx/howto-v20.dtdx.html"/>
+          <faq-v20-dtd label="faq-v20" href="docs_0_90/../dtdx/faq-v20.dtdx.html"/>
+          <document-v13-dtd label="document-v13" href="docs_0_90/../dtdx/document-v13.dtdx.html"/>
+          <howto-v13-dtd label="howto-v13" href="docs_0_90/../dtdx/howto-v13.dtdx.html"/>
+          <faq-v13-dtd label="faq-v13" href="docs_0_90/../dtdx/faq-v13.dtdx.html"/>
+        </dtd-docs-container>
+        <samples-container label="Doc samples">
+          <document-v12 href="docs_0_90/../dtdx/document-v12.html"/>
+          <document-v13 label="document-v13" href="docs_0_90/../dtdx/document-v13.html"/>
+          <document-v20 label="document-v20" href="docs_0_90/../dtdx/document-v20.html"/>
+        </samples-container>
+      </samples>
+<!-- FIXME: Consider moving these documents into their own tab as there is no point in
+                    coying historic info from version to version.
+                    Options: Subtab "Old Stuff" in Docs tab or as a main tab 
+        -->
+      <older_documentation label="Older Docs">
+        <primer label="Forrest Primer" href="docs_0_90/primer.html">
+          <cvs href="docs_0_90/primer.html#cvs"/>
+        </primer>
+        <libre-intro label="Libre" href="docs_0_90/libre-intro.html"/>
+        <dreams label="Dream list" href="docs_0_90/dreams.html"/>
+        <cvsssh label="CVS over SSH" href="docs_0_90/howto/cvs-ssh/howto-cvs-ssh.html"/>
+      </older_documentation>
+    </documentation>
+    <plugins label="0.90 Plugins" href="pluginDocs/plugins_0_90/" tab="p0_90">
+      <index label="Index" href="pluginDocs/plugins_0_90/index.html"/>
+      <using label="Using Plugins" href="pluginDocs/plugins_0_90/usingPlugins.html"/>
+      <infrastructure label="Plugin Infrastructure" href="pluginDocs/plugins_0_90/pluginInfrastructure.html"/>
+    </plugins>
+  </v0.90>
+  <v0.80 label="Documentation current" description="Set of documents for the released version">
     <documentation label="0.80-dev" tab="v0_80" href="docs_0_80/">
       <index label="Overview" href="docs_0_80/index.html"/>
 <!-- FIXME: Needed to avoid moving files -->
@@ -340,7 +470,8 @@
       <infrastructure label="Plugin Infrastructure" href="pluginDocs/plugins_0_80/pluginInfrastructure.html"/>
     </plugins>
   </v0.80>
-  <v0.70 label="Documentation current" description="Set of documents for the released version">
+<!-- Removing the label from the past release, stops it being in the ToC and cluttering -->
+  <v0.70>
     <documentation label="0.70" tab="v0_70" href="docs_0_70/">
       <index label="Overview" href="docs_0_70/index.html"/>
       <faq label="FAQs" href="docs_0_70/faq.html">
@@ -450,77 +581,4 @@
       <infrastructure label="Plugin Infrastructure" href="pluginDocs/plugins_0_70/pluginInfrastructure.html"/>
     </plugins>
   </v0.70>
-  <v0.60>
-    <documentation label="0.60" href="docs_0_60/" tab="v0_60">
-      <index label="Overview" href="docs_0_60/index.html"/>
-      <faq label="FAQs" href="docs_0_60/faq.html">
-        <docbook href="docs_0_60/faq.html#docbook"/>
-        <ignoring_javadocs href="docs_0_60/faq.html#ignoring_javadocs"/>
-        <link_raw href="docs_0_60/faq.html#link_raw"/>
-        <pdf_images href="docs_0_60/faq.html#pdf_images"/>
-      </faq>
-      <changes label="Changes" href="docs_0_60/changes.html"/>
-      <todo label="Todo" href="docs_0_60/todo.html"/>
-      <your-project label="Using Forrest" href="docs_0_60/your-project.html">
-        <new_content_type href="docs_0_60/your-project.html#adding_new_content_type"/>
-        <new_dtd href="docs_0_60/your-project.html#new_dtd"/>
-        <webapp href="docs_0_60/your-project.html#webapp"/>
-        <skins href="docs_0_60/your-project.html#skins"/>
-        <new-skin href="docs_0_60/your-project.html#new_skin"/>
-        <invoking_from_ant href="docs_0_60/your-project.html#invoking_from_ant"/>
-      </your-project>
-      <upgrading_06 label="Upgrading to 0.6" href="docs_0_60/upgrading_06.html"/>
-      <validation label="XML Validation" href="docs_0_60/validation.html"/>
-      <linking label="Menus and Linking" href="docs_0_60/linking.html">
-        <menu_generation href="docs_0_60/linking.html#menu_generation"/>
-      </linking>
-      <searching label="Searching" href="docs_0_60/searching.html"/>
-      <skins label="Default Skins" href="docs_0_60/skins.html"/>
-      <skin-package label="Skin Packages" href="docs_0_60/skin-package.html"/>
-      <forrest-contract label="Our Contract" href="docs_0_60/forrest-contract.html"/>
-      <compliance label="Standards Compliance" href="docs_0_60/compliance.html"/>
-      <howto label="How-To" href="docs_0_60/howto/">
-        <overview label="Overview" href="docs_0_60/howto/index.html"/>
-        <single-page label="Single Page" href="docs_0_60/howto/howto-howto.html"/>
-        <multi-page label="Multi-Page" href="docs_0_60/howto/multi/">
-          <intro label="Intro" href="docs_0_60/howto/multi/howto-multi.html"/>
-          <step1 label="Step 1" href="docs_0_60/howto/multi/step1.html"/>
-          <step2 label="Step 2" href="docs_0_60/howto/multi/step2.html"/>
-          <step3 label="Step 3" href="docs_0_60/howto/multi/step3.html"/>
-        </multi-page>
-        <with-images label="With Images" href="docs_0_60/howto/bugzilla-patch/howto-bugzilla-patch.html"/>
-        <write-howto label="Write a How-to" href="docs_0_60/howto/howto-howto.html"/>
-        <asf-mirror label="Download mirror" href="docs_0_60/howto/howto-asf-mirror.html"/>
-        <pdf-tab label="Create tab PDF" href="docs_0_60/howto/howto-pdf-tab.html"/>
-      </howto>
-      <developers label="Advanced Topics">
-        <build label="Building Forrest" href="docs_0_60/build.html"/>
-        <catalog label="Using DTD Catalogs" href="docs_0_60/catalog.html"/>
-        <sitemap-ref label="Sitemap Reference" href="docs_0_60/sitemap-ref.html">
-          <linkrewriting_impl href="docs_0_60/sitemap-ref.html#linkrewriting_impl"/>
-          <menu_generation_impl href="docs_0_60/sitemap-ref.html#menu_generation_impl"/>
-          <source_pipelines href="docs_0_60/sitemap-ref.html#source_pipelines"/>
-          <forrest_xmap href="docs_0_60/sitemap-ref.html#forrest_xmap"/>
-        </sitemap-ref>
-        <project-sitemap label="Project sitemap" href="docs_0_60/project-sitemap.html"/>
-        <cap label="Sourcetype Action" href="docs_0_60/cap.html"/>
-      </developers>
-      <samples label="Reference docs">
-        <dtd-docs-container label="DTD documentation">
-          <dtd-docs label="Overview" href="docs_0_60/../dtdx/dtd-docs.html"/>
-          <document-v20-dtd label="document-v20" href="docs_0_60/../dtdx/document-v20.dtdx.html"/>
-          <howto-v20-dtd label="howto-v20" href="docs_0_60/../dtdx/howto-v20.dtdx.html"/>
-          <faq-v20-dtd label="faq-v20" href="docs_0_60/../dtdx/faq-v20.dtdx.html"/>
-          <document-v13-dtd label="document-v13" href="docs_0_60/../dtdx/document-v13.dtdx.html"/>
-          <howto-v13-dtd label="howto-v13" href="docs_0_60/../dtdx/howto-v13.dtdx.html"/>
-          <faq-v13-dtd label="faq-v13" href="docs_0_60/../dtdx/faq-v13.dtdx.html"/>
-        </dtd-docs-container>
-        <samples-container label="Doc samples">
-          <document-v12 href="docs_0_60/../dtdx/document-v12.html"/>
-          <document-v13 label="document-v13" href="docs_0_60/../dtdx/document-v13.html"/>
-          <document-v20 label="document-v20" href="docs_0_60/../dtdx/document-v20.html"/>
-        </samples-container>
-      </samples>
-    </documentation>
-  </v0.60>
 </site>

Modified: forrest/site/abs-menulinks
URL: http://svn.apache.org/viewvc/forrest/site/abs-menulinks?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/abs-menulinks (original)
+++ forrest/site/abs-menulinks Wed Apr 18 01:36:14 2007
@@ -124,9 +124,9 @@
 <!-- FIXME: Might not need these when we have the local docs happening -->
         <versions tab="home">
           <overview tab="home" href="http://forrest.apache.org/docs.html"/>
+          <v0.9 tab="home" href="http://forrest.apache.org/0.9/"/>
           <v0.8 tab="home" href="http://forrest.apache.org/0.8/"/>
           <v0.7 tab="home" href="http://forrest.apache.org/0.7/"/>
-          <v0.6 tab="home" href="http://forrest.apache.org/0.6/"/>
         </versions>
       </docs>
     </forrest>
@@ -177,14 +177,15 @@
   </external-refs>
   <versions tab="docs">
     <overview tab="docs" label="Overview" href="versions/index.html"/>
-    <v0.8 tab="docs" label="0.8-dev" href="site:index"/>
-    <v0.7 tab="docs" label="0.7 (current)" href="site:v0.70//index"/>
-    <v0.6 tab="docs" label="0.6" href="site:v0.60//index"/>
+    <v0.9 tab="docs" label="0.9-dev" href="site:index"/>
+    <v0.8 tab="docs" label="0.8 (current)" href="site:v0.80//index"/>
+    <v0.7 tab="docs" label="0.7" href="site:v0.70//index"/>
   </versions>
   <pluginVersions tab="plugins">
     <overview tab="plugins" label="Overview" href="pluginDocs/index.html"/>
-    <v0.8 tab="plugins" label="0.8-dev" href="site:plugins/index"/>
-    <v0.7 tab="plugins" label="0.7 (current)" href="site:v0.70//plugins/index"/>
+    <v0.9 tab="plugins" label="0.9-dev" href="site:plugins/index"/>
+    <v0.8 tab="plugins" label="0.8 (current)" href="site:v0.80//plugins/index"/>
+    <v0.7 tab="plugins" label="0.7" href="site:v0.70//plugins/index"/>
   </pluginVersions>
   <tools tab="tools" label="Tools" href="tools/">
     <index tab="tools" label="Index" href="tools/index.html"/>
@@ -200,14 +201,143 @@
        version of a document with the site:protocol by specifiying an access 
        path such as 'site:v0.70/documentation/faq'
        
-       To create a new release:
-       
-       -  copy first versioned element below and insert right after this comment
-       -  edit version-element name to reflect new version number
-       -  FIXME: Add instructions for fixing directories and adjusting links in files  
-       
+       To create a new release see f.a.o/procedures/release/How_to_release.html
        -->
-  <v0.80 tab="home" label="Documentation in development" description="Set of documents for the in-development version, i.e. SVN head">
+  <v0.90 tab="home" label="Documentation in development" description="Set of documents for the in-development version, i.e. SVN head">
+    <documentation tab="v0_90" label="0.90-dev" href="docs_0_90/">
+      <index tab="v0_90" label="Overview" href="docs_0_90/index.html"/>
+<!-- FIXME: Needed to avoid moving files -->
+      <catalog tab="v0_90" href="docs_0_90/catalog.html"/>
+      <project-sitemap tab="v0_90" href="docs_0_90/project-sitemap.html"/>
+      <upgrading_09 tab="v0_90" href="docs_0_90/upgrading_09.html"/>
+<!-- FIXME: i don't understand what the previous FIXME means. Why do we need those entries without labels? -->
+<!-- Insert all instructional documentation here -->
+      <your-project tab="v0_90" label="Using Forrest" href="docs_0_90/your-project.html">
+        <new_content_type tab="v0_90" href="docs_0_90/your-project.html#adding_new_content_type"/>
+        <new_dtd tab="v0_90" href="docs_0_90/your-project.html#new_dtd"/>
+        <webapp tab="v0_90" href="docs_0_90/your-project.html#webapp"/>
+        <skins tab="v0_90" href="docs_0_90/your-project.html#skins"/>
+        <new-skin tab="v0_90" href="docs_0_90/your-project.html#new_skin"/>
+        <invoking_from_ant tab="v0_90" href="docs_0_90/your-project.html#invoking_from_ant"/>
+      </your-project>
+      <howto tab="v0_90" label="How-To" href="docs_0_90/howto/">
+        <overview tab="v0_90" label="Overview" href="docs_0_90/howto/index.html"/>
+        <ForrestInstall tab="v0_90" label="Install Forrest">
+          <build tab="v0_90" label="Building Forrest from Source" href="docs_0_90/build.html" description="Build and install the current                     unreleased version">
+            <run tab="v0_90" href="docs_0_90/build.html#run"/>
+          </build>
+        </ForrestInstall>
+        <upgrading_09Ref tab="v0_90" label="Upgrading to 0.9" href="site:upgrading_09"/>
+        <ForrestUse tab="v0_90" label="Use Forrest"/>
+        <ForrestCustomize tab="v0_90" label="Customize Forrest" description="Adapt and tune Forrest for your needs">
+          <sitemap-explain tab="v0_90" label="Sitemaps explained" href="docs_0_90/sitemap-explain.html"/>
+          <custom-html-source tab="v0_90" label="Custom html source" href="docs_0_90/howto/howto-custom-html-source.html"/>
+          <project-sitemapRef tab="v0_90" label="Project sitemap" href="site:project-sitemap"/>
+          <editcss tab="v0_90" label="Edit CSS (WYSIWYG)" href="docs_0_90/howto/howto-editcss.html"/>
+          <pdf-tab tab="v0_90" label="Create tab PDF" href="docs_0_90/howto/howto-pdf-tab.html" description="Generate one pdf-document for all pages of a tab"/>
+          <corner-css tab="v0_90" label="CSS corner SVG" href="docs_0_90/howto/howto-corner-images.html"/>
+        </ForrestCustomize>
+        <ForrestIntegrate tab="v0_90" label="Integrate Forrest with tools">
+          <maven tab="v0_90" label="Maven Integration" href="docs_0_90/howto/howto-forrest-from-maven.html"/>
+          <catalogRef1 tab="v0_90" label="Using DTD Catalogs" href="site:catalog"/>
+        </ForrestIntegrate>
+        <ForrestExtend tab="v0_90" label="Extend Forrest" description="Extend Forrest with new functionalities">
+          <buildPlugin tab="v0_90" label="Build a Plugin" href="docs_0_90/howto/howto-buildPlugin.html"/>
+          <skin-package tab="v0_90" label="Package new Skins" href="docs_0_90/skin-package.html"/>
+        </ForrestExtend>
+        <asf-mirror tab="v0_90" label="Download mirror" href="docs_0_90/howto/howto-asf-mirror.html"/>
+        <documentationCreate tab="v0_90" label="Adding Documentation" description="Instructions to enhance Forrest by writing                 new pieces of documentation.">
+          <write-howto tab="v0_90" label="Write a How-to" href="site:write-howto" description="Instructions for writing                 a new howto-document"/>
+          <multi tab="v0_90" label="Multipage HowTo" href="docs_0_90/howto/multi/">
+            <intro tab="v0_90" label="Introduction" href="docs_0_90/howto/multi/howto-multi.html"/>
+            <step1 tab="v0_90" label="Step 1" href="docs_0_90/howto/multi/step1.html"/>
+            <step2 tab="v0_90" label="Step 2" href="docs_0_90/howto/multi/step2.html"/>
+            <step3 tab="v0_90" label="Step 3" href="docs_0_90/howto/multi/step3.html"/>
+          </multi>
+        </documentationCreate>
+      </howto>
+      <faq tab="v0_90" label="FAQs" href="docs_0_90/faq.html">
+        <build_msg_a tab="v0_90" href="docs_0_90/faq.html#build_msg_a"/>
+        <docbook tab="v0_90" href="docs_0_90/faq.html#docbook"/>
+        <docs tab="v0_90" href="docs_0_90/faq.html#docs"/>
+        <checksums tab="v0_90" href="docs_0_90/faq.html#checksums"/>
+        <edit-content tab="v0_90" href="docs_0_90/faq.html#edit-content"/>
+        <ignoring_javadocs tab="v0_90" href="docs_0_90/faq.html#ignoring_javadocs"/>
+        <jobs tab="v0_90" href="docs_0_90/faq.html#jobs"/>
+        <link_raw tab="v0_90" href="docs_0_90/faq.html#link_raw"/>
+        <logs tab="v0_90" href="docs_0_90/faq.html#logs"/>
+        <pdf_images tab="v0_90" href="docs_0_90/faq.html#pdf_images"/>
+        <rawHTML tab="v0_90" href="docs_0_90/faq.html#rawHTML"/>
+        <single-document tab="v0_90" href="docs_0_90/faq.html#single-document"/>
+        <tab-index tab="v0_90" href="docs_0_90/faq.html#tab-index"/>
+        <cli-xconf tab="v0_90" href="docs_0_90/faq.html#cli-xconf"/>
+        <pageBreaks tab="v0_90" href="docs_0_90/faq.html#pageBreaks"/>
+        <site-xml tab="v0_90" href="docs_0_90/faq.html#site-xml"/>
+        <requirements tab="v0_90" href="docs_0_90/faq.html#requirements"/>
+        <xml-entities tab="v0_90" href="docs_0_90/faq.html#xml-entities"/>
+      </faq>
+      <whitepapers tab="v0_90" label="Background" description="Background documentation about Forrest and the technologies used">
+        <linking tab="v0_90" label="Menus and Linking" href="docs_0_90/linking.html">
+          <menu_generation tab="v0_90" href="docs_0_90/linking.html#menu_generation"/>
+          <tab-site tab="v0_90" href="docs_0_90/linking.html#tab-site"/>
+        </linking>
+        <searching tab="v0_90" label="Search Options in Forrest" href="docs_0_90/searching.html"/>
+        <locationmap tab="v0_90" label="Locationmap" href="docs_0_90/locationmap.html">
+          <namingConvention tab="v0_90" href="docs_0_90/locationmap.html#namingConvention"/>
+        </locationmap>
+        <sitemap-ref tab="v0_90" label="Sitemap Reference" href="docs_0_90/sitemap-ref.html">
+          <linkrewriting_impl tab="v0_90" href="docs_0_90/sitemap-ref.html#linkrewriting_impl"/>
+          <menu_generation_impl tab="v0_90" href="docs_0_90/sitemap-ref.html#menu_generation_impl"/>
+          <source_pipelines tab="v0_90" href="docs_0_90/sitemap-ref.html#source_pipelines"/>
+          <forrest_xmap tab="v0_90" href="docs_0_90/sitemap-ref.html#forrest_xmap"/>
+        </sitemap-ref>
+        <skins tab="v0_90" label="Skins" href="docs_0_90/skins.html" description="About default skins, their naming and features"/>
+        <status-themes tab="v0_90" label="Dispatcher versus Skins" href="docs_0_90/status-themes.html"/>
+        <cap tab="v0_90" label="Sourcetype Action" href="docs_0_90/cap.html"/>
+        <validation tab="v0_90" label="XML validation and entity resolution" href="docs_0_90/validation.html">
+          <catalog tab="v0_90" href="docs_0_90/validation.html#catalog"/>
+          <debug-catalog tab="v0_90" href="docs_0_90/validation.html#debug-catalog"/>
+        </validation>
+      </whitepapers>
+      <changes tab="v0_90" label="Changes" href="docs_0_90/changes.html"/>
+      <changes-rss tab="v0_90" href="docs_0_90/changes.rss"/>
+      <glossary tab="v0_90" label="Glossary" href="docs_0_90/glossary.html"/>
+      <samples tab="v0_90" label="Reference docs">
+        <dtd-docs-container tab="v0_90" label="DTD documentation">
+          <dtd-docs tab="v0_90" label="Overview" href="dtdx/dtd-docs.html"/>
+          <document-v20-dtd tab="v0_90" label="document-v20" href="dtdx/document-v20.dtdx.html"/>
+          <howto-v20-dtd tab="v0_90" label="howto-v20" href="dtdx/howto-v20.dtdx.html"/>
+          <faq-v20-dtd tab="v0_90" label="faq-v20" href="dtdx/faq-v20.dtdx.html"/>
+          <document-v13-dtd tab="v0_90" label="document-v13" href="dtdx/document-v13.dtdx.html"/>
+          <howto-v13-dtd tab="v0_90" label="howto-v13" href="dtdx/howto-v13.dtdx.html"/>
+          <faq-v13-dtd tab="v0_90" label="faq-v13" href="dtdx/faq-v13.dtdx.html"/>
+        </dtd-docs-container>
+        <samples-container tab="v0_90" label="Doc samples">
+          <document-v12 tab="v0_90" href="dtdx/document-v12.html"/>
+          <document-v13 tab="v0_90" label="document-v13" href="dtdx/document-v13.html"/>
+          <document-v20 tab="v0_90" label="document-v20" href="dtdx/document-v20.html"/>
+        </samples-container>
+      </samples>
+<!-- FIXME: Consider moving these documents into their own tab as there is no point in
+                    coying historic info from version to version.
+                    Options: Subtab "Old Stuff" in Docs tab or as a main tab 
+        -->
+      <older_documentation tab="v0_90" label="Older Docs">
+        <primer tab="v0_90" label="Forrest Primer" href="docs_0_90/primer.html">
+          <cvs tab="v0_90" href="docs_0_90/primer.html#cvs"/>
+        </primer>
+        <libre-intro tab="v0_90" label="Libre" href="docs_0_90/libre-intro.html"/>
+        <dreams tab="v0_90" label="Dream list" href="docs_0_90/dreams.html"/>
+        <cvsssh tab="v0_90" label="CVS over SSH" href="docs_0_90/howto/cvs-ssh/howto-cvs-ssh.html"/>
+      </older_documentation>
+    </documentation>
+    <plugins tab="p0_90" label="0.90 Plugins" href="pluginDocs/plugins_0_90/">
+      <index tab="p0_90" label="Index" href="pluginDocs/plugins_0_90/index.html"/>
+      <using tab="p0_90" label="Using Plugins" href="pluginDocs/plugins_0_90/usingPlugins.html"/>
+      <infrastructure tab="p0_90" label="Plugin Infrastructure" href="pluginDocs/plugins_0_90/pluginInfrastructure.html"/>
+    </plugins>
+  </v0.90>
+  <v0.80 tab="home" label="Documentation current" description="Set of documents for the released version">
     <documentation tab="v0_80" label="0.80-dev" href="docs_0_80/">
       <index tab="v0_80" label="Overview" href="docs_0_80/index.html"/>
 <!-- FIXME: Needed to avoid moving files -->
@@ -340,7 +470,8 @@
       <infrastructure tab="p0_80" label="Plugin Infrastructure" href="pluginDocs/plugins_0_80/pluginInfrastructure.html"/>
     </plugins>
   </v0.80>
-  <v0.70 tab="home" label="Documentation current" description="Set of documents for the released version">
+<!-- Removing the label from the past release, stops it being in the ToC and cluttering -->
+  <v0.70 tab="home">
     <documentation tab="v0_70" label="0.70" href="docs_0_70/">
       <index tab="v0_70" label="Overview" href="docs_0_70/index.html"/>
       <faq tab="v0_70" label="FAQs" href="docs_0_70/faq.html">
@@ -450,77 +581,4 @@
       <infrastructure tab="p0_70" label="Plugin Infrastructure" href="pluginDocs/plugins_0_70/pluginInfrastructure.html"/>
     </plugins>
   </v0.70>
-  <v0.60 tab="home">
-    <documentation tab="v0_60" label="0.60" href="docs_0_60/">
-      <index tab="v0_60" label="Overview" href="docs_0_60/index.html"/>
-      <faq tab="v0_60" label="FAQs" href="docs_0_60/faq.html">
-        <docbook tab="v0_60" href="docs_0_60/faq.html#docbook"/>
-        <ignoring_javadocs tab="v0_60" href="docs_0_60/faq.html#ignoring_javadocs"/>
-        <link_raw tab="v0_60" href="docs_0_60/faq.html#link_raw"/>
-        <pdf_images tab="v0_60" href="docs_0_60/faq.html#pdf_images"/>
-      </faq>
-      <changes tab="v0_60" label="Changes" href="docs_0_60/changes.html"/>
-      <todo tab="v0_60" label="Todo" href="docs_0_60/todo.html"/>
-      <your-project tab="v0_60" label="Using Forrest" href="docs_0_60/your-project.html">
-        <new_content_type tab="v0_60" href="docs_0_60/your-project.html#adding_new_content_type"/>
-        <new_dtd tab="v0_60" href="docs_0_60/your-project.html#new_dtd"/>
-        <webapp tab="v0_60" href="docs_0_60/your-project.html#webapp"/>
-        <skins tab="v0_60" href="docs_0_60/your-project.html#skins"/>
-        <new-skin tab="v0_60" href="docs_0_60/your-project.html#new_skin"/>
-        <invoking_from_ant tab="v0_60" href="docs_0_60/your-project.html#invoking_from_ant"/>
-      </your-project>
-      <upgrading_06 tab="v0_60" label="Upgrading to 0.6" href="docs_0_60/upgrading_06.html"/>
-      <validation tab="v0_60" label="XML Validation" href="docs_0_60/validation.html"/>
-      <linking tab="v0_60" label="Menus and Linking" href="docs_0_60/linking.html">
-        <menu_generation tab="v0_60" href="docs_0_60/linking.html#menu_generation"/>
-      </linking>
-      <searching tab="v0_60" label="Searching" href="docs_0_60/searching.html"/>
-      <skins tab="v0_60" label="Default Skins" href="docs_0_60/skins.html"/>
-      <skin-package tab="v0_60" label="Skin Packages" href="docs_0_60/skin-package.html"/>
-      <forrest-contract tab="v0_60" label="Our Contract" href="docs_0_60/forrest-contract.html"/>
-      <compliance tab="v0_60" label="Standards Compliance" href="docs_0_60/compliance.html"/>
-      <howto tab="v0_60" label="How-To" href="docs_0_60/howto/">
-        <overview tab="v0_60" label="Overview" href="docs_0_60/howto/index.html"/>
-        <single-page tab="v0_60" label="Single Page" href="docs_0_60/howto/howto-howto.html"/>
-        <multi-page tab="v0_60" label="Multi-Page" href="docs_0_60/howto/multi/">
-          <intro tab="v0_60" label="Intro" href="docs_0_60/howto/multi/howto-multi.html"/>
-          <step1 tab="v0_60" label="Step 1" href="docs_0_60/howto/multi/step1.html"/>
-          <step2 tab="v0_60" label="Step 2" href="docs_0_60/howto/multi/step2.html"/>
-          <step3 tab="v0_60" label="Step 3" href="docs_0_60/howto/multi/step3.html"/>
-        </multi-page>
-        <with-images tab="v0_60" label="With Images" href="docs_0_60/howto/bugzilla-patch/howto-bugzilla-patch.html"/>
-        <write-howto tab="v0_60" label="Write a How-to" href="docs_0_60/howto/howto-howto.html"/>
-        <asf-mirror tab="v0_60" label="Download mirror" href="docs_0_60/howto/howto-asf-mirror.html"/>
-        <pdf-tab tab="v0_60" label="Create tab PDF" href="docs_0_60/howto/howto-pdf-tab.html"/>
-      </howto>
-      <developers tab="v0_60" label="Advanced Topics">
-        <build tab="v0_60" label="Building Forrest" href="docs_0_60/build.html"/>
-        <catalog tab="v0_60" label="Using DTD Catalogs" href="docs_0_60/catalog.html"/>
-        <sitemap-ref tab="v0_60" label="Sitemap Reference" href="docs_0_60/sitemap-ref.html">
-          <linkrewriting_impl tab="v0_60" href="docs_0_60/sitemap-ref.html#linkrewriting_impl"/>
-          <menu_generation_impl tab="v0_60" href="docs_0_60/sitemap-ref.html#menu_generation_impl"/>
-          <source_pipelines tab="v0_60" href="docs_0_60/sitemap-ref.html#source_pipelines"/>
-          <forrest_xmap tab="v0_60" href="docs_0_60/sitemap-ref.html#forrest_xmap"/>
-        </sitemap-ref>
-        <project-sitemap tab="v0_60" label="Project sitemap" href="docs_0_60/project-sitemap.html"/>
-        <cap tab="v0_60" label="Sourcetype Action" href="docs_0_60/cap.html"/>
-      </developers>
-      <samples tab="v0_60" label="Reference docs">
-        <dtd-docs-container tab="v0_60" label="DTD documentation">
-          <dtd-docs tab="v0_60" label="Overview" href="dtdx/dtd-docs.html"/>
-          <document-v20-dtd tab="v0_60" label="document-v20" href="dtdx/document-v20.dtdx.html"/>
-          <howto-v20-dtd tab="v0_60" label="howto-v20" href="dtdx/howto-v20.dtdx.html"/>
-          <faq-v20-dtd tab="v0_60" label="faq-v20" href="dtdx/faq-v20.dtdx.html"/>
-          <document-v13-dtd tab="v0_60" label="document-v13" href="dtdx/document-v13.dtdx.html"/>
-          <howto-v13-dtd tab="v0_60" label="howto-v13" href="dtdx/howto-v13.dtdx.html"/>
-          <faq-v13-dtd tab="v0_60" label="faq-v13" href="dtdx/faq-v13.dtdx.html"/>
-        </dtd-docs-container>
-        <samples-container tab="v0_60" label="Doc samples">
-          <document-v12 tab="v0_60" href="dtdx/document-v12.html"/>
-          <document-v13 tab="v0_60" label="document-v13" href="dtdx/document-v13.html"/>
-          <document-v20 tab="v0_60" label="document-v20" href="dtdx/document-v20.html"/>
-        </samples-container>
-      </samples>
-    </documentation>
-  </v0.60>
 </site>

Modified: forrest/site/asf-infrastructure.html
URL: http://svn.apache.org/viewvc/forrest/site/asf-infrastructure.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/asf-infrastructure.html (original)
+++ forrest/site/asf-infrastructure.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Introduction to ASF Infrastructure</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">

Modified: forrest/site/committed.html
URL: http://svn.apache.org/viewvc/forrest/site/committed.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/committed.html (original)
+++ forrest/site/committed.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Becoming an Apache Forrest committer</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">

Modified: forrest/site/compliance.html
URL: http://svn.apache.org/viewvc/forrest/site/compliance.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/compliance.html (original)
+++ forrest/site/compliance.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Standards Compliance</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">

Modified: forrest/site/contrib.html
URL: http://svn.apache.org/viewvc/forrest/site/contrib.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/contrib.html (original)
+++ forrest/site/contrib.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Contributing to Apache Forrest</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
@@ -285,7 +285,7 @@
       </p>
 <p>
         You can get your local working copy of the
-        <a href="docs_0_80/howto/../build.html">latest and greatest code</a> (which you find
+        <a href="docs_0_90/howto/../build.html">latest and greatest code</a> (which you find
         in the Forrest module in the Subversion code repository). Review the
         todo list and the issue tracker, choose a task. Perhaps you have noticed
         something that needs patching, or have a new feature to contribute. Make
@@ -384,7 +384,7 @@
         anonymous user. Therefore, you do not have the system permissions to
         change anything. You can only update your local repository and compare
         your revisions with the real repository. The
-        <a href="docs_0_70/build.html">Building Forrest</a> document
+        <a href="docs_0_90/howto/../build.html">Building Forrest</a> document
         explains.
       </p>
 </div>
@@ -566,7 +566,7 @@
 <li> When making changes to XML documentation, or any XML document for
           that matter, use a validating XML editor. Here is some assistance
           with editor
-          <a href="docs_0_70/catalog.html">configuration</a>.
+          <a href="docs_0_90/catalog.html">configuration</a>.
         </li>
         
 <li> Remember that most people are participating in development on a

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

Modified: forrest/site/doap.xml
URL: http://svn.apache.org/viewvc/forrest/site/doap.xml?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/doap.xml (original)
+++ forrest/site/doap.xml Wed Apr 18 01:36:14 2007
@@ -28,16 +28,16 @@
     <name>Apache Forrest</name>
     <uri>http://forrest.apache.org</uri>
   </author>
-  <updated>2005-08-09T23:06:00Z</updated>
+  <updated>2007-04-18T03:40:00Z</updated>
   <id>tag:apache.org:forrest</id><link 
     rel="alternate" 
     type="text/html" 
     hreflang="en" 
     href="http://forrest.apache.org"/>
   <entry>
-    <title>Apache Forrest 0.7</title>
-    <id>tag:apache.org:forrest:0.7</id>
-    <updated>2005-08-09T23:06:00Z</updated>
+    <title>Apache Forrest 0.8</title>
+    <id>tag:apache.org:forrest:0.8</id>
+    <updated>2007-04-18T07:00:00Z</updated>
     <content type="application/rdf+xml">
       <doap:Project>
         <doap:name>Apache Forrest</doap:name>
@@ -87,8 +87,8 @@
         <doap:release>
           <doap:Version>
             <doap:name>Latest stable release</doap:name>
-            <doap:revision>0.7</doap:revision>
-            <doap:created>2005-06-23</doap:created>
+            <doap:revision>0.8</doap:revision>
+            <doap:created>2007-04-18</doap:created>
           </doap:Version>
         </doap:release>
       </doap:Project>

Modified: forrest/site/docs_0_70/body-index.html
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/body-index.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/docs_0_70/body-index.html (original)
+++ forrest/site/docs_0_70/body-index.html Wed Apr 18 01:36:14 2007
@@ -34,8 +34,8 @@
 </div>
 <div class="section">
 <p>
-        See the <a href="../">Apache Forrest Project</a> website for
-        the main project-level documents.
+        See the <a href="../">Apache Forrest Project</a> website for the main
+        project-level documents.
       </p>
 </div>
     
@@ -45,16 +45,15 @@
 </div>
 <div class="section">
 <p>
-        For the local docs for the version of Forrest that you are using,
-        see the menu at the left and the tabs above for
+        For the local docs for the version of Forrest that you are using, see
+        the menu at the left and the tabs above for
         <a href="../docs_0_70/index.html">Docs</a> and
         <a href="../docs_0_70/howto/index.html">How-To</a> and
-        <a href="../pluginDocs/plugins_0_80/index.html">Plugins</a>.
+        <a href="../pluginDocs/plugins_0_90/index.html">Plugins</a>.
       </p>
 <p>
-        See links to 
-        <a href="../versions/index.html">other versions</a>
-        of documentation.
+        See links to <a href="../versions/index.html">other versions</a> of
+        documentation.
       </p>
 </div>
   

Modified: forrest/site/docs_0_70/build.html
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/build.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/docs_0_70/build.html (original)
+++ forrest/site/docs_0_70/build.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Building Forrest (v0.7)</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -87,7 +87,7 @@
     |start Subtabs
     +-->
 <div id="level2tabs">
-<a class="selected" href="../docs_0_70/index.html">0.70 (current)</a><a class="unselected" href="../docs_0_80/index.html">0.80-dev (under development)</a><a class="unselected" href="../docs_0_60/index.html">0.60 (past)</a>
+<a class="unselected" href="../docs_0_80/index.html">0.80 (current)</a><a class="unselected" href="../docs_0_90/index.html">0.90-dev (under development)</a><a class="selected" href="../docs_0_70/index.html">0.70 (past)</a>
 </div>
 <!--+
     |end Endtabs
@@ -100,7 +100,7 @@
     |breadtrail
     +-->
 <div class="breadtrail">
-             
+
              &nbsp;
            </div>
 <!--+
@@ -283,7 +283,7 @@
 </div>
 <div id="credit">
 <hr>
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="roundbottom">
 <img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -312,7 +312,7 @@
 </div>
 <h1>Building Forrest</h1>
 <div id="motd-area">
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="minitoc-area">
 <ul class="minitoc">
@@ -340,10 +340,13 @@
 <h3 class="underlined_5">Step-by-step Subversion (SVN) instructions</h3>
 <div class="note">
 <div class="label">Note</div>
-<div class="content">If you are behind a proxy, see 
-          <a href="http://subversion.tigris.org/project_faq.html#proxy">this FAQ</a>.</div>
+<div class="content">
+          If you are behind a proxy, see
+          <a href="http://subversion.tigris.org/project_faq.html#proxy">this
+          FAQ</a>.
+        </div>
 </div>
-<ol> 
+<ol>
           
 <li>Make sure you have a recent release of a
            <a href="http://subversion.tigris.org/">Subversion</a>
@@ -357,36 +360,42 @@
            '<span class="codefrag">svn co http://svn.apache.org/repos/asf/forrest/trunk forrest</span>'
            (committers should replace <span class="codefrag">http</span> with <span class="codefrag">https</span>).</li>
           
-<li>This will create a directory called "<span class="codefrag">forrest</span>" where the Forrest source will be stored.</li> 
+<li>This will create a directory called "<span class="codefrag">forrest</span>" where the Forrest source will be stored.</li>
         
 </ol>
-<p>Whenever you want to update your Forrest source tree to the current
-         version, change to the top-level
-"<span class="codefrag">forrest</span>" directory and invoke '<span class="codefrag">svn update</span>'.</p>
-<p>To see what changes you've made, invoke '<span class="codefrag">svn status</span>'</p>
-<p>SVN is really powerful. See
-          <a href="http://svnbook.red-bean.com/">Version Control with Subversion</a> - the opensource SVN book.
+<p>
+          Whenever you want to update your Forrest source tree to the current
+          version, change to the top-level "<span class="codefrag">forrest</span>" directory and
+          invoke '<span class="codefrag">svn update</span>'.
+        </p>
+<p>
+          To see what changes you've made, invoke '<span class="codefrag">svn status</span>'
+        </p>
+<p>
+          SVN is really powerful. See
+          <a href="http://svnbook.red-bean.com/">Version Control with
+          Subversion</a> - the opensource SVN book.
         </p>
 </div>
-
-   
+    
 <a name="N1005B"></a><a name="building"></a>
 <h2 class="underlined_10">Building and installing Forrest</h2>
 <div class="section">
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-This document applies to the current 0.7 release version.
-See other instructions for the current development
-<a href="http://forrest.apache.org/docs/dev/build.html">0.8-dev</a> version.
-</div>
+        This document applies to this specific version. See other
+        instructions for the 
+        <a href="http://forrest.apache.org/docs/dev/build.html">development</a>
+        version.
+      </div>
 </div>
 <p>
-       To build Forrest, change directory to '<span class="codefrag">forrest/main</span>', and
-       then type '<span class="codefrag">build</span>' on Windows or '<span class="codefrag">./build.sh</span>' on
-       Unix. (Requires Java 1.4)
-       If everything is successful, you should see a message similar to:
-     </p>
+        To build Forrest, change directory to '<span class="codefrag">forrest/main</span>', and
+        then type '<span class="codefrag">build</span>' on Windows or '<span class="codefrag">./build.sh</span>'
+        on Unix. (Requires Java 1.4) If everything is successful, you should see
+        a message similar to:
+      </p>
 <pre class="code">
   *-----------------------------------------------------------------
   | Installation notice
@@ -402,10 +411,10 @@
   *-----------------------------------------------------------------
      </pre>
 <p>
-       As the message says, you need to add the distribution's <span class="codefrag">bin/</span>
-       ("binary") directory to your PATH variable, so the <span class="codefrag">'forrest'</span>
-       command is available everywhere:
-     </p>
+        As the message says, you need to add the distribution's
+        <span class="codefrag">bin/</span> ("binary") directory to your PATH variable, so the
+        <span class="codefrag">'forrest'</span> command is available everywhere:
+      </p>
 <pre class="code">
 [~]$ cd /path/to/svn/forrest
 [/svn/forrest]$ export FORREST_HOME=`pwd`
@@ -414,30 +423,29 @@
 <div class="warning">
 <div class="label">Warning</div>
 <div class="content">
-       After updating the Forrest source from SVN, if there have been certain types of
-       updates (e.g. Java sources, supporting libraries, build system, etc.) you will
-       need to clean and build forrest again. Do 'cd forrest/main; build clean; build".
-     </div>
+        After updating the Forrest source from SVN, if there have been certain
+        types of updates (e.g. Java sources, supporting libraries, build system,
+        etc.) you will need to clean and build forrest again. Do 'cd
+        forrest/main; build clean; build".
+      </div>
 </div>
 </div>
-
-  
+    
 <a name="N10089"></a><a name="run"></a>
 <h2 class="underlined_10">Run Forrest, run!</h2>
 <div class="section">
 <p>
-      Forrest is now ready to go. To view and edit the local copy of
-      Forrest core documentation, cd to site-author and do
-      '<span class="codefrag">forrest run</span>' to see
-      the local webapp using the bundled Jetty server. Edit something in
-      content/xdocs/*.xml see the immediate effect.
-    </p>
+        Forrest is now ready to go. To view and edit the local copy of Forrest
+        core documentation, cd to site-author and do '<span class="codefrag">forrest run</span>'
+        to see the local webapp using the bundled Jetty server. Edit something
+        in content/xdocs/*.xml see the immediate effect.
+      </p>
 <p>
-      The document <a href="../docs_0_70/your-project.html">Using Forrest</a> is
-      your next step.</p>
+        The document <a href="../docs_0_70/your-project.html">Using Forrest</a>
+        is your next step.
+      </p>
 </div>
-
-
+  
 </div>
 <!--+
     |end content

Modified: forrest/site/docs_0_70/build.pdf
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/build.pdf?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
Binary files - no diff available.

Modified: forrest/site/docs_0_70/cap.html
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/cap.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/docs_0_70/cap.html (original)
+++ forrest/site/docs_0_70/cap.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>SourceTypeAction (content aware pipelines) (v0.7)</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -87,7 +87,7 @@
     |start Subtabs
     +-->
 <div id="level2tabs">
-<a class="selected" href="../docs_0_70/index.html">0.70 (current)</a><a class="unselected" href="../docs_0_80/index.html">0.80-dev (under development)</a><a class="unselected" href="../docs_0_60/index.html">0.60 (past)</a>
+<a class="unselected" href="../docs_0_80/index.html">0.80 (current)</a><a class="unselected" href="../docs_0_90/index.html">0.90-dev (under development)</a><a class="selected" href="../docs_0_70/index.html">0.70 (past)</a>
 </div>
 <!--+
     |end Endtabs
@@ -100,7 +100,7 @@
     |breadtrail
     +-->
 <div class="breadtrail">
-             
+
              &nbsp;
            </div>
 <!--+
@@ -283,7 +283,7 @@
 </div>
 <div id="credit">
 <hr>
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="roundbottom">
 <img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -312,7 +312,7 @@
 </div>
 <h1>SourceTypeAction (content aware pipelines)</h1>
 <div id="motd-area">
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="minitoc-area">
 <ul class="minitoc">
@@ -326,33 +326,41 @@
 <a href="#Usage">Usage</a>
 </li>
 </ul>
-</div> 
+</div>
     
 <a name="N1000E"></a><a name="Introduction"></a>
 <h2 class="underlined_10">Introduction</h2>
 <div class="section">
-<p>SourceTypeAction assigns a "type" (a string) to an XML file. This is
-        done based on information occuring in the header of the XML file, up to the
-        document (root) element. This type is then returned to the sitemap as a
-        variable with the name 'sourcetype'. If no matching sourcetype could be be
-        found, null is returned and thus the contents of the action element will not be
-        executed.</p>
-<p>SourceTypeAction works by pull-parsing the document and collecting
-        information such as the Public Id, the processing instructions, the document
-        element local name and namespace, and the xsi:schemaLocation and
-        xsi:noNamespaceSchemaLocation attributes. This information is then compared
-        with the rules described in the configuration of the SourceTypeAction.</p>
-</div> 
+<p>
+        SourceTypeAction assigns a "type" (a string) to an XML file. This is
+        done based on information occuring in the header of the XML file, up to
+        the document (root) element. This type is then returned to the sitemap
+        as a variable with the name 'sourcetype'. If no matching sourcetype
+        could be be found, null is returned and thus the contents of the action
+        element will not be executed.
+      </p>
+<p>
+        SourceTypeAction works by pull-parsing the document and collecting
+        information such as the Public Id, the processing instructions, the
+        document element local name and namespace, and the xsi:schemaLocation
+        and xsi:noNamespaceSchemaLocation attributes. This information is then
+        compared with the rules described in the configuration of the
+        SourceTypeAction.
+      </p>
+</div>
     
 <a name="N1001B"></a><a name="Configuration"></a>
 <h2 class="underlined_10">Configuration</h2>
 <div class="section">
-<p>The action should be declared and configured in the map:actions
-        section of your sitemap. Example:</p>
-<pre class="code">&lt;map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"&gt;
+<p>
+        The action should be declared and configured in the map:actions section
+        of your sitemap. Example:
+      </p>
+<pre class="code">
+&lt;map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0"&gt;
  &lt;map:components&gt;
-  &lt;...&gt;
-  <strong>&lt;map:actions&gt;
+  &lt;...&gt;<strong>
+&lt;map:actions&gt;
    &lt;map:action name="sourcetype"
       src="org.apache.forrest.sourcetype.SourceTypeAction"&gt;
     &lt;sourcetype name="download-v1.0"&gt;
@@ -361,63 +369,76 @@
     &lt;/sourcetype&gt;      
    &lt;/map:action&gt;
   &lt;/map:actions&gt;</strong>
+
  &lt;/map:components&gt;
  &lt;...&gt;
-&lt;/map:sitemap&gt;</pre>
-<p>There are other examples in <span class="codefrag">main/webapp/forrest.xmap</span>
+&lt;/map:sitemap&gt;
+      </pre>
+<p>
+        There are other examples in <span class="codefrag">main/webapp/forrest.xmap</span>
+      
 </p>
-<p>Each sourcetype-tag declares a source type. Inside the sourcetype-tag
-        a number of rules can be defined, described below. The sourcetypes will be
-        checked in the same order as they are defined in the configuration, the first
-        sourcetype of which all rules match will be used.</p>
-<p>These are the available rules:</p>
-<dl> 
+<p>
+        Each sourcetype-tag declares a source type. Inside the sourcetype-tag a
+        number of rules can be defined, described below. The sourcetypes will be
+        checked in the same order as they are defined in the configuration, the
+        first sourcetype of which all rules match will be used.
+      </p>
+<p>
+        These are the available rules:
+      </p>
+<dl>
         
-<dt>document-declaration</dt> 
+<dt>document-declaration</dt>
         
 <dd>This rule checks the public ID. It takes one attribute
-          <span class="codefrag">public-id</span>.</dd> 
+          <span class="codefrag">public-id</span>.</dd>
         
-<dt>document-element</dt> 
+<dt>document-element</dt>
         
 <dd>This rule checks the local name and/or namespace of the document
           element. These are specified with the attributes <span class="codefrag">local-name</span> and
-          <span class="codefrag">namespace</span>. At least one of these two is required.</dd> 
+          <span class="codefrag">namespace</span>. At least one of these two is required.</dd>
         
-<dt>processing-instruction</dt> 
+<dt>processing-instruction</dt>
         
 <dd>This rule checks a processing instruction. It can take two
           attributes: <span class="codefrag">target</span> and <span class="codefrag">data</span>. The target attribute is
-          always required, the data attribute is optional.</dd> 
+          always required, the data attribute is optional.</dd>
         
-<dt>w3c-xml-schema</dt> 
+<dt>w3c-xml-schema</dt>
         
 <dd>This rule checks the value of the xsi:schemaLocation and
           xsi:noNamespaceSchemaLocation attributes on the document element. These are
           specified with the attributes <span class="codefrag">schema-location</span> and
-          <span class="codefrag">no-namespace-schema-location</span>.</dd> 
+          <span class="codefrag">no-namespace-schema-location</span>.</dd>
       
 </dl>
 <p>
-       Perhaps you need other methods. Please enhance the source at
-       <span class="codefrag">main/java/org/apache/forrest/sourcetype</span>
+        Perhaps you need other methods. Please enhance the source at
+        <span class="codefrag">main/java/org/apache/forrest/sourcetype</span>
       
 </p>
-</div> 
+</div>
     
-<a name="N1006D"></a><a name="Usage"></a>
+<a name="N1006E"></a><a name="Usage"></a>
 <h2 class="underlined_10">Usage</h2>
 <div class="section">
-<p>The source of which the sourcetype must be defined must be specified
-        using the 'src' attribute on the map:act element.</p>
-<pre class="code">&lt;map:act type="sourcetype" src="{1}"&gt;
+<p>
+        The source of which the sourcetype must be defined must be specified
+        using the 'src' attribute on the map:act element.
+      </p>
+<pre class="code">
+&lt;map:act type="sourcetype" src="{1}"&gt;
 ...
-&lt;/map:act&gt;</pre>
-<p>See a real-life example in the advanced section of the
-        <a href="your-project.html#adding_new_content_type_2">Using Forrest</a>
-        document.
+&lt;/map:act&gt;
+      </pre>
+<p>
+        See a real-life example in the advanced section of the
+        <a href="your-project.html#adding_new_content_type_2">Using
+        Forrest</a> document.
       </p>
-</div> 
+</div>
   
 </div>
 <!--+

Modified: forrest/site/docs_0_70/cap.pdf
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/cap.pdf?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
Binary files - no diff available.

Modified: forrest/site/docs_0_70/catalog.html
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/catalog.html?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
--- forrest/site/docs_0_70/catalog.html (original)
+++ forrest/site/docs_0_70/catalog.html Wed Apr 18 01:36:14 2007
@@ -3,7 +3,7 @@
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta content="Apache Forrest" name="Generator">
-<meta name="Forrest-version" content="0.8-dev">
+<meta name="Forrest-version" content="0.9-dev">
 <meta name="Forrest-skin-name" content="pelt">
 <title>Using Catalog Entity Resolver for local DTDs (v0.7)</title>
 <link type="text/css" href="../skin/basic.css" rel="stylesheet">
@@ -87,7 +87,7 @@
     |start Subtabs
     +-->
 <div id="level2tabs">
-<a class="selected" href="../docs_0_70/index.html">0.70 (current)</a><a class="unselected" href="../docs_0_80/index.html">0.80-dev (under development)</a><a class="unselected" href="../docs_0_60/index.html">0.60 (past)</a>
+<a class="unselected" href="../docs_0_80/index.html">0.80 (current)</a><a class="unselected" href="../docs_0_90/index.html">0.90-dev (under development)</a><a class="selected" href="../docs_0_70/index.html">0.70 (past)</a>
 </div>
 <!--+
     |end Endtabs
@@ -100,7 +100,7 @@
     |breadtrail
     +-->
 <div class="breadtrail">
-             
+
              &nbsp;
            </div>
 <!--+
@@ -283,7 +283,7 @@
 </div>
 <div id="credit">
 <hr>
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="roundbottom">
 <img style="display: none" class="corner" height="15" width="15" alt="" src="../skin/images/rc-b-l-15-1body-2menu-3menu.png"></div>
@@ -312,7 +312,7 @@
 </div>
 <h1>Using Catalog Entity Resolver for local DTDs</h1>
 <div id="motd-area">
-        This is documentation for current version v0.7
+        This is documentation for past version v0.7
        (<a href="http://forrest.apache.org/versions/">More</a>)</div>
 <div id="minitoc-area">
 <ul class="minitoc">
@@ -373,26 +373,25 @@
 <div class="section">
 <p>
         This is a collection of notes for configuring the Catalog Entity
-        Resolver with your favourite XML tools (validating parsers and
-        editors).
+        Resolver with your favourite XML tools (validating parsers and editors).
       </p>
 <p>
         All XML documents declare their ruleset - the Document Type Definition
         (DTD). When Forrest processes the documents, it uses the Resolver to
-        find Forrest's local copies of the DTDs, rather than trundling out
-        onto the network.
+        find Forrest's local copies of the DTDs, rather than trundling out onto
+        the network.
       </p>
 <p>
-        Many Java-based XML tools already have an entity resolver, probably
-        the same one that Forrest uses. Many non-Java tools also have an
-        entity resolver. To use these tools with documents based on the
-        Forrest DTDs, you need to configure the tools.
+        Many Java-based XML tools already have an entity resolver, probably the
+        same one that Forrest uses. Many non-Java tools also have an entity
+        resolver. To use these tools with documents based on the Forrest DTDs,
+        you need to configure the tools.
       </p>
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-        The information provided here is not intended to endorse any
-        particular tool.
+        The information provided here is not intended to endorse any particular
+        tool.
       </div>
 </div>
 <p>
@@ -400,7 +399,6 @@
         please send them to the forrest-dev mailing list.
       </p>
 </div>
-
     
 <a name="N10023"></a><a name="config"></a>
 <h2 class="underlined_10">General configuration notes</h2>
@@ -415,11 +413,10 @@
         supplied by Forrest at either:
         <span class="codefrag">$FORREST_HOME/main/webapp/resources/schema/catalog.xcat</span>
         (for XML Catalog) or
-        <span class="codefrag">$FORREST_HOME/main/webapp/resources/schema/catalog</span>
-        (for TR 9401 Catalog).
+        <span class="codefrag">$FORREST_HOME/main/webapp/resources/schema/catalog</span> (for TR
+        9401 Catalog).
       </p>
 </div>
-
     
 <a name="N10039"></a><a name="tools"></a>
 <h2 class="underlined_10">Configuring specific tools</h2>
@@ -427,8 +424,8 @@
 <a name="N1003F"></a><a name="system"></a>
 <h3 class="underlined_5">Operating system catalog</h3>
 <p>
-          Some operating systems already provide a system-wide catalog that
-          is used by many tools. This is usually located at
+          Some operating systems already provide a system-wide catalog that is
+          used by many tools. This is usually located at
           <span class="codefrag">/etc/xml/catalog</span> or at
           <span class="codefrag">/usr/share/sgml/catalog</span> files.
         </p>
@@ -436,28 +433,31 @@
           For an XML Catalog, add this line:
         </p>
 <pre class="code">
+
 &lt;nextCatalog
 catalog="/usr/local/svn/forrest/main/webapp/resources/schema/catalog.xcat"/&gt;
+        
         </pre>
 <p>
           For a TR 9401 Catalog, add this line:
         </p>
 <pre class="code">
+
 CATALOG \
 "/usr/local/svn/forrest/main/webapp/resources/schema/catalog"
+        
         </pre>
 <p>
-          Actually you probably do not want to touch that system catalog,
-          so rather create your own catalog file in your home directory
-          which refers to both the Forrest catalog and your system catalog.
+          Actually you probably do not want to touch that system catalog, so
+          rather create your own catalog file in your home directory which
+          refers to both the Forrest catalog and your system catalog.
         </p>
 <a name="N10060"></a><a name="xmllint"></a>
 <h3 class="underlined_5">xmllint validating parser</h3>
 <p>
-          "xmllint" is part of the "libxml2" package.
-          It is very fast and powerful, with are many facilities. It can
-          validate whole directories of files at once.
-          Set the SGML_CATALOG_FILES environment variable.
+          "xmllint" is part of the "libxml2" package. It is very fast and
+          powerful, with are many facilities. It can validate whole directories
+          of files at once. Set the SGML_CATALOG_FILES environment variable.
         </p>
 <pre class="code">
 export SGML_CATALOG_FILES=$SGML_CATALOG_FILES:\
@@ -467,26 +467,25 @@
 <a name="N1006E"></a><a name="vim"></a>
 <h3 class="underlined_5">Vim</h3>
 <p>
-            The following .vimrc entries are useful:
-          </p>
+          The following .vimrc entries are useful:
+        </p>
 <pre class="code">
 au FileType xml set efm=%A%f:%l:\ %.%#error:\ %m,%-Z%p^,%-C%.%#
 au FileType xml set makeprg=xmllint\ --noout\ --valid\ --catalogs\ %
         </pre>
 <a name="N1007C"></a><a name="emacs"></a>
 <h3 class="underlined_5">Emacs</h3>
-<p>See 
-        <a href="http://www.thaiopensource.com/nxml-mode/">nXML mode</a>
-        and 
-        <a href="http://www.dpawson.co.uk/relaxng/nxml/">FAQ</a>.
+<p>
+          See <a href="http://www.thaiopensource.com/nxml-mode/">nXML
+          mode</a> and
+          <a href="http://www.dpawson.co.uk/relaxng/nxml/">FAQ</a>.
         </p>
 <a name="N1008E"></a><a name="onsgmls"></a>
 <h3 class="underlined_5">onsgmls validating parser</h3>
 <p>
-          "onsgmls" is part of the "Open SP" package.
-          You need to also tell it where to find an "SGML declaration".
-          The easiest way is to create your own little "my-catalog" file,
-          containing this:
+          "onsgmls" is part of the "Open SP" package. You need to also tell it
+          where to find an "SGML declaration". The easiest way is to create your
+          own little "my-catalog" file, containing this:
         </p>
 <pre class="code">
 SGMLDECL "/usr/share/sgml/xml.dcl"
@@ -502,58 +501,68 @@
 <a name="N100A3"></a><a name="jedit"></a>
 <h3 class="underlined_5">jEdit - Open Source programmer's text editor</h3>
 <pre class="code">
+
 Select the menu:
 Utilities &gt; Global Options &gt; Plugins:XML &gt; Catalogs
 Select the "+" button, and use the "File System Browser"
 to specify the TR9401 Catalog file:
 "forrest/main/webapp/resources/schema/catalog"
+        
         </pre>
 <pre class="code">
+
 On version 4.2. Select the menu:
 Plugins &gt; Plugins Options &gt; Plugins:XML &gt; Catalogs
 Select the "+" button, and use the "File System Browser"
 to specify the TR9401 Catalog file:
 "forrest/main/webapp/resources/schema/catalog"
+        
         </pre>
 <a name="N100B2"></a><a name="oxygenxml"></a>
 <h3 class="underlined_5">oXygen XML Editor</h3>
 <pre class="code">
+
 Select the menu:
 Options &gt; Preferences &gt; XML Catalog
 Specify the XML Catalog file:
 "forrest/main/webapp/resources/schema/catalog.xcat"
+        
         </pre>
 <a name="N100BD"></a><a name="xmlspy"></a>
 <h3 class="underlined_5">xmlspy</h3>
 <pre class="code">
+
 Add the following entry to the file CustomCatalog.xml
 (located in XMLSpy install directory):
 
 &lt;nextCatalog
 catalog="file://localhost/C:/apache/forrest/main/webapp/
 resources/schema/catalog.xcat"/&gt;
+        
         </pre>
 <a name="N100C8"></a><a name="xxe"></a>
 <h3 class="underlined_5">XMLmind XML Editor (XXE)</h3>
 <a name="N100CE"></a><a name="XXE+v2.5p2+or+older"></a>
 <h4>XXE v2.5p2 or older</h4>
 <pre class="code">
+
 Select the menu:
 Options &gt; Options &gt; Schema &gt; Add File
 Specify the XML Catalog file:
 "forrest/main/webapp/resources/schema/catalog.xcat"
-        </pre>
+        
+          </pre>
 <a name="N100D9"></a><a name="XXE+v2.5p3%2B"></a>
 <h4>XXE v2.5p3+</h4>
-<p>XXE supports catalogs by automatic detection via configuration files.  
-            Download the <a target="_blank" href="http://www.splike.com/howtos/xxe_forrest.html">XXE 
-            Forrest Config</a> files from splike.com; this also add support for WYSIWYG 
-            editing of forrest documents.
-            Note: This configuration suite has recently been added to the
-            Forrest scratchpad.
-            </p>
+<p>
+            XXE supports catalogs by automatic detection via configuration
+            files. Download the
+            <a target="_blank" href="http://www.splike.com/howtos/xxe_forrest.html">XXE
+            Forrest Config</a> files from splike.com; this also add support
+            for WYSIWYG editing of forrest documents. Note: This configuration
+            suite has recently been added to the Forrest scratchpad.
+          </p>
 </div>
-
     
 <a name="N100E9"></a><a name="info"></a>
 <h2 class="underlined_10">Further information and resources</h2>
@@ -561,24 +570,23 @@
 <p>
         Forrest and Cocoon use the
         <a href="http://xml.apache.org/commons/components/resolver/">Catalog
-        Entity Resolver</a>
-        that is provided by the
+        Entity Resolver</a> that is provided by the
         <a href="http://xml.apache.org/commons/">Apache XML Commons</a>
         project. The resolver is packaged with the Forrest distribution at
         <span class="codefrag">lib/core/xml-commons-resolver-x.y.jar</span>
       
 </p>
 <p>
-        Other Forrest documentation has some notes about configuring the
-        entity resolver for your own DTDs. See
-        <a href="../docs_0_70/validation.html">XML Validation</a>.
+        Other Forrest documentation has some notes about configuring the entity
+        resolver for your own DTDs. See <a href="../docs_0_70/validation.html">XML
+        Validation</a>.
       </p>
 <p>
         Cocoon has extensive documentation about the entity resolver. See
         <a href="http://cocoon.apache.org/2.1/userdocs/concepts/catalog.html">Entity resolution with catalogs</a>.
       </p>
 </div>
-
+  
 </div>
 <!--+
     |end content

Modified: forrest/site/docs_0_70/catalog.pdf
URL: http://svn.apache.org/viewvc/forrest/site/docs_0_70/catalog.pdf?view=diff&rev=529915&r1=529914&r2=529915
==============================================================================
Binary files - no diff available.