- Update to 0.8

6 files changed, 740 insertions, 441 deletions

diff --git a/www/apache-forrest/Makefile b/www/apache-forrest/Makefile
index e142844b6700..5fb2241e60a0 100644
--- a/www/apache-forrest/Makefile
+++ b/www/apache-forrest/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		apache-forrest
-PORTVERSION=		0.7
+PORTVERSION=		0.8
 CATEGORIES=		www java
 MASTER_SITES=		${MASTER_SITE_APACHE} \
 			http://mirror.tomato.it/apache/forrest/ \
diff --git a/www/apache-forrest/distinfo b/www/apache-forrest/distinfo
index 6ee80e8f2621..86e49b896121 100644
--- a/www/apache-forrest/distinfo
+++ b/www/apache-forrest/distinfo
@@ -1,3 +1,3 @@
-MD5 (apache-forrest-0.7.tar.gz) = ec83eb26a2bd39a3577ae1d9debd2a64
-SHA256 (apache-forrest-0.7.tar.gz) = df8547983af4a04877764f7f12fb1c937a6b4878deb320c8c05edc27ad73a379
-SIZE (apache-forrest-0.7.tar.gz) = 21917527
+MD5 (apache-forrest-0.8.tar.gz) = 56799bac54f79cd26a8ba29b10904259
+SHA256 (apache-forrest-0.8.tar.gz) = 7ca01a274e222f5720533d44c1500c4b6bf6d8c3f678835f3f337251c2f747a7
+SIZE (apache-forrest-0.8.tar.gz) = 23244435
diff --git a/www/apache-forrest/files/patch-bin-forrest b/www/apache-forrest/files/patch-bin-forrest
index 346910c781f0..e45dd4e7aead 100644
--- a/www/apache-forrest/files/patch-bin-forrest
+++ b/www/apache-forrest/files/patch-bin-forrest
@@ -1,7 +1,6 @@
 $FreeBSD$
-
---- bin/forrest	Sun Jun 19 11:54:14 2005
-+++ bin/forrest.port	Thu Jun 30 14:16:09 2005
+--- bin/forrest	Tue Apr 10 18:17:55 2007
++++ bin/forrest.port	Mon Apr 16 14:24:52 2007
 @@ -20,6 +20,7 @@
  
  cygwin=false;
@@ -15,34 +14,34 @@ $FreeBSD$
             fi
             ;;
 +  FreeBSD*) freebsd=true
-+	    if [ -z "$JAVA_HOME" ] ; then
-+		JAVA_HOME=%%JAVA_HOME%%
-+	    fi
-+	    ;;
++	   if [ -z "$JAVA_HOME" ]; then
++	     JAVA_HOME=%%JAVA_HOME%%
++	   fi
++	   ;;
  esac
-+export JAVA_HOME;
++export JAVA_HOME
  
  if [ "$cygwin" = "true" ] ; then
    PROJECT_HOME=`cygpath -w "$PWD"`
-@@ -72,6 +79,12 @@
-   FORREST_DOT_HOME=$FORREST_HOME
+@@ -35,6 +42,12 @@
+   PROJECT_HOME=`pwd`
  fi
  
 +if [ -z "$DISPLAY" ]; then
-+	JAVA_AWT_HEADLESS="-Dforrest.jvmargs=-Djava.awt.headless=true"
++       JAVA_AWT_HEADLESS="-Dforrest.jvmargs=-Djava.awt.headless=true"
 +else
-+	JAVA_AWT_HEADLESS=''
++       JAVA_AWT_HEADLESS=''
 +fi
 +
- # set the ant file to use
- ANTFILE="$FORREST_DOT_HOME/main/forrest.build.xml"
+ if [ -z "$FORREST_HOME" ] ; then
+   # use the location of this script to infer $FORREST_HOME
  
-@@ -94,7 +107,7 @@
+@@ -97,7 +110,7 @@
  echo "Apache Forrest.  Run 'forrest -projecthelp' to list options"
  echo
  export FORREST_HOME
--"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -emacs $@
-+"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" ${JAVA_AWT_HEADLESS} -emacs $@
+-"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" -emacs "$@"
++"$ANT_HOME/bin/ant" --noconfig -buildfile "$ANTFILE" -Dbasedir="$PROJECT_HOME" ${JAVA_AWT_HEADLESS} -emacs "$@"
  RESULT=$?
  
  # ---- Restore Classpath
diff --git a/www/apache-forrest/files/patch-tools-ant-bin-ant b/www/apache-forrest/files/patch-tools-ant-bin-ant
index c265a817dd0c..83c03aac0392 100644
--- a/www/apache-forrest/files/patch-tools-ant-bin-ant
+++ b/www/apache-forrest/files/patch-tools-ant-bin-ant
@@ -1,7 +1,6 @@
 $FreeBSD$
-
---- tools/ant/bin/ant	Sun Jun 19 11:54:04 2005
-+++ tools/ant/bin/ant.port	Tue Jul  5 13:53:37 2005
+--- tools/ant/bin/ant	Tue Apr 10 18:18:14 2007
++++ tools/ant/bin/ant.port	Mon Apr 16 14:27:19 2007
 @@ -78,6 +78,7 @@
  # OS specific support.  $var _must_ be set to either true or false.
  cygwin=false;
@@ -22,5 +21,5 @@ $FreeBSD$
  esac
 +export JAVA_HOME
  
- if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
-   # try to find ANT
+ # Forrest uses its own packaged Ant, so don't use the system Ant libraries
+ #if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
diff --git a/www/apache-forrest/pkg-message b/www/apache-forrest/pkg-message
index fc63240f6688..5657f89825db 100644
--- a/www/apache-forrest/pkg-message
+++ b/www/apache-forrest/pkg-message
@@ -11,10 +11,10 @@
 
       1)  $ mkdir mysite; cd mysite
       2)  $ forrest seed
-      3)  $ forrest
-      4)  see results in ./build/site/index.html with your web browser
+      3)  $ forrest run
+      4)  point your web browser to http://localhost:8888
 
-  To avoid any issue with old classes being loaded, run a 'forrest clean'
+  To avoid any issue with old classes being loaded, run a 'forrest clean-work'
   in your project directory, after you upgraded to this version (%%PORTVERSION%%)
 
 *************************************************************************
diff --git a/www/apache-forrest/pkg-plist b/www/apache-forrest/pkg-plist
index d68aa41eab54..42263d13204b 100644
--- a/www/apache-forrest/pkg-plist
+++ b/www/apache-forrest/pkg-plist
@@ -1,164 +1,217 @@
 @comment $FreeBSD$
 bin/forrest
+%%DATADIR%%/README.txt
 %%DATADIR%%/bin/forrest
-%%DATADIR%%/build/xml-forrest.jar
+%%DATADIR%%/build/plugins/catalog.xcat
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/build.xml
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/forrest.properties
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/favicon.ico
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/group-logo.gif
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/usemap.gif
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project.svg
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project-logo.gif
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/group.svg
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/icon.png
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/favicon.ico
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/tabs.xml
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project-logo.gif
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project.svg
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/usemap.gif
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml
+%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/tabs.xml
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml
-%%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/forrest.properties
 %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/status.xml
-%%DATADIR%%/build/plugins/catalog.xcat
-%%DATADIR%%/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
+%%DATADIR%%/build/xml-forrest.jar
+%%DATADIR%%/etc/README.txt
+%%DATADIR%%/etc/RELEASE-NOTES-0.8.txt
 %%DATADIR%%/etc/cocoon_upgrade/README.txt
-%%DATADIR%%/etc/cocoon_upgrade/blocks.properties
-%%DATADIR%%/etc/cocoon_upgrade/build.properties
+%%DATADIR%%/etc/cocoon_upgrade/build.sh
 %%DATADIR%%/etc/cocoon_upgrade/build.xml
 %%DATADIR%%/etc/cocoon_upgrade/local.blocks.properties
 %%DATADIR%%/etc/cocoon_upgrade/local.build.properties
 %%DATADIR%%/etc/cocoon_upgrade/upgrade-cocoon-xconf.xsl
-%%DATADIR%%/etc/README.txt
-%%DATADIR%%/etc/RELEASE-NOTES-0.7.txt
-%%DATADIR%%/etc/RELEASE_PROCESS.txt
-%%DATADIR%%/etc/announcement-0.7.txt
 %%DATADIR%%/etc/docs-review.txt
 %%DATADIR%%/etc/new-skinconf-forrest-site.xml
 %%DATADIR%%/etc/publishing_our_site.txt
 %%DATADIR%%/etc/relicense-jars.txt
 %%DATADIR%%/etc/relicense-tree.txt
 %%DATADIR%%/etc/relicense.txt
-%%DATADIR%%/lib/core/avalon-framework-api-4.1.5.jar
-%%DATADIR%%/lib/core/avalon-framework-impl-4.1.5.jar
-%%DATADIR%%/lib/core/batik-all-1.5.1.jar
+%%DATADIR%%/etc/test-whitespace/AbstractWrappingModule.java
+%%DATADIR%%/etc/test-whitespace/AbstractWrappingModule.java.jalopy
+%%DATADIR%%/etc/test-whitespace/XPathTransformer.java
+%%DATADIR%%/etc/test-whitespace/XPathTransformer.java.jalopy
+%%DATADIR%%/etc/test-whitespace/content-include-html.ft
+%%DATADIR%%/etc/test-whitespace/html2document.xsl
+%%DATADIR%%/etc/test-whitespace/html2document.xsl.tidy
+%%DATADIR%%/etc/test-whitespace/test-1.xml
+%%DATADIR%%/etc/tidy-config.txt
+%%DATADIR%%/etc/tidy-xml.pl
+%%DATADIR%%/etc/whitespace-cleanup.txt
+%%DATADIR%%/etc/xmlformat.conf
+%%DATADIR%%/index.html
+%%DATADIR%%/lib/README.txt
+%%DATADIR%%/lib/core/LICENSE-prototype.txt
+%%DATADIR%%/lib/core/avalon-framework-api-4.3.jar
+%%DATADIR%%/lib/core/avalon-framework-impl-4.3.jar
+%%DATADIR%%/lib/core/avalon-logkit-2.1.jar
+%%DATADIR%%/lib/core/batik-all-1.6.jar
 %%DATADIR%%/lib/core/castor-0.9.6-xml.jar
 %%DATADIR%%/lib/core/chaperon-20040205.jar
-%%DATADIR%%/lib/core/cocoon-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-asciiart-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-batik-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-chaperon-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-fop-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-html-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/ehcache-1.1.jar
-%%DATADIR%%/lib/core/cocoon-linkrewriter-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-lucene-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-profiler-block-2.2.0-dev-r125082.jar
-%%DATADIR%%/lib/core/cocoon-xsp-block-2.2.0-dev-r125082.jar
+%%DATADIR%%/lib/core/cocoon-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-asciiart-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-batik-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-chaperon-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-fop-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-html-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-linkrewriter-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-lucene-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-profiler-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-template-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-validation-block-2.2.0-dev.jar
+%%DATADIR%%/lib/core/cocoon-xsp-block-2.2.0-dev.jar
 %%DATADIR%%/lib/core/commons-cli-1.0.jar
 %%DATADIR%%/lib/core/commons-collections-3.1.jar
 %%DATADIR%%/lib/core/commons-httpclient-2.0.2.jar
-%%DATADIR%%/lib/core/commons-jci-r159148.jar
+%%DATADIR%%/lib/core/commons-jci-r306555.jar
 %%DATADIR%%/lib/core/commons-jexl-1.0.jar
-%%DATADIR%%/lib/core/commons-jxpath-20030909.jar
-%%DATADIR%%/lib/core/commons-lang-2.0-20041007T2305.jar
+%%DATADIR%%/lib/core/commons-jxpath-1.2-r329470.jar
+%%DATADIR%%/lib/core/commons-lang-2.1.jar
 %%DATADIR%%/lib/core/commons-logging-1.0.4.jar
+%%DATADIR%%/lib/core/concurrent-1.3.4.jar
+%%DATADIR%%/lib/core/ehcache-1.2.jar
 %%DATADIR%%/lib/core/excalibur-i18n-1.1.jar
-%%DATADIR%%/lib/core/excalibur-instrument-1.0.jar
+%%DATADIR%%/lib/core/excalibur-instrument-api-2.1.jar
 %%DATADIR%%/lib/core/excalibur-io-1.1.jar
-%%DATADIR%%/lib/core/excalibur-logger-1.1.jar
+%%DATADIR%%/lib/core/excalibur-logger-2.1.jar
 %%DATADIR%%/lib/core/excalibur-naming-1.0.jar
-%%DATADIR%%/lib/core/excalibur-pool-api-2.0.0.jar
-%%DATADIR%%/lib/core/excalibur-pool-impl-2.0.0.jar
-%%DATADIR%%/lib/core/excalibur-pool-instrumented-2.0.0.jar
-%%DATADIR%%/lib/core/excalibur-sourceresolve-1.1.jar
-%%DATADIR%%/lib/core/excalibur-store-1.0.jar
-%%DATADIR%%/lib/core/excalibur-xmlutil-1.0.jar
+%%DATADIR%%/lib/core/excalibur-pool-api-2.1.jar
+%%DATADIR%%/lib/core/excalibur-pool-impl-2.1.jar
+%%DATADIR%%/lib/core/excalibur-pool-instrumented-2.1.jar
+%%DATADIR%%/lib/core/excalibur-sourceresolve-2.1.jar
+%%DATADIR%%/lib/core/excalibur-store-2.1.jar
+%%DATADIR%%/lib/core/excalibur-xmlutil-2.1.jar
 %%DATADIR%%/lib/core/fop-0.20.5.jar
 %%DATADIR%%/lib/core/jcs-1.2.5-dev-20050313.jar
 %%DATADIR%%/lib/core/jing-20030619.jar
 %%DATADIR%%/lib/core/jtidy-04aug2000r7-dev.jar
-%%DATADIR%%/lib/core/log4j-1.2.9.jar
+%%DATADIR%%/lib/core/log4j-1.2.13.jar
 %%DATADIR%%/lib/core/logkit-1.2.2.jar
 %%DATADIR%%/lib/core/lucene-1.4.3.jar
 %%DATADIR%%/lib/core/nekopull-0.2.4.jar
 %%DATADIR%%/lib/core/oreilly.codepolicy.txt
 %%DATADIR%%/lib/core/oreilly.permission.txt
-%%DATADIR%%/lib/core/rhino-1.6R1.jar
-%%DATADIR%%/lib/core/util.concurrent-1.3.4.jar
+%%DATADIR%%/lib/core/rhino-1.6R2.jar
 %%DATADIR%%/lib/core/w3c-dtd-license.txt
-%%DATADIR%%/lib/core/xml-commons-resolver-1.1.jar
+%%DATADIR%%/lib/core/xml-commons-resolver-1.2-dev-r395116.jar
 %%DATADIR%%/lib/core/xmlbeans-1.0.3.jar
 %%DATADIR%%/lib/endorsed/jakarta-bcel-20040329.jar
-%%DATADIR%%/lib/endorsed/jakarta-regexp-1.3.jar
-%%DATADIR%%/lib/endorsed/xalan-2.6.1-dev-20041008T0304.jar
-%%DATADIR%%/lib/endorsed/xercesImpl-2.6.2.jar
-%%DATADIR%%/lib/endorsed/xml-apis.jar
+%%DATADIR%%/lib/endorsed/jakarta-regexp-1.4.jar
+%%DATADIR%%/lib/endorsed/xalan-2.7.0.jar
+%%DATADIR%%/lib/endorsed/xercesImpl-2.8.0.jar
+%%DATADIR%%/lib/endorsed/xml-apis-1.3.03.jar
 %%DATADIR%%/lib/optional/README.txt
+%%DATADIR%%/main/build.sh
+%%DATADIR%%/main/build.xml
+%%DATADIR%%/main/forrest.antproxy.xml
+%%DATADIR%%/main/forrest.build.xml
+%%DATADIR%%/main/fresh-site/forrest.properties
+%%DATADIR%%/main/fresh-site/forrest.properties.dispatcher.properties
+%%DATADIR%%/main/fresh-site/forrest.properties.xml
+%%DATADIR%%/main/fresh-site/src/documentation/README.txt
 %%DATADIR%%/main/fresh-site/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/main/fresh-site/src/documentation/content/locationmap.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/test1.html
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/favicon.ico
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/hello.pdf
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/group-logo.gif
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/group.svg
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/icon.png
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/icon-e.png
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/project-logo.gif
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/project.svg
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images/usemap.gif
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/book-sample.xml
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/hello.zip
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/index.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/ascii-art.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/cocoon-pyramid.aart
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/custom.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/customSchema.xml
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/document-v13.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.de.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.fr.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.nl.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/demo-i18n.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/ellipse.svg
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/embedded_html.html
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/faq.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/hello-v10.dtd
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/helloAgain.pdf
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/howto-howto.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/i18n.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/icon-d.png
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/index.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/linking.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/locationmap/index.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/sample.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/showonlywhenselected/page1.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/showonlywhenselected/page2.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/static.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/book-sample.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/hello.zip
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir/index.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/svg.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/usemap.xml
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/hello.pdf
-%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/index.xml
+%%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/xml-entities.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/site.xml
 %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/tabs.xml
-%%DATADIR%%/main/fresh-site/src/documentation/content/test1.html
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/ellipse-2.svg
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/icon-a.png
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/icon-b.png
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/icon.png
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/project-logo.png
+%%DATADIR%%/main/fresh-site/src/documentation/resources/images/sub-dir/icon-c.png
 %%DATADIR%%/main/fresh-site/src/documentation/resources/schema/catalog.xcat
 %%DATADIR%%/main/fresh-site/src/documentation/resources/schema/hello-v10.dtd
+%%DATADIR%%/main/fresh-site/src/documentation/resources/schema/symbols-project-v10.ent
 %%DATADIR%%/main/fresh-site/src/documentation/resources/stylesheets/hello2document.xsl
+%%DATADIR%%/main/fresh-site/src/documentation/sitemap.xmap
+%%DATADIR%%/main/fresh-site/src/documentation/skinconf.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/langcode.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/languages_de.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/languages_en.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/languages_es.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/languages_fr.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/languages_nl.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_af.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_de.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_es.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/menu_fr.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_it.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/menu_nl.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_no.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_ru.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/menu_sk.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/tabs.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/tabs_de.xml
 %%DATADIR%%/main/fresh-site/src/documentation/translations/tabs_es.xml
-%%DATADIR%%/main/fresh-site/src/documentation/README.txt
-%%DATADIR%%/main/fresh-site/src/documentation/sitemap.xmap
-%%DATADIR%%/main/fresh-site/src/documentation/skinconf.xml
-%%DATADIR%%/main/fresh-site/forrest.properties
-%%DATADIR%%/main/java/org/apache/cocoon/components/source/impl/ZipSource.java
-%%DATADIR%%/main/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java
+%%DATADIR%%/main/fresh-site/src/documentation/translations/tabs_fr.xml
+%%DATADIR%%/main/fresh-site/src/documentation/translations/tabs_nl.xml
 %%DATADIR%%/main/java/org/apache/forrest/conf/AntProperties.java
 %%DATADIR%%/main/java/org/apache/forrest/conf/AntPropertiesModule.java
 %%DATADIR%%/main/java/org/apache/forrest/conf/ForrestConfModule.java
 %%DATADIR%%/main/java/org/apache/forrest/conf/ForrestConfUtils.java
 %%DATADIR%%/main/java/org/apache/forrest/conf/SkinconfTransformer.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/LocationMapModule.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/AbstractNode.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/ActNode.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/LocationMap.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/LocationNode.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/LocatorNode.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/MatchNode.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/MountNode.java
 %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm/SelectNode.java
-%%DATADIR%%/main/java/org/apache/forrest/locationmap/AbstractWrappingModule.java
-%%DATADIR%%/main/java/org/apache/forrest/locationmap/LocationMapModule.java
-%%DATADIR%%/main/java/org/apache/forrest/locationmap/RegexpLocationMapMatcher.java
-%%DATADIR%%/main/java/org/apache/forrest/locationmap/WildcardLocationMapHintMatcher.java
-%%DATADIR%%/main/java/org/apache/forrest/locationmap/WildcardLocationMapMatcher.java
+%%DATADIR%%/main/java/org/apache/forrest/locationmap/source/impl/LocationmapSourceFactory.java
 %%DATADIR%%/main/java/org/apache/forrest/log/ForrestLogTargetFactory.java
 %%DATADIR%%/main/java/org/apache/forrest/sourceexists/SourceExistsSelector.java
 %%DATADIR%%/main/java/org/apache/forrest/sourcetype/DocDeclRule.java
@@ -172,37 +225,147 @@ bin/forrest
 %%DATADIR%%/main/java/org/apache/forrest/util/IdGeneratorTransformer.java
 %%DATADIR%%/main/java/org/apache/forrest/util/XPathTransformer.java
 %%DATADIR%%/main/java/org/apache/forrest/xni/XNIConfigurableFileGenerator.java
+%%DATADIR%%/main/module.xml
 %%DATADIR%%/main/targets/context.xml
 %%DATADIR%%/main/targets/plugins.xml
+%%DATADIR%%/main/targets/seed.xml
 %%DATADIR%%/main/targets/site.xml
 %%DATADIR%%/main/targets/skins.xml
 %%DATADIR%%/main/targets/validate.xml
 %%DATADIR%%/main/targets/webapp.xml
 %%DATADIR%%/main/tasks/org/apache/forrest/UncopiedFileSelector.java
+%%DATADIR%%/main/template-sites/basic/forrest.properties
+%%DATADIR%%/main/template-sites/basic/forrest.properties.xml
+%%DATADIR%%/main/template-sites/basic/src/documentation/README.txt
+%%DATADIR%%/main/template-sites/basic/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/locationmap.xml
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/group-logo.gif
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/group.svg
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/icon.png
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/project-logo.gif
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/project.svg
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images/usemap.gif
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/index.xml
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/site.xml
+%%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/tabs.xml
+%%DATADIR%%/main/template-sites/basic/src/documentation/resources/schema/catalog.xcat
+%%DATADIR%%/main/template-sites/basic/src/documentation/sitemap.xmap
+%%DATADIR%%/main/template-sites/basic/src/documentation/skinconf.xml
+%%DATADIR%%/main/template-sites/benchmark/forrest.properties
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/README.txt
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/locationmap.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/group-logo.gif
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/group.svg
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/icon.png
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/project-logo.gif
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/project.svg
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images/usemap.gif
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/index.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/link-simple.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/link-site.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/plain.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/site.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/tabs.xml
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/resources/schema/catalog.xcat
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/sitemap.xmap
+%%DATADIR%%/main/template-sites/benchmark/src/documentation/skinconf.xml
+%%DATADIR%%/main/template-sites/business/forrest.properties
+%%DATADIR%%/main/template-sites/business/src/documentation/README.txt
+%%DATADIR%%/main/template-sites/business/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/main/template-sites/business/src/documentation/content/locationmap.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/about/index.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/group-logo.gif
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/group.svg
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/icon.png
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/project-logo.gif
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/project.svg
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images/usemap.gif
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/index.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/product/index.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/site.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/tabs.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/team/index.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/team/resume/blogsJane.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/team/resume/blogsJoe.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/resources/schema/catalog.xcat
+%%DATADIR%%/main/template-sites/business/src/documentation/resources/schema/hello-v10.dtd
+%%DATADIR%%/main/template-sites/business/src/documentation/skinconf.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/langcode.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/languages_en.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/languages_es.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_af.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_de.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_es.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_it.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_no.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_ru.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/menu_sk.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/tabs.xml
+%%DATADIR%%/main/template-sites/business/src/documentation/translations/tabs_es.xml
 %%DATADIR%%/main/var/catalogMountSnippet.xsl
 %%DATADIR%%/main/var/echo-settings-message.txt
 %%DATADIR%%/main/var/full.cvsignore
 %%DATADIR%%/main/var/initial_catalog.xcat
+%%DATADIR%%/main/var/initial_plugins_locationmap.xml
 %%DATADIR%%/main/var/initial_plugins_sitemap.xmap
+%%DATADIR%%/main/var/pluginLmMountSnippet.xsl
 %%DATADIR%%/main/var/pluginMountSnippet.xsl
 %%DATADIR%%/main/var/pluginlist2echo.xsl
 %%DATADIR%%/main/var/pluginlist2fetch.xsl
+%%DATADIR%%/main/var/plugins.xconf
 %%DATADIR%%/main/var/skin-not-found-message.txt
 %%DATADIR%%/main/var/skinlist2echo.xsl
 %%DATADIR%%/main/var/skinlist2fetch.xsl
-%%DATADIR%%/main/var/template-project-created-message.txt
+%%DATADIR%%/main/var/template-project-created-message-basic.txt
+%%DATADIR%%/main/var/template-project-created-message-sample.txt
 %%DATADIR%%/main/var/webapp-generated-message.txt
 %%DATADIR%%/main/var/webapp-local-generated-message.txt
-%%DATADIR%%/main/webapp/WEB-INF/classes/org/apache/cocoon/util/mime.types
 %%DATADIR%%/main/webapp/WEB-INF/classes/log4j.properties
-%%DATADIR%%/main/webapp/WEB-INF/xconf/forrest-core.xconf
+%%DATADIR%%/main/webapp/WEB-INF/classes/org/apache/cocoon/util/mime.types
 %%DATADIR%%/main/webapp/WEB-INF/cli.xconf
 %%DATADIR%%/main/webapp/WEB-INF/cocoon.xconf
 %%DATADIR%%/main/webapp/WEB-INF/jtidy.properties
 %%DATADIR%%/main/webapp/WEB-INF/logkit.xconf
+%%DATADIR%%/main/webapp/WEB-INF/properties/core.properties
+%%DATADIR%%/main/webapp/WEB-INF/properties/dev/core.properties
+%%DATADIR%%/main/webapp/WEB-INF/properties/prod/core.properties
 %%DATADIR%%/main/webapp/WEB-INF/web.xml
+%%DATADIR%%/main/webapp/WEB-INF/xconf/forrest-core-webapp.xconf
+%%DATADIR%%/main/webapp/WEB-INF/xconf/forrest-core.xconf
+%%DATADIR%%/main/webapp/aggregate.xmap
+%%DATADIR%%/main/webapp/default-forrest.properties
+%%DATADIR%%/main/webapp/faq.xmap
+%%DATADIR%%/main/webapp/forrest.xmap
+%%DATADIR%%/main/webapp/i18n.xmap
+%%DATADIR%%/main/webapp/jettyconf.xml
+%%DATADIR%%/main/webapp/linkmap.xmap
+%%DATADIR%%/main/webapp/locationmap-chaperon.xml
+%%DATADIR%%/main/webapp/locationmap-i18n.xml
+%%DATADIR%%/main/webapp/locationmap-plugin.xml
+%%DATADIR%%/main/webapp/locationmap-skinconf.xml
+%%DATADIR%%/main/webapp/locationmap-skins.xml
+%%DATADIR%%/main/webapp/locationmap-transforms.xml
+%%DATADIR%%/main/webapp/locationmap.xml
+%%DATADIR%%/main/webapp/menu.xmap
+%%DATADIR%%/main/webapp/plugins.xmap
+%%DATADIR%%/main/webapp/profiler.xmap
+%%DATADIR%%/main/webapp/raw.xmap
 %%DATADIR%%/main/webapp/resources/chaperon/grammars/link.xlex
 %%DATADIR%%/main/webapp/resources/chaperon/stylesheets/pattern2link.xsl
+%%DATADIR%%/main/webapp/resources/schema/README.txt
+%%DATADIR%%/main/webapp/resources/schema/catalog
+%%DATADIR%%/main/webapp/resources/schema/catalog.forrest
+%%DATADIR%%/main/webapp/resources/schema/catalog.forrest.xcat
+%%DATADIR%%/main/webapp/resources/schema/catalog.xcat
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/calstblx.dtd
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbcentx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbgenent.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbhierx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbnotnx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbpoolx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/docbookx.dtd
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-amsa.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-amsb.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-amsc.ent
@@ -222,14 +385,18 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-num.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-pub.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/ent/iso-tech.ent
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/calstblx.dtd
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbcentx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbgenent.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbhierx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbnotnx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/dbpoolx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/docbookx.dtd
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.1.2/soextblx.dtd
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ChangeLog
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/README
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/calstblx.dtd
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/catalog.xml
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbcentx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbgenent.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbhierx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbnotnx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbpoolx.mod
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/docbook.cat
+%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/docbookx.dtd
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-amsa.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-amsb.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-amsc.ent
@@ -249,31 +416,9 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-num.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-pub.ent
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ent/iso-tech.ent
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/ChangeLog
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/README
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/calstblx.dtd
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/catalog.xml
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbcentx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbgenent.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbhierx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbnotnx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/dbpoolx.mod
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/docbook.cat
-%%DATADIR%%/main/webapp/resources/schema/docbook/4.2/docbookx.dtd
 %%DATADIR%%/main/webapp/resources/schema/docbook/4.2/soextblx.dtd
 %%DATADIR%%/main/webapp/resources/schema/docbook/catalog
 %%DATADIR%%/main/webapp/resources/schema/docbook/catalog.xcat
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/README.txt
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/changes-v10.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/characters.ent
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/document-v10.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/faq-v10.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v10/todo-v10.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/STATUS.txt
-%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/document-v20.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/document-v20.mod
-%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/faq-v20.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/faq-v20.mod
 %%DATADIR%%/main/webapp/resources/schema/dtd/.htaccess
 %%DATADIR%%/main/webapp/resources/schema/dtd/book-cocoon-v10.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/changes-v11.dtd
@@ -311,9 +456,10 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/dtd/skinconfig-v06-2.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/skinconfig-v06-3.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/skinconfig-v06.dtd
-%%DATADIR%%/main/webapp/resources/schema/dtd/status-v13.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/skinconfig-v07-1.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/skinconfig-v08-1.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/specification-v11.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/status-v13.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/status-v13.mod
 %%DATADIR%%/main/webapp/resources/schema/dtd/tab-cocoon-v10.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/tab-cocoon-v11.dtd
@@ -323,6 +469,17 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/dtd/todo-v13.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/todo-v20.dtd
 %%DATADIR%%/main/webapp/resources/schema/dtd/todo-v20.mod
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/README.txt
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/changes-v10.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/characters.ent
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/document-v10.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/faq-v10.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v10/todo-v10.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/STATUS.txt
+%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/document-v20.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/document-v20.mod
+%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/faq-v20.dtd
+%%DATADIR%%/main/webapp/resources/schema/dtd/v20a/faq-v20.mod
 %%DATADIR%%/main/webapp/resources/schema/dtd/xgump-draft.dtd
 %%DATADIR%%/main/webapp/resources/schema/entity/.htaccess
 %%DATADIR%%/main/webapp/resources/schema/entity/ISOdia.pen
@@ -332,19 +489,54 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/entity/ISOpub.pen
 %%DATADIR%%/main/webapp/resources/schema/entity/ISOtech.pen
 %%DATADIR%%/main/webapp/resources/schema/entity/index.html
+%%DATADIR%%/main/webapp/resources/schema/entity/skinconf-common-plugins-07-1.xml
+%%DATADIR%%/main/webapp/resources/schema/entity/symbols-core-v10.ent
 %%DATADIR%%/main/webapp/resources/schema/open-office/catalog
 %%DATADIR%%/main/webapp/resources/schema/open-office/catalog.xcat
 %%DATADIR%%/main/webapp/resources/schema/open-office/dummy.dtd
-%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/any.rng
-%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/any.rnx
-%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/forrestbot.rng
-%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/forrestbot.rnx
 %%DATADIR%%/main/webapp/resources/schema/relaxng/README.txt
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/README.txt
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/XMLSchema-instance.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/copyright-software-20021231.html
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/full-ruby-1.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/ruby-1.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-attribs-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-bidi-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-caption-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-core-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-datatypes-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-document-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-edit-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-embed-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-events-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-handler-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-hypertext-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-hypertext-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-i18n-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-imagemap-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-inlstyle-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-list-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-meta-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-meta-attrib-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-object-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-param-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-script-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-structural-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-style-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-table-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml-text-2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2-forrest.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xhtml2.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527/xml-events-1.rng
 %%DATADIR%%/main/webapp/resources/schema/relaxng/book-v01.rng
 %%DATADIR%%/main/webapp/resources/schema/relaxng/document-v20.mod.rng
 %%DATADIR%%/main/webapp/resources/schema/relaxng/document-v20.rng
 %%DATADIR%%/main/webapp/resources/schema/relaxng/sitemap-v06.rng
 %%DATADIR%%/main/webapp/resources/schema/relaxng/skinconf.rnc
+%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/any.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/any.rnx
+%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/forrestbot.rng
+%%DATADIR%%/main/webapp/resources/schema/relaxng/unstable/forrestbot.rnx
 %%DATADIR%%/main/webapp/resources/schema/relaxng/xslt.rng
 %%DATADIR%%/main/webapp/resources/schema/sdocbook/1.0/sdbcent.mod
 %%DATADIR%%/main/webapp/resources/schema/sdocbook/1.0/sdbhier.mod
@@ -372,58 +564,92 @@ bin/forrest
 %%DATADIR%%/main/webapp/resources/schema/w3c-dtd/xhtml1-strict.dtd
 %%DATADIR%%/main/webapp/resources/schema/w3c-dtd/xhtml1-transitional.dtd
 %%DATADIR%%/main/webapp/resources/schema/w3c-dtd/xhtml1.dcl
-%%DATADIR%%/main/webapp/resources/schema/README.txt
-%%DATADIR%%/main/webapp/resources/schema/catalog
-%%DATADIR%%/main/webapp/resources/schema/catalog.forrest
-%%DATADIR%%/main/webapp/resources/schema/catalog.forrest.xcat
-%%DATADIR%%/main/webapp/resources/schema/catalog.xcat
-%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/book2cinclude.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/doc2doc-uniqueids.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/docs2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/external/str.find-last.xslt
-%%DATADIR%%/main/webapp/resources/stylesheets/search/book2cinclude-lucene.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/search/document2lucene.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/search/lucene-update2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/search/search2document.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/absolutize-linkmap.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/any2document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/book-to-cinclude.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/doc-to-doc-uniqueids.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/docs-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/aggregates/relativize-split-linkmap.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/any-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/book-to-book-i18n.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/book-to-cinclude-lucene.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/bookv10.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/changesv10tochangesv11.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/changesv10-to-changesv11.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/copyover.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/declare-broken-site-links.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/directory2book.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/directory2i18n.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/directory2revisions.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/docv10todocv11.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/docv20todocv12.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/docv20todocv13.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/directory-to-book.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/directory-to-i18n.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/directory-to-revisions.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/docv10-to-docv11.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/docv20-to-docv12.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/docv20-to-docv13.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/dotdots.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/exception-to-html.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/external/str.find-last.xslt
 %%DATADIR%%/main/webapp/resources/stylesheets/extract-svg.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/faq2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/faqv10tofaqv11.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/faqv20tofaqv12.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/faqv20tofaqv13.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/howto2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/html2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/html2htmlbody.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/i18n.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/linkmap2document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/faq-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/faqv10-to-faqv11.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/faqv20-to-faqv12.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/faqv20-to-faqv13.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/generateId.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/howto-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/html-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/html-to-htmlbody.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/linkmap-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/lucene-search-to-xdoc.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/lucene-update-to-xdoc.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/normalizehrefs.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/page2html.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/plugins2xdoc.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/profile2page.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/page-to-html.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/pathutils.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/pluginBuildFiles-to-pluginDescriptor.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/plugins-to-xdoc.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/profile-to-html.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/profile-to-page.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/project-to-text.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/project2text.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/projectnavigation2site.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/projectnavigation-to-site.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/relativize-linkmap.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/rss2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/rssissues2document.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/site2book.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/site2site-normalizetabs.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/site2site-selectnode.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/replaceCharsInString.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/rss-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/rssissues-to-document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/site-to-book.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/site-to-site-normalizetabs.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/site-to-site-selectnode.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/strip-doctype.xsl
-%%DATADIR%%/main/webapp/resources/stylesheets/text2document.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/strip-i18n-remains.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/text-to-document.xsl
 %%DATADIR%%/main/webapp/resources/stylesheets/upgrade-skinconf.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/xdoc-to-lucene.xsl
+%%DATADIR%%/main/webapp/resources/stylesheets/xml-to-pretty.xsl
+%%DATADIR%%/main/webapp/resources.xmap
+%%DATADIR%%/main/webapp/revisions.xmap
+%%DATADIR%%/main/webapp/search.xmap
+%%DATADIR%%/main/webapp/sitemap.xmap
+%%DATADIR%%/main/webapp/skins/README.txt
+%%DATADIR%%/main/webapp/skins/coat/css/basic.css
+%%DATADIR%%/main/webapp/skins/coat/css/print.css
+%%DATADIR%%/main/webapp/skins/coat/css/profile.css.xslt
+%%DATADIR%%/main/webapp/skins/coat/css/screen.css
+%%DATADIR%%/main/webapp/skins/coat/images/chapter.gif
+%%DATADIR%%/main/webapp/skins/coat/images/chapter_open.gif
+%%DATADIR%%/main/webapp/skins/coat/images/current.gif
+%%DATADIR%%/main/webapp/skins/coat/images/error.png
+%%DATADIR%%/main/webapp/skins/coat/images/header_white_line.gif
+%%DATADIR%%/main/webapp/skins/coat/images/info.png
+%%DATADIR%%/main/webapp/skins/coat/images/instruction_arrow.png
+%%DATADIR%%/main/webapp/skins/coat/images/label.gif
+%%DATADIR%%/main/webapp/skins/coat/images/page.gif
+%%DATADIR%%/main/webapp/skins/coat/images/pdfdoc.gif
+%%DATADIR%%/main/webapp/skins/coat/images/printer.gif
+%%DATADIR%%/main/webapp/skins/coat/images/success.png
+%%DATADIR%%/main/webapp/skins/coat/images/warning.png
+%%DATADIR%%/main/webapp/skins/coat/images/xmldoc.gif
+%%DATADIR%%/main/webapp/skins/coat/note.txt
+%%DATADIR%%/main/webapp/skins/coat/skinconf.xsl
+%%DATADIR%%/main/webapp/skins/coat/xslt/fo/document-to-fo.xsl
+%%DATADIR%%/main/webapp/skins/coat/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/coat/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/coat/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/coat/xslt/html/tab-to-menu.xsl
 %%DATADIR%%/main/webapp/skins/common/css/forrest.css.xslt
 %%DATADIR%%/main/webapp/skins/common/images/README.txt
 %%DATADIR%%/main/webapp/skins/common/images/add.jpg
@@ -454,25 +680,26 @@ bin/forrest
 %%DATADIR%%/main/webapp/skins/common/scripts/getBlank.js
 %%DATADIR%%/main/webapp/skins/common/scripts/getMenu.js
 %%DATADIR%%/main/webapp/skins/common/scripts/menu.js
+%%DATADIR%%/main/webapp/skins/common/scripts/prototype.js
+%%DATADIR%%/main/webapp/skins/common/skinconf.xsl
 %%DATADIR%%/main/webapp/skins/common/translations/CommonMessages_de.xml
 %%DATADIR%%/main/webapp/skins/common/translations/CommonMessages_en_US.xml
 %%DATADIR%%/main/webapp/skins/common/translations/CommonMessages_es.xml
 %%DATADIR%%/main/webapp/skins/common/translations/CommonMessages_fr.xml
-%%DATADIR%%/main/webapp/skins/common/xslt/fo/document2fo.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/fo/footerinfo.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/fo/pdfoutline.xsl
-%%DATADIR%%/main/webapp/skins/common/xslt/html/book2menu.xsl
-%%DATADIR%%/main/webapp/skins/common/xslt/html/document2html.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/html/document-to-html.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/dotdots.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/pathutils.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/renderlogo.xsl
-%%DATADIR%%/main/webapp/skins/common/xslt/html/site2xhtml.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/html/site-to-xhtml.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/split.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/strip_namespaces.xsl
-%%DATADIR%%/main/webapp/skins/common/xslt/html/tab2menu.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/html/tab-to-menu.xsl
 %%DATADIR%%/main/webapp/skins/common/xslt/html/tabutils.xsl
-%%DATADIR%%/main/webapp/skins/common/xslt/svg/document2svg.xsl
-%%DATADIR%%/main/webapp/skins/common/skinconf.xsl
+%%DATADIR%%/main/webapp/skins/common/xslt/svg/document-to-svg.xsl
 %%DATADIR%%/main/webapp/skins/corium/brainstorming.txt
 %%DATADIR%%/main/webapp/skins/forrest-site/css/page.css
 %%DATADIR%%/main/webapp/skins/forrest-site/images/chapter.gif
@@ -513,17 +740,20 @@ bin/forrest
 %%DATADIR%%/main/webapp/skins/krysalis-site/images/success.png
 %%DATADIR%%/main/webapp/skins/krysalis-site/images/warning.png
 %%DATADIR%%/main/webapp/skins/krysalis-site/images/xmldoc.gif
+%%DATADIR%%/main/webapp/skins/krysalis-site/skinconf.xsl
 %%DATADIR%%/main/webapp/skins/krysalis-site/xslt/fo/document2fo.xsl
 %%DATADIR%%/main/webapp/skins/krysalis-site/xslt/html/book2menu.xsl
 %%DATADIR%%/main/webapp/skins/krysalis-site/xslt/html/document2html.xsl
 %%DATADIR%%/main/webapp/skins/krysalis-site/xslt/html/site2xhtml.xsl
 %%DATADIR%%/main/webapp/skins/krysalis-site/xslt/html/tab2menu.xsl
-%%DATADIR%%/main/webapp/skins/krysalis-site/skinconf.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/brainstorming.txt
+%%DATADIR%%/main/webapp/skins/leather-dev/contracts.initial.txt
 %%DATADIR%%/main/webapp/skins/leather-dev/css/base-contracts.css
 %%DATADIR%%/main/webapp/skins/leather-dev/css/basic.css
 %%DATADIR%%/main/webapp/skins/leather-dev/css/branding.css
 %%DATADIR%%/main/webapp/skins/leather-dev/css/navigation.css
 %%DATADIR%%/main/webapp/skins/leather-dev/css/profiling.css.xslt
+%%DATADIR%%/main/webapp/skins/leather-dev/forrest-template.xml
 %%DATADIR%%/main/webapp/skins/leather-dev/images/chapter.gif
 %%DATADIR%%/main/webapp/skins/leather-dev/images/chapter_open.gif
 %%DATADIR%%/main/webapp/skins/leather-dev/images/current.gif
@@ -548,27 +778,26 @@ bin/forrest
 %%DATADIR%%/main/webapp/skins/leather-dev/images/tr-off.gif
 %%DATADIR%%/main/webapp/skins/leather-dev/images/tr-on.gif
 %%DATADIR%%/main/webapp/skins/leather-dev/images/xmldoc.gif
+%%DATADIR%%/main/webapp/skins/leather-dev/note.txt
+%%DATADIR%%/main/webapp/skins/leather-dev/skinconf.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/templates/default.fv
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/fo/document-to-fo.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/fo/document2fo.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/book2menu.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/document2html.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/site2xhtml.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/tab2menu.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/html/tab-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/contract.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/dir-to-contracts.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/fct-bits/c-fontsize-fct.xml
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.txt
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/fct-bits/fct-bits.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/fct-bits/pipeline.txt
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/contract.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/dir2contracts.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/ft-leather.xml
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/ft2xhtml.xsl
-%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/site2xml.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/ft-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/site-to-xml.xsl
 %%DATADIR%%/main/webapp/skins/leather-dev/xslt/xml/sitemap.xmap
-%%DATADIR%%/main/webapp/skins/leather-dev/brainstorming.txt
-%%DATADIR%%/main/webapp/skins/leather-dev/contracts.inicial.txt
-%%DATADIR%%/main/webapp/skins/leather-dev/forrest-template.xml
-%%DATADIR%%/main/webapp/skins/leather-dev/note.txt
-%%DATADIR%%/main/webapp/skins/leather-dev/skinconf.xsl
+%%DATADIR%%/main/webapp/skins/new-skin-names.txt
 %%DATADIR%%/main/webapp/skins/pelt/css/basic.css
 %%DATADIR%%/main/webapp/skins/pelt/css/print.css
 %%DATADIR%%/main/webapp/skins/pelt/css/profile.css.xslt
@@ -587,17 +816,43 @@ bin/forrest
 %%DATADIR%%/main/webapp/skins/pelt/images/success.png
 %%DATADIR%%/main/webapp/skins/pelt/images/warning.png
 %%DATADIR%%/main/webapp/skins/pelt/images/xmldoc.gif
-%%DATADIR%%/main/webapp/skins/pelt/xslt/fo/document2fo.xsl
-%%DATADIR%%/main/webapp/skins/pelt/xslt/html/book2menu.xsl
-%%DATADIR%%/main/webapp/skins/pelt/xslt/html/document2html.xsl
-%%DATADIR%%/main/webapp/skins/pelt/xslt/html/site2xhtml.xsl
-%%DATADIR%%/main/webapp/skins/pelt/xslt/html/tab2menu.xsl
 %%DATADIR%%/main/webapp/skins/pelt/note.txt
 %%DATADIR%%/main/webapp/skins/pelt/skinconf.xsl
-%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/book2menu.xsl
-%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/document2html.xsl
-%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/site2xhtml.xsl
-%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/tab2menu.xsl
+%%DATADIR%%/main/webapp/skins/pelt/xslt/fo/document-to-fo.xsl
+%%DATADIR%%/main/webapp/skins/pelt/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/pelt/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/pelt/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/pelt/xslt/html/tab-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/plain-dev/xslt/html/tab-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/scales/css/basic.css
+%%DATADIR%%/main/webapp/skins/scales/css/print.css
+%%DATADIR%%/main/webapp/skins/scales/css/profile.css.xslt
+%%DATADIR%%/main/webapp/skins/scales/css/screen.css
+%%DATADIR%%/main/webapp/skins/scales/images/chapter.gif
+%%DATADIR%%/main/webapp/skins/scales/images/chapter_open.gif
+%%DATADIR%%/main/webapp/skins/scales/images/current.gif
+%%DATADIR%%/main/webapp/skins/scales/images/error.png
+%%DATADIR%%/main/webapp/skins/scales/images/header_white_line.gif
+%%DATADIR%%/main/webapp/skins/scales/images/info.png
+%%DATADIR%%/main/webapp/skins/scales/images/instruction_arrow.png
+%%DATADIR%%/main/webapp/skins/scales/images/label.gif
+%%DATADIR%%/main/webapp/skins/scales/images/page.gif
+%%DATADIR%%/main/webapp/skins/scales/images/pdfdoc.gif
+%%DATADIR%%/main/webapp/skins/scales/images/printer.gif
+%%DATADIR%%/main/webapp/skins/scales/images/success.png
+%%DATADIR%%/main/webapp/skins/scales/images/warning.png
+%%DATADIR%%/main/webapp/skins/scales/images/xmldoc.gif
+%%DATADIR%%/main/webapp/skins/scales/note.txt
+%%DATADIR%%/main/webapp/skins/scales/skinconf.xsl
+%%DATADIR%%/main/webapp/skins/scales/xslt/fo/document-to-fo.xsl
+%%DATADIR%%/main/webapp/skins/scales/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/scales/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/scales/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/scales/xslt/html/tab-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/tigris/README.txt
 %%DATADIR%%/main/webapp/skins/tigris/css/forrest.css.xslt
 %%DATADIR%%/main/webapp/skins/tigris/css/inst.css
 %%DATADIR%%/main/webapp/skins/tigris/css/ns4_only.css
@@ -667,53 +922,39 @@ bin/forrest
 %%DATADIR%%/main/webapp/skins/tigris/images/sw_min.gif
 %%DATADIR%%/main/webapp/skins/tigris/images/xmldoc.gif
 %%DATADIR%%/main/webapp/skins/tigris/scripts/tigris.js
-%%DATADIR%%/main/webapp/skins/tigris/xslt/fo/document2fo.xsl
-%%DATADIR%%/main/webapp/skins/tigris/xslt/html/book2menu.xsl
-%%DATADIR%%/main/webapp/skins/tigris/xslt/html/document2html.xsl
-%%DATADIR%%/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl
-%%DATADIR%%/main/webapp/skins/tigris/xslt/html/tab2menu.xsl
-%%DATADIR%%/main/webapp/skins/tigris/README.txt
 %%DATADIR%%/main/webapp/skins/tigris/skinconf.xsl
-%%DATADIR%%/main/webapp/skins/README.txt
-%%DATADIR%%/main/webapp/skins/new-skin-names.txt
-%%DATADIR%%/main/webapp/aggregate.xmap
-%%DATADIR%%/main/webapp/default-forrest.properties
-%%DATADIR%%/main/webapp/faq.xmap
-%%DATADIR%%/main/webapp/forrest.xmap
-%%DATADIR%%/main/webapp/i18n.xmap
-%%DATADIR%%/main/webapp/issues.xmap
-%%DATADIR%%/main/webapp/jettyconf.xml
-%%DATADIR%%/main/webapp/linkmap.xmap
-%%DATADIR%%/main/webapp/menu.xmap
-%%DATADIR%%/main/webapp/profiler.xmap
-%%DATADIR%%/main/webapp/raw.xmap
-%%DATADIR%%/main/webapp/resources.xmap
-%%DATADIR%%/main/webapp/revisions.xmap
-%%DATADIR%%/main/webapp/search.xmap
-%%DATADIR%%/main/webapp/sitemap.xmap
+%%DATADIR%%/main/webapp/skins/tigris/xslt/fo/document-to-fo.xsl
+%%DATADIR%%/main/webapp/skins/tigris/xslt/html/book-to-menu.xsl
+%%DATADIR%%/main/webapp/skins/tigris/xslt/html/document-to-html.xsl
+%%DATADIR%%/main/webapp/skins/tigris/xslt/html/site-to-xhtml.xsl
+%%DATADIR%%/main/webapp/skins/tigris/xslt/html/tab-to-menu.xsl
 %%DATADIR%%/main/webapp/tabs.xmap
-%%DATADIR%%/main/build.sh
-%%DATADIR%%/main/build.xml
-%%DATADIR%%/main/forrest.antproxy.xml
-%%DATADIR%%/main/forrest.build.xml
-%%DATADIR%%/main/module.xml
+%%DATADIR%%/main/webapp/wiring.xml
+%%DATADIR%%/plugins/build.xml
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build/build.number
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build.xml
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/forrest.properties
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/locationmap.xml
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/classes/CatalogManager.properties
+%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/favicon.ico
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/group-logo.gif
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/group.svg
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/icon.png
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project-logo.gif
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/project.svg
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images/usemap.gif
-%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/favicon.ico
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/index.xml
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/site.xml
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/tabs.xml
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/skinconf.xml
-%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build.xml
-%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/forrest.properties
-%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
 %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/status.xml
-%%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build/build.number
+%%DATADIR%%/plugins/pluginTemplate/build.xml
+%%DATADIR%%/plugins/pluginTemplate/forrest.properties
 %%DATADIR%%/plugins/pluginTemplate/lib/readme.txt
+%%DATADIR%%/plugins/pluginTemplate/locationmap.xml
+%%DATADIR%%/plugins/pluginTemplate/sitemap.xmap
+%%DATADIR%%/plugins/pluginTemplate/src/documentation/classes/CatalogManager.properties
 %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs/images/group-logo.gif
 %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs/images/group.svg
 %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs/images/icon.png
@@ -725,61 +966,36 @@ bin/forrest
 %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs/tabs.xml
 %%DATADIR%%/plugins/pluginTemplate/src/documentation/skinconf.xml
 %%DATADIR%%/plugins/pluginTemplate/src/java/readme.txt
-%%DATADIR%%/plugins/pluginTemplate/build.xml
-%%DATADIR%%/plugins/pluginTemplate/forrest.properties
-%%DATADIR%%/plugins/pluginTemplate/sitemap.xmap
 %%DATADIR%%/plugins/pluginTemplate/status.xml
-%%DATADIR%%/plugins/build.xml
 %%DATADIR%%/plugins/plugins.xml
 %%DATADIR%%/site-author/classes/CatalogManager.properties
 %%DATADIR%%/site-author/conf/cli.xconf
+%%DATADIR%%/site-author/content/.htaccess
+%%DATADIR%%/site-author/content/doap.xml
+%%DATADIR%%/site-author/content/locationmap.xml
+%%DATADIR%%/site-author/content/mirrors.cgi
 %%DATADIR%%/site-author/content/skins/skins.xml
 %%DATADIR%%/site-author/content/xdocs/TR/2004/WD-forrest10.html
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/bugzilla-patch/my-images/bugzilla-screen.gif
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/bugzilla-patch/book.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/bugzilla-patch/howto-bugzilla-patch.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/howto-multi.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/revision-howto-multi-2003-09-14.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/revision-howto-multi-2003-09-15.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/revision-step1-2003-09-16.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/step1.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/step2.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi/step3.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/howto-asf-mirror.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/howto-forrestbot.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/howto-howto.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/howto-pdf-tab.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/index.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/build.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/cap.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/catalog.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/compliance.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/faq.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/forrest-contract.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/index.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/linking.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/oowriter.sxw
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/project-sitemap.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/searching.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/sitemap-ref.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/skin-package.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/skins.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/upgrading_06.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/validation.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/wiki-sample.cwiki
-%%DATADIR%%/site-author/content/xdocs/docs_0_60/your-project.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch/my-images/bugzilla-screen.gif
+%%DATADIR%%/site-author/content/xdocs/TR/2005/WD-forrest10.html
+%%DATADIR%%/site-author/content/xdocs/apacheconsites.jpg
+%%DATADIR%%/site-author/content/xdocs/asf-infrastructure.xml
+%%DATADIR%%/site-author/content/xdocs/committed-1.aart
+%%DATADIR%%/site-author/content/xdocs/committed.xml
+%%DATADIR%%/site-author/content/xdocs/compliance.xml
+%%DATADIR%%/site-author/content/xdocs/contrib.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/body-index.fv
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/build.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/cap.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/catalog.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/compliance.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/dreams.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/faq.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/forrest-contract.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch/book.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch/howto-bugzilla-patch.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch/my-images/bugzilla-screen.gif
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/cvs-ssh/book.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/cvs-ssh/howto-cvs-ssh.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/howto-multi.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-howto-multi-2003-09-14.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-howto-multi-2003-09-15.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-step1-2003-09-16.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step1.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step2.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step3.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/forrest.xmap.html
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/howto-asf-mirror.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/howto-buildPlugin.xml
@@ -794,32 +1010,83 @@ bin/forrest
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/howto-view-dsl.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/howto-view-install.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/index.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/howto-multi.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-howto-multi-2003-09-14.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-howto-multi-2003-09-15.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/revision-step1-2003-09-16.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step1.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step2.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/multi/step3.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/project_sitemap.xmap.html
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/sitemap.xmap.html
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/images/snapshot-plain-dev.png
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/images/snapshot-view-viewHelper.png
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/build.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/cap.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/catalog.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/compliance.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/dreams.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/faq.xml
-%%DATADIR%%/site-author/content/xdocs/docs_0_70/forrest-contract.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/index.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/libre-intro.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/linking.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/menu-index.fv
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/primer.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/project-sitemap.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/searching.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/sitemap-ref.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/skin-package.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/skins.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_70/tab-index.fv
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/upgrading_07.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/validation.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/views.xml
 %%DATADIR%%/site-author/content/xdocs/docs_0_70/your-project.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/body-index.fv
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/build.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/cap.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/catalog.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/dreams.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/faq.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/glossary.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/bugzilla-patch/book.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/bugzilla-patch/howto-bugzilla-patch.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/bugzilla-patch/my-images/bugzilla-screen.gif
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/cvs-ssh/book.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/cvs-ssh/howto-cvs-ssh.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-asf-mirror.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-buildPlugin.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-collaborativeEditing.html
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-corner-images.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-custom-html-source.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-editcss.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-forrest-from-maven.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-forrestbot.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/howto-pdf-tab.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/index.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/howto-multi.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-14.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/revision-howto-multi-2003-09-15.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/revision-step1-2003-09-16.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/step1.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/step2.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi/step3.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/images/snapshot-plain-dev.png
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/images/snapshot-view-viewHelper.png
 %%DATADIR%%/site-author/content/xdocs/docs_0_80/index.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/libre-intro.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/linking.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/locationmap.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/menu-index.fv
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/primer.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/project-sitemap.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/searching.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/sitemap-explain.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/sitemap-ref.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/skin-package.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/skins.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/status-themes.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/tab-index.fv
 %%DATADIR%%/site-author/content/xdocs/docs_0_80/upgrading_08.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/validation.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_80/your-project.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_90/index.xml
+%%DATADIR%%/site-author/content/xdocs/docs_0_90/upgrading_09.xml
+%%DATADIR%%/site-author/content/xdocs/documentation_bestpractices.xml
 %%DATADIR%%/site-author/content/xdocs/dtdx/document-v11.xml
 %%DATADIR%%/site-author/content/xdocs/dtdx/document-v12.xml
 %%DATADIR%%/site-author/content/xdocs/dtdx/document-v13.dtdx.pdf
@@ -831,38 +1098,62 @@ bin/forrest
 %%DATADIR%%/site-author/content/xdocs/dtdx/faq-v20.dtdx.pdf
 %%DATADIR%%/site-author/content/xdocs/dtdx/howto-v13.dtdx.pdf
 %%DATADIR%%/site-author/content/xdocs/dtdx/howto-v20.dtdx.pdf
-%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml
-%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_70/usingPlugins.xml
-%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml
-%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_80/usingPlugins.xml
-%%DATADIR%%/site-author/content/xdocs/pluginDocs/index.xml
-%%DATADIR%%/site-author/content/xdocs/tools/forrestbar.xml
-%%DATADIR%%/site-author/content/xdocs/tools/forrestbar.xpi
-%%DATADIR%%/site-author/content/xdocs/tools/forrestbot-web-interface.xml
-%%DATADIR%%/site-author/content/xdocs/tools/forrestbot.xml
-%%DATADIR%%/site-author/content/xdocs/tools/index.xml
-%%DATADIR%%/site-author/content/xdocs/tools/xxe.xml
-%%DATADIR%%/site-author/content/xdocs/trash/docs_0_50/index.xml
-%%DATADIR%%/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml
-%%DATADIR%%/site-author/content/xdocs/versions/index.xml
-%%DATADIR%%/site-author/content/xdocs/contrib.xml
 %%DATADIR%%/site-author/content/xdocs/events.xml
 %%DATADIR%%/site-author/content/xdocs/favicon.ico
 %%DATADIR%%/site-author/content/xdocs/flyer.xml
+%%DATADIR%%/site-author/content/xdocs/forrest-contract.xml
+%%DATADIR%%/site-author/content/xdocs/forrest-friday.xml
 %%DATADIR%%/site-author/content/xdocs/guidelines.xml
+%%DATADIR%%/site-author/content/xdocs/gump.xml
+%%DATADIR%%/site-author/content/xdocs/howto-dev.xml
+%%DATADIR%%/site-author/content/xdocs/howto-howto.xml
 %%DATADIR%%/site-author/content/xdocs/index.xml
+%%DATADIR%%/site-author/content/xdocs/issues.xml
 %%DATADIR%%/site-author/content/xdocs/license.xml
 %%DATADIR%%/site-author/content/xdocs/live-sites.xml
 %%DATADIR%%/site-author/content/xdocs/mail-lists.xml
 %%DATADIR%%/site-author/content/xdocs/mirrors.html
+%%DATADIR%%/site-author/content/xdocs/plan/index.xml
+%%DATADIR%%/site-author/content/xdocs/plan/internal-xhtml.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/index.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_70/pluginInfrastructure.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_70/usingPlugins.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_80/pluginInfrastructure.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_80/usingPlugins.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_90/pluginInfrastructure.xml
+%%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_90/usingPlugins.xml
+%%DATADIR%%/site-author/content/xdocs/procedures/How_to_publish_docs.xml
+%%DATADIR%%/site-author/content/xdocs/procedures/release/How_to_release.xml
+%%DATADIR%%/site-author/content/xdocs/procedures/release/announce_code_freeze.txt
+%%DATADIR%%/site-author/content/xdocs/procedures/release/announce_end_of_code_freeze.txt
+%%DATADIR%%/site-author/content/xdocs/procedures/release/announce_release.txt
+%%DATADIR%%/site-author/content/xdocs/procedures/release/propose_release_plan.txt
+%%DATADIR%%/site-author/content/xdocs/procedures/release/rc_did_not_build_what_now.txt
+%%DATADIR%%/site-author/content/xdocs/procedures/release/test_and_vote_on_rel_cand.txt
 %%DATADIR%%/site-author/content/xdocs/proposal-asf-forrestbot.xml
+%%DATADIR%%/site-author/content/xdocs/roles.xml
 %%DATADIR%%/site-author/content/xdocs/site.xml
+%%DATADIR%%/site-author/content/xdocs/subversion_bestpractices.xml
+%%DATADIR%%/site-author/content/xdocs/svn.xml
 %%DATADIR%%/site-author/content/xdocs/tabs.xml
+%%DATADIR%%/site-author/content/xdocs/thanks.xml
+%%DATADIR%%/site-author/content/xdocs/tools/eclipse.xml
+%%DATADIR%%/site-author/content/xdocs/tools/forrestbar.xml
+%%DATADIR%%/site-author/content/xdocs/tools/forrestbar.xpi
+%%DATADIR%%/site-author/content/xdocs/tools/forrestbot-web-interface.xml
+%%DATADIR%%/site-author/content/xdocs/tools/forrestbot.xml
+%%DATADIR%%/site-author/content/xdocs/tools/index.xml
+%%DATADIR%%/site-author/content/xdocs/tools/xxe.xml
+%%DATADIR%%/site-author/content/xdocs/trash/docs_0_50/index.xml
+%%DATADIR%%/site-author/content/xdocs/trash/docs_0_50/upgrading_05.xml
 %%DATADIR%%/site-author/content/xdocs/uri-namespace.xml
+%%DATADIR%%/site-author/content/xdocs/versions/index.xml
 %%DATADIR%%/site-author/content/xdocs/versions.xml
 %%DATADIR%%/site-author/content/xdocs/who.xml
-%%DATADIR%%/site-author/content/.htaccess
-%%DATADIR%%/site-author/content/mirrors.cgi
+%%DATADIR%%/site-author/content/xdocs/zone.xml
+%%DATADIR%%/site-author/forrest.properties
+%%DATADIR%%/site-author/forrest.properties.xml
+%%DATADIR%%/site-author/publish.xml
 %%DATADIR%%/site-author/resources/images/apache-forrest-original.svg
 %%DATADIR%%/site-author/resources/images/apache-forrest.png
 %%DATADIR%%/site-author/resources/images/built-with-cocoon.gif
@@ -878,11 +1169,11 @@ bin/forrest
 %%DATADIR%%/site-author/resources/images/project-logo.gif
 %%DATADIR%%/site-author/resources/images/project-logo.png
 %%DATADIR%%/site-author/resources/images/tabs.png
-%%DATADIR%%/site-author/forrest.properties
-%%DATADIR%%/site-author/publish.xml
+%%DATADIR%%/site-author/resources/themes/pelt.fv
 %%DATADIR%%/site-author/sitemap.xmap
 %%DATADIR%%/site-author/skinconf.xml
 %%DATADIR%%/site-author/status.xml
+%%DATADIR%%/tools/ant/bin/README-forrest-upgrade.txt
 %%DATADIR%%/tools/ant/bin/ant
 %%DATADIR%%/tools/ant/bin/ant.cmd
 %%DATADIR%%/tools/ant/bin/antRun
@@ -893,7 +1184,9 @@ bin/forrest
 %%DATADIR%%/tools/ant/bin/runant.pl
 %%DATADIR%%/tools/ant/bin/runant.py
 %%DATADIR%%/tools/ant/bin/runrc.cmd
+%%DATADIR%%/tools/ant/lib/ant-apache-oro.jar
 %%DATADIR%%/tools/ant/lib/ant-apache-resolver.jar
+%%DATADIR%%/tools/ant/lib/ant-commons-net.jar
 %%DATADIR%%/tools/ant/lib/ant-contrib-1.0b2.jar
 %%DATADIR%%/tools/ant/lib/ant-jsch.jar
 %%DATADIR%%/tools/ant/lib/ant-launcher.jar
@@ -901,86 +1194,80 @@ bin/forrest
 %%DATADIR%%/tools/ant/lib/ant-trax.jar
 %%DATADIR%%/tools/ant/lib/ant-xalan2.jar
 %%DATADIR%%/tools/ant/lib/ant.jar
-%%DATADIR%%/tools/ant/lib/jsch-0.1.14.jar
+%%DATADIR%%/tools/ant/lib/apache-jakarta-commons-net-1.4.1.jar
+%%DATADIR%%/tools/ant/lib/jsch-0.1.28.jar
 %%DATADIR%%/tools/ant/lib/jsvn-0.9-dev.jar
+%%DATADIR%%/tools/ant/lib/oro-2.0.8.jar
 %%DATADIR%%/tools/ant/lib/xml-commons-resolver-1.1.jar
 %%DATADIR%%/tools/dtdconverters/README.txt
 %%DATADIR%%/tools/dtdconverters/dtdx.dtd
 %%DATADIR%%/tools/dtdconverters/dtdx2dtd.xsl
-%%DATADIR%%/tools/eclipse/conf/log4j.xml
-%%DATADIR%%/tools/eclipse/icons/build.png
-%%DATADIR%%/tools/eclipse/icons/start.png
-%%DATADIR%%/tools/eclipse/icons/stop.png
-%%DATADIR%%/tools/eclipse/lib/log4j-1.2.9.jar
-%%DATADIR%%/tools/eclipse/lib/log4j_LICENSE.txt
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/actions/Utilities.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/AntBuildListener.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/ForrestBuilder.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/ForrestJob.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/ForrestManager.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/ForrestRunner.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job/ForrestStopper.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/popup/actions/BuildSite.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/popup/actions/StartForrest.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/popup/actions/StopForrest.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/preference/ForrestPreferences.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/wizards/NewProjectWizard.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/wizards/NewXDoc.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/wizards/NewXdocPage.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/ForrestPlugin.java
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/template/new_xdoc.xml
-%%DATADIR%%/tools/eclipse/src/org/apache/forrest/template/template_build.xml
-%%DATADIR%%/tools/eclipse/.classpath
-%%DATADIR%%/tools/eclipse/.project
-%%DATADIR%%/tools/eclipse/build.properties
-%%DATADIR%%/tools/eclipse/plugin.properties
-%%DATADIR%%/tools/eclipse/plugin.xml
-%%DATADIR%%/tools/eclipse/readme.txt
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/apache-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/apache.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/code-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/code.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/download-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/download.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/faq-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/faq.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/forrest-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/forrest.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/gump-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/gump.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/news-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/news.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/projects-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/projects.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/search-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/search.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/tools-down.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images/tools.png
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/contents.rdf
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/forrestbar.css
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/forrestbarOverlay.js
-%%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/forrestbarOverlay.xul
-%%DATADIR%%/tools/forrestbar/xpi/install.js
+%%DATADIR%%/tools/forrestbar/README.txt
 %%DATADIR%%/tools/forrestbar/build.xml
-%%DATADIR%%/tools/forrestbot/core/cvs_add.sh
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/contents.rdf
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/forrestbar.css
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.js
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/forrestbarOverlay.xul
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/forrestbarSettings.xul
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/apache-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/apache.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/code-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/code.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/download-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/download.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/faq-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/faq.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/forrest-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/forrest.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/gump-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/gump.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/news-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/news.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/projects-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/projects.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/search-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/search.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/tools-down.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome/content/images/tools.png
+%%DATADIR%%/tools/forrestbar/xpi/chrome.manifest
+%%DATADIR%%/tools/forrestbar/xpi/install.js
+%%DATADIR%%/tools/forrestbar/xpi/install.rdf
+%%DATADIR%%/tools/forrestbot/README.txt
+%%DATADIR%%/tools/forrestbot/avalon-phoenix.xml
+%%DATADIR%%/tools/forrestbot/avalon-site.xml
+%%DATADIR%%/tools/forrestbot/cocoon-site.xml
 %%DATADIR%%/tools/forrestbot/core/build.xml
+%%DATADIR%%/tools/forrestbot/core/cvs_add.sh
 %%DATADIR%%/tools/forrestbot/core/deploy.xml
 %%DATADIR%%/tools/forrestbot/core/emailtemplate.txt
 %%DATADIR%%/tools/forrestbot/core/forrestbot.xml
 %%DATADIR%%/tools/forrestbot/core/getsrc.xml
 %%DATADIR%%/tools/forrestbot/core/notify.xml
-%%DATADIR%%/tools/forrestbot/lib/ant-contrib-0.5.jar
+%%DATADIR%%/tools/forrestbot/forrest-pelt.xml
+%%DATADIR%%/tools/forrestbot/forrest-seed.xml
+%%DATADIR%%/tools/forrestbot/forrest.xml
+%%DATADIR%%/tools/forrestbot/incubator.xml
+%%DATADIR%%/tools/forrestbot/lib/ant-contrib-1.0b2.jar
 %%DATADIR%%/tools/forrestbot/lib/jsvn-0.9-dev.jar
+%%DATADIR%%/tools/forrestbot/sf-struts.xml
+%%DATADIR%%/tools/forrestbot/webapp/.classpath
+%%DATADIR%%/tools/forrestbot/webapp/.project
 %%DATADIR%%/tools/forrestbot/webapp/lib/README.txt
 %%DATADIR%%/tools/forrestbot/webapp/lib/oscore-2.2.2.jar
 %%DATADIR%%/tools/forrestbot/webapp/lib/osuser-1.0-dev.jar
 %%DATADIR%%/tools/forrestbot/webapp/lib/propertyset-1.2.jar
+%%DATADIR%%/tools/forrestbot/webapp/maven.xml
+%%DATADIR%%/tools/forrestbot/webapp/project.properties
+%%DATADIR%%/tools/forrestbot/webapp/project.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/groups.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/log4j.properties
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/osuser.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/projects.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/settings.properties
 %%DATADIR%%/tools/forrestbot/webapp/src/conf/users.xml
+%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Config.java
+%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Constants.java
+%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Resources.properties
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/action/BaseAction.java
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/action/ExecuteAction.java
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/action/LogoutAction.java
@@ -993,21 +1280,18 @@ bin/forrest
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/form/LoginForm.java
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/util/Executor.java
 %%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/util/Project.java
-%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Config.java
-%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Constants.java
-%%DATADIR%%/tools/forrestbot/webapp/src/java/org/apache/forrest/forrestbot/webapp/Resources.properties
+%%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
+%%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/tld/struts-bean-el.tld
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/tld/struts-html-el.tld
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/tld/struts-logic-el.tld
-%%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-config.xml
-%%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/struts-tiles.xml
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/WEB-INF/web.xml
+%%DATADIR%%/tools/forrestbot/webapp/src/webapp/commandForm.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/common/footer.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/common/header.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/common/layout.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/common/simple.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/common/viewlog_frame.jsp
-%%DATADIR%%/tools/forrestbot/webapp/src/webapp/commandForm.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/execute.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/index.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/loginForm.jsp
@@ -1017,19 +1301,6 @@ bin/forrest
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/viewlog_header.jsp
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/welcome.html
 %%DATADIR%%/tools/forrestbot/webapp/src/webapp/welcome.local.html
-%%DATADIR%%/tools/forrestbot/webapp/.classpath
-%%DATADIR%%/tools/forrestbot/webapp/.project
-%%DATADIR%%/tools/forrestbot/webapp/maven.xml
-%%DATADIR%%/tools/forrestbot/webapp/project.properties
-%%DATADIR%%/tools/forrestbot/webapp/project.xml
-%%DATADIR%%/tools/forrestbot/avalon-phoenix.xml
-%%DATADIR%%/tools/forrestbot/avalon-site.xml
-%%DATADIR%%/tools/forrestbot/cocoon-site.xml
-%%DATADIR%%/tools/forrestbot/forrest-pelt.xml
-%%DATADIR%%/tools/forrestbot/forrest-seed.xml
-%%DATADIR%%/tools/forrestbot/forrest.xml
-%%DATADIR%%/tools/forrestbot/incubator.xml
-%%DATADIR%%/tools/forrestbot/sf-struts.xml
 %%DATADIR%%/tools/forrestbot/ws-site.xml
 %%DATADIR%%/tools/forrestbot/xml-fop.xml
 %%DATADIR%%/tools/forrestbot/xml-site.xml
@@ -1038,25 +1309,16 @@ bin/forrest
 %%DATADIR%%/tools/jetty/jetty-4.2.19.jar
 %%DATADIR%%/tools/jetty/jetty-4.2.19.jar.license.html
 %%DATADIR%%/tools/jetty/servlet-2.3.jar
-%%DATADIR%%/tools/logos/etc/apache_pb.svg
-%%DATADIR%%/tools/logos/etc/feather.svg
-%%DATADIR%%/tools/logos/etc/ws-project-logo.jpg
-%%DATADIR%%/tools/logos/resources/apache-feather.ico
-%%DATADIR%%/tools/logos/resources/apache-icon.svg
-%%DATADIR%%/tools/logos/templates/apache-httpd.svg
-%%DATADIR%%/tools/logos/templates/apache-jakarta.svg
-%%DATADIR%%/tools/logos/templates/apache-resource.svg
-%%DATADIR%%/tools/logos/templates/apache.svg
-%%DATADIR%%/tools/logos/batik-rasterizer.jar
-%%DATADIR%%/tools/logos/build.xml
-%%DATADIR%%/tools/logos/logopage.xsl
-%%DATADIR%%/tools/logos/logos.xsl
-%%DATADIR%%/tools/logos/projects.xml
 %%DATADIR%%/tools/targets/maven.xml
 %%DATADIR%%/tools/targets/patch.xml
+%%DATADIR%%/tools/xxe/README.txt
+%%DATADIR%%/tools/xxe/build.xml
+%%DATADIR%%/tools/xxe/common_config.xml
 %%DATADIR%%/tools/xxe/css/common.css
 %%DATADIR%%/tools/xxe/css/document1x.css
 %%DATADIR%%/tools/xxe/css/document2x.css
+%%DATADIR%%/tools/xxe/document-v10.xxe
+%%DATADIR%%/tools/xxe/document-v20.xxe
 %%DATADIR%%/tools/xxe/icons/note.png
 %%DATADIR%%/tools/xxe/icons/sub.png
 %%DATADIR%%/tools/xxe/icons/sup.png
@@ -1064,27 +1326,24 @@ bin/forrest
 %%DATADIR%%/tools/xxe/template/document12.xml
 %%DATADIR%%/tools/xxe/template/document13.xml
 %%DATADIR%%/tools/xxe/template/document20.xml
-%%DATADIR%%/tools/xxe/README.txt
-%%DATADIR%%/tools/xxe/build.xml
-%%DATADIR%%/tools/xxe/common_config.xml
-%%DATADIR%%/tools/xxe/document-v10.xxe
-%%DATADIR%%/tools/xxe/document-v20.xxe
 %%DATADIR%%/tools/xxe/toolBar.xml
 %%DATADIR%%/whiteboard/plugins/build.xml
 %%DATADIR%%/whiteboard/plugins/whiteboard-plugins.xml
-%%DATADIR%%/README.txt
-%%DATADIR%%/index.html
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 @dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/resources
+@dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/classes
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src/documentation
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/src
-@dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf/resources
 @dirrm %%DATADIR%%/build/plugins/org.apache.forrest.plugin.output.pdf
 @dirrm %%DATADIR%%/build/plugins
 @dirrm %%DATADIR%%/build
 @dirrm %%DATADIR%%/etc/cocoon_upgrade
+@dirrm %%DATADIR%%/etc/test-whitespace
 @dirrm %%DATADIR%%/etc
 @dirrm %%DATADIR%%/lib/core
 @dirrm %%DATADIR%%/lib/endorsed
@@ -1092,10 +1351,14 @@ bin/forrest
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/classes
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/images
+@dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/locationmap
+@dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/showonlywhenselected
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples/subdir
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs/samples
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/content/xdocs
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/content
+@dirrm %%DATADIR%%/main/fresh-site/src/documentation/resources/images/sub-dir
+@dirrm %%DATADIR%%/main/fresh-site/src/documentation/resources/images
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/resources/schema
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/resources/stylesheets
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation/resources
@@ -1103,12 +1366,10 @@ bin/forrest
 @dirrm %%DATADIR%%/main/fresh-site/src/documentation
 @dirrm %%DATADIR%%/main/fresh-site/src
 @dirrm %%DATADIR%%/main/fresh-site
-@dirrm %%DATADIR%%/main/java/org/apache/cocoon/components/source/impl
-@dirrm %%DATADIR%%/main/java/org/apache/cocoon/components/source
-@dirrm %%DATADIR%%/main/java/org/apache/cocoon/components
-@dirrm %%DATADIR%%/main/java/org/apache/cocoon
 @dirrm %%DATADIR%%/main/java/org/apache/forrest/conf
 @dirrm %%DATADIR%%/main/java/org/apache/forrest/locationmap/lm
+@dirrm %%DATADIR%%/main/java/org/apache/forrest/locationmap/source/impl
+@dirrm %%DATADIR%%/main/java/org/apache/forrest/locationmap/source
 @dirrm %%DATADIR%%/main/java/org/apache/forrest/locationmap
 @dirrm %%DATADIR%%/main/java/org/apache/forrest/log
 @dirrm %%DATADIR%%/main/java/org/apache/forrest/sourceexists
@@ -1124,12 +1385,50 @@ bin/forrest
 @dirrm %%DATADIR%%/main/tasks/org/apache
 @dirrm %%DATADIR%%/main/tasks/org
 @dirrm %%DATADIR%%/main/tasks
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/classes
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs/images
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/content/xdocs
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/content
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/resources/schema
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/resources/themes/common
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/resources/themes
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation/resources
+@dirrm %%DATADIR%%/main/template-sites/basic/src/documentation
+@dirrm %%DATADIR%%/main/template-sites/basic/src
+@dirrm %%DATADIR%%/main/template-sites/basic
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/classes
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs/images
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/content/xdocs
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/content
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/resources/schema
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation/resources
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src/documentation
+@dirrm %%DATADIR%%/main/template-sites/benchmark/src
+@dirrm %%DATADIR%%/main/template-sites/benchmark
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/classes
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/about
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/images
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/product
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/team/resume
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs/team
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content/xdocs
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/content
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/resources/schema
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/resources
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation/translations
+@dirrm %%DATADIR%%/main/template-sites/business/src/documentation
+@dirrm %%DATADIR%%/main/template-sites/business/src
+@dirrm %%DATADIR%%/main/template-sites/business
+@dirrm %%DATADIR%%/main/template-sites
 @dirrm %%DATADIR%%/main/var
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/classes/org/apache/cocoon/util
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/classes/org/apache/cocoon
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/classes/org/apache
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/classes/org
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/classes
+@dirrm %%DATADIR%%/main/webapp/WEB-INF/properties/dev
+@dirrm %%DATADIR%%/main/webapp/WEB-INF/properties/prod
+@dirrm %%DATADIR%%/main/webapp/WEB-INF/properties
 @dirrm %%DATADIR%%/main/webapp/WEB-INF/xconf
 @dirrm %%DATADIR%%/main/webapp/WEB-INF
 @dirrm %%DATADIR%%/main/webapp/resources/chaperon/grammars
@@ -1145,6 +1444,7 @@ bin/forrest
 @dirrm %%DATADIR%%/main/webapp/resources/schema/dtd
 @dirrm %%DATADIR%%/main/webapp/resources/schema/entity
 @dirrm %%DATADIR%%/main/webapp/resources/schema/open-office
+@dirrm %%DATADIR%%/main/webapp/resources/schema/relaxng/WD-xhtml2-20050527
 @dirrm %%DATADIR%%/main/webapp/resources/schema/relaxng/unstable
 @dirrm %%DATADIR%%/main/webapp/resources/schema/relaxng
 @dirrm %%DATADIR%%/main/webapp/resources/schema/sdocbook/1.0
@@ -1153,9 +1453,14 @@ bin/forrest
 @dirrm %%DATADIR%%/main/webapp/resources/schema
 @dirrm %%DATADIR%%/main/webapp/resources/stylesheets/aggregates
 @dirrm %%DATADIR%%/main/webapp/resources/stylesheets/external
-@dirrm %%DATADIR%%/main/webapp/resources/stylesheets/search
 @dirrm %%DATADIR%%/main/webapp/resources/stylesheets
 @dirrm %%DATADIR%%/main/webapp/resources
+@dirrm %%DATADIR%%/main/webapp/skins/coat/css
+@dirrm %%DATADIR%%/main/webapp/skins/coat/images
+@dirrm %%DATADIR%%/main/webapp/skins/coat/xslt/fo
+@dirrm %%DATADIR%%/main/webapp/skins/coat/xslt/html
+@dirrm %%DATADIR%%/main/webapp/skins/coat/xslt
+@dirrm %%DATADIR%%/main/webapp/skins/coat
 @dirrm %%DATADIR%%/main/webapp/skins/common/css
 @dirrm %%DATADIR%%/main/webapp/skins/common/images
 @dirrm %%DATADIR%%/main/webapp/skins/common/scripts
@@ -1196,6 +1501,12 @@ bin/forrest
 @dirrm %%DATADIR%%/main/webapp/skins/plain-dev/xslt/html
 @dirrm %%DATADIR%%/main/webapp/skins/plain-dev/xslt
 @dirrm %%DATADIR%%/main/webapp/skins/plain-dev
+@dirrm %%DATADIR%%/main/webapp/skins/scales/css
+@dirrm %%DATADIR%%/main/webapp/skins/scales/images
+@dirrm %%DATADIR%%/main/webapp/skins/scales/xslt/fo
+@dirrm %%DATADIR%%/main/webapp/skins/scales/xslt/html
+@dirrm %%DATADIR%%/main/webapp/skins/scales/xslt
+@dirrm %%DATADIR%%/main/webapp/skins/scales
 @dirrm %%DATADIR%%/main/webapp/skins/tigris/css
 @dirrm %%DATADIR%%/main/webapp/skins/tigris/images
 @dirrm %%DATADIR%%/main/webapp/skins/tigris/scripts
@@ -1206,15 +1517,17 @@ bin/forrest
 @dirrm %%DATADIR%%/main/webapp/skins
 @dirrm %%DATADIR%%/main/webapp
 @dirrm %%DATADIR%%/main
+@dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/resources
+@dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/classes
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs/images
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content/xdocs
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation/content
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src/documentation
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/src
-@dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf/build
 @dirrm %%DATADIR%%/plugins/org.apache.forrest.plugin.output.pdf
 @dirrm %%DATADIR%%/plugins/pluginTemplate/lib
+@dirrm %%DATADIR%%/plugins/pluginTemplate/src/documentation/classes
 @dirrm %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs/images
 @dirrm %%DATADIR%%/plugins/pluginTemplate/src/documentation/content/xdocs
 @dirrm %%DATADIR%%/plugins/pluginTemplate/src/documentation/content
@@ -1227,12 +1540,8 @@ bin/forrest
 @dirrm %%DATADIR%%/site-author/conf
 @dirrm %%DATADIR%%/site-author/content/skins
 @dirrm %%DATADIR%%/site-author/content/xdocs/TR/2004
+@dirrm %%DATADIR%%/site-author/content/xdocs/TR/2005
 @dirrm %%DATADIR%%/site-author/content/xdocs/TR
-@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/bugzilla-patch/my-images
-@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/bugzilla-patch
-@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_60/howto/multi
-@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_60/howto
-@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_60
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch/my-images
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/bugzilla-patch
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto/cvs-ssh
@@ -1240,11 +1549,22 @@ bin/forrest
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70/howto
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70/images
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_70
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/bugzilla-patch/my-images
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/bugzilla-patch
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/cvs-ssh
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/howto/multi
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/howto
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80/images
 @dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_80
+@dirrm %%DATADIR%%/site-author/content/xdocs/docs_0_90
 @dirrm %%DATADIR%%/site-author/content/xdocs/dtdx
+@dirrm %%DATADIR%%/site-author/content/xdocs/plan
 @dirrm %%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_70
 @dirrm %%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_80
+@dirrm %%DATADIR%%/site-author/content/xdocs/pluginDocs/plugins_0_90
 @dirrm %%DATADIR%%/site-author/content/xdocs/pluginDocs
+@dirrm %%DATADIR%%/site-author/content/xdocs/procedures/release
+@dirrm %%DATADIR%%/site-author/content/xdocs/procedures
 @dirrm %%DATADIR%%/site-author/content/xdocs/tools
 @dirrm %%DATADIR%%/site-author/content/xdocs/trash/docs_0_50
 @dirrm %%DATADIR%%/site-author/content/xdocs/trash
@@ -1252,31 +1572,16 @@ bin/forrest
 @dirrm %%DATADIR%%/site-author/content/xdocs
 @dirrm %%DATADIR%%/site-author/content
 @dirrm %%DATADIR%%/site-author/resources/images
+@dirrm %%DATADIR%%/site-author/resources/themes
 @dirrm %%DATADIR%%/site-author/resources
 @dirrm %%DATADIR%%/site-author
 @dirrm %%DATADIR%%/tools/ant/bin
 @dirrm %%DATADIR%%/tools/ant/lib
 @dirrm %%DATADIR%%/tools/ant
 @dirrm %%DATADIR%%/tools/dtdconverters
-@dirrm %%DATADIR%%/tools/eclipse/conf
-@dirrm %%DATADIR%%/tools/eclipse/icons
-@dirrm %%DATADIR%%/tools/eclipse/lib
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/actions
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/job
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/popup/actions
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/popup
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/preference
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse/wizards
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/eclipse
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest/template
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache/forrest
-@dirrm %%DATADIR%%/tools/eclipse/src/org/apache
-@dirrm %%DATADIR%%/tools/eclipse/src/org
-@dirrm %%DATADIR%%/tools/eclipse/src
-@dirrm %%DATADIR%%/tools/eclipse
-@dirrm %%DATADIR%%/tools/forrestbar/xpi/content/forrestbar/images
-@dirrm %%DATADIR%%/tools/forrestbar/xpi/content/forrestbar
-@dirrm %%DATADIR%%/tools/forrestbar/xpi/content
+@dirrm %%DATADIR%%/tools/forrestbar/xpi/chrome/content/images
+@dirrm %%DATADIR%%/tools/forrestbar/xpi/chrome/content
+@dirrm %%DATADIR%%/tools/forrestbar/xpi/chrome
 @dirrm %%DATADIR%%/tools/forrestbar/xpi
 @dirrm %%DATADIR%%/tools/forrestbar
 @dirrm %%DATADIR%%/tools/forrestbot/core
@@ -1301,10 +1606,6 @@ bin/forrest
 @dirrm %%DATADIR%%/tools/forrestbot/webapp
 @dirrm %%DATADIR%%/tools/forrestbot
 @dirrm %%DATADIR%%/tools/jetty
-@dirrm %%DATADIR%%/tools/logos/etc
-@dirrm %%DATADIR%%/tools/logos/resources
-@dirrm %%DATADIR%%/tools/logos/templates
-@dirrm %%DATADIR%%/tools/logos
 @dirrm %%DATADIR%%/tools/targets
 @dirrm %%DATADIR%%/tools/xxe/css
 @dirrm %%DATADIR%%/tools/xxe/icons
@@ -1313,4 +1614,4 @@ bin/forrest
 @dirrm %%DATADIR%%/tools
 @dirrm %%DATADIR%%/whiteboard/plugins
 @dirrm %%DATADIR%%/whiteboard
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%