You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by bo...@apache.org on 2011/02/17 06:28:12 UTC

svn commit: r1071505 - in /gump/trunk: forrest.properties src/documentation/content/xdocs/site.xml src/documentation/content/xdocs/tabs.xml src/documentation/skinconf.xml src/documentation/skins/

Author: bodewig
Date: Thu Feb 17 05:28:12 2011
New Revision: 1071505

URL: http://svn.apache.org/viewvc?rev=1071505&view=rev
Log:
Upgrade to Forrest 0.9

Removed:
    gump/trunk/src/documentation/skins/
Modified:
    gump/trunk/forrest.properties
    gump/trunk/src/documentation/content/xdocs/site.xml
    gump/trunk/src/documentation/content/xdocs/tabs.xml
    gump/trunk/src/documentation/skinconf.xml

Modified: gump/trunk/forrest.properties
URL: http://svn.apache.org/viewvc/gump/trunk/forrest.properties?rev=1071505&r1=1071504&r2=1071505&view=diff
==============================================================================
--- gump/trunk/forrest.properties (original)
+++ gump/trunk/forrest.properties Thu Feb 17 05:28:12 2011
@@ -1,4 +1,152 @@
-forrest.validate.skinconf=false
-forrest.validate.sitemap=false
-forrest.validate.skins.stylesheets=false
-project.skin=gump-site
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+##############
+# These are the defaults, un-comment them only if you need to change them.
+#
+# You can even have a completely empty file, to assist with maintenance.
+# This file is required, even if empty.
+#
+# The file obtained from 'forrest seed-sample' shows the defaults.
+##############
+
+# Prints out a summary of Forrest settings for this project
+#forrest.echo=true
+
+# Project name (used to name .war file)
+#project.name=my-project
+
+# Specifies name of Forrest skin to use
+# See list at http://forrest.apache.org/docs/skins.html
+#project.skin=pelt
+
+# Descriptors for plugins and skins
+# comma separated list, file:// is supported
+#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
+#forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
+
+##############
+# behavioural properties
+#project.menu-scheme=tab_attributes
+#project.menu-scheme=directories
+
+##############
+# layout properties
+
+# Properties that can be set to override the default locations
+#
+# Parent properties must be set. This usually means uncommenting
+# project.content-dir if any other property using it is uncommented
+
+#project.status=status.xml
+#project.content-dir=src/documentation
+#project.raw-content-dir=${project.content-dir}/content
+#project.conf-dir=${project.content-dir}/conf
+#project.sitemap-dir=${project.content-dir}
+#project.xdocs-dir=${project.content-dir}/content/xdocs
+#project.resources-dir=${project.content-dir}/resources
+#project.stylesheets-dir=${project.resources-dir}/stylesheets
+#project.images-dir=${project.resources-dir}/images
+#project.schema-dir=${project.resources-dir}/schema
+#project.skins-dir=${project.content-dir}/skins
+#project.skinconf=${project.content-dir}/skinconf.xml
+#project.lib-dir=${project.content-dir}/lib
+#project.classes-dir=${project.content-dir}/classes
+#project.translations-dir=${project.content-dir}/translations
+
+#project.build-dir=${project.home}/build
+#project.site=site
+#project.site-dir=${project.build-dir}/${project.site}
+#project.temp-dir=${project.build-dir}/tmp
+
+##############
+# Cocoon catalog entity resolver properties
+# A local OASIS catalog file to supplement the default Forrest catalog
+#project.catalog=${project.schema-dir}/catalog.xcat
+
+##############
+# validation properties
+
+# This set of properties determine if validation is performed
+# Values are inherited unless overridden.
+# e.g. if forrest.validate=false then all others are false unless set to true.
+#forrest.validate=true
+#forrest.validate.xdocs=${forrest.validate}
+#forrest.validate.skinconf=${forrest.validate}
+#forrest.validate.sitemap=${forrest.validate}
+#forrest.validate.stylesheets=${forrest.validate}
+#forrest.validate.skins=${forrest.validate}
+#forrest.validate.skins.stylesheets=${forrest.validate.skins}
+
+# *.failonerror=(true|false) - stop when an XML file is invalid
+#forrest.validate.failonerror=true
+
+# *.excludes=(pattern) - comma-separated list of path patterns to not validate
+# Note: If you do add an "excludes" list then you need to specify site.xml too.
+# e.g.
+#forrest.validate.xdocs.excludes=site.xml, samples/subdir/**, samples/faq.xml
+#forrest.validate.xdocs.excludes=site.xml
+
+
+##############
+# General Forrest properties
+
+# The URL to start crawling from
+#project.start-uri=linkmap.html
+
+# Set logging level for messages printed to the console
+# (DEBUG, INFO, WARN, ERROR, FATAL_ERROR)
+#project.debuglevel=ERROR
+
+# Max memory to allocate to Java
+#forrest.maxmemory=64m
+
+# Any other arguments to pass to the JVM. For example, to run on an X-less
+# server, set to -Djava.awt.headless=true
+#forrest.jvmargs=
+
+# The bugtracking URL - the issue number will be appended
+# Projects would use their own issue tracker, of course.
+#project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
+#project.bugtracking-url=http://issues.apache.org/jira/browse/
+
+# The issues list as rss
+#project.issues-rss-url=
+
+#I18n Property. Based on the locale request for the browser.
+#If you want to use it for static site then modify the JVM system.language
+# and run once per language
+project.i18n=false
+
+# The names of plugins that are required to build the project
+# comma separated list (no spaces)
+# You can request a specific version by appending "-VERSION" to the end of
+# the plugin name. If you exclude a version number, the latest released version
+# will be used. However, be aware that this may be a development version. In
+# a production environment it is recommended that you specify a known working
+# version.
+# Run "forrest available-plugins" for a list of plug-ins currently available.
+project.required.plugins=org.apache.forrest.plugin.output.pdf
+
+# codename: Dispatcher
+# Add the following plugins to project.required.plugins:
+#org.apache.forrest.plugin.internal.dispatcher
+
+# Proxy configuration
+# - proxy.user and proxy.password are only needed if the proxy is an authenticated one...
+# proxy.host=myproxy.example.org
+# proxy.port=<ProxyPort>
+# proxy.user=<login, if authenticated proxy>
+# proxy.password=<password, if authenticated proxy>

Modified: gump/trunk/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/gump/trunk/src/documentation/content/xdocs/site.xml?rev=1071505&r1=1071504&r2=1071505&view=diff
==============================================================================
--- gump/trunk/src/documentation/content/xdocs/site.xml (original)
+++ gump/trunk/src/documentation/content/xdocs/site.xml Thu Feb 17 05:28:12 2011
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -7,7 +7,7 @@
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+      http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -80,13 +80,20 @@
 	</python>
 
   <external-refs>
-    <xml.apache.org href="http://xml.apache.org/">
-      <forrest href="forrest/">
-        <validation href="validation.html"/>
-        <webapp href="your-project.html#webapp"/>
-        <document-v11 href="document-v11.html"/>
-      </forrest>
-      <cocoon href="cocoon/"/>
-    </xml.apache.org>
+    <forrest href="http://forrest.apache.org/">
+      <linking href="docs/linking.html"/>
+      <validation href="docs/validation.html"/>
+      <webapp href="docs/your-project.html#webapp"/>
+      <cap href="docs/cap.html"/>
+      <dtd-docs href="docs/dtd-docs.html"/>
+      <new_content_type href="docs/your-project.html#adding_new_content_type"/>
+      <buildPlugin href="docs/howto/howto-buildPlugin.html"/>
+      <dev href="howto-dev.html">
+        <debug-validation href="#debug-validation"/>
+      </dev>
+    </forrest>
+    <forrest-zone href="http://forrest.zones.apache.org/"/>
+    <cocoon href="http://cocoon.apache.org/"/>
+    <xml.apache.org href="http://xml.apache.org/"/>
   </external-refs>
 </site>

Modified: gump/trunk/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/gump/trunk/src/documentation/content/xdocs/tabs.xml?rev=1071505&r1=1071504&r2=1071505&view=diff
==============================================================================
--- gump/trunk/src/documentation/content/xdocs/tabs.xml (original)
+++ gump/trunk/src/documentation/content/xdocs/tabs.xml Thu Feb 17 05:28:12 2011
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Licensed to the Apache Software Foundation (ASF) under one or more
+  Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
   this work for additional information regarding copyright ownership.
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
 
-       http://www.apache.org/licenses/LICENSE-2.0
+      http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-      <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "tab-cocoon-v10.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
 
       <tabs software="Apache Gump"
         title="Apache Gump"

Modified: gump/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/gump/trunk/src/documentation/skinconf.xml?rev=1071505&r1=1071504&r2=1071505&view=diff
==============================================================================
--- gump/trunk/src/documentation/skinconf.xml (original)
+++ gump/trunk/src/documentation/skinconf.xml Thu Feb 17 05:28:12 2011
@@ -15,15 +15,13 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!--
 Skin configuration file. This file contains details of your project,
 which will be used to configure the chosen Forrest skin.
 -->
-
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.6-3//EN" "http://forrest.apache.org/dtd/skinconfig-v06-3.dtd">
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.8-2//EN" "http://forrest.apache.org/dtd/skinconfig-v08-2.dtd">
 <skinconfig>
-  <!-- To enable lucene search add provider="lucene" (default is google).
+<!-- To enable lucene search add provider="lucene" (default is google).
     Add box-location="alt" to move the search box to an alternate location
     (if the skin supports it) and box-location="all" to show it in all
     available locations on the page.  Remove the <search> element to show
@@ -38,10 +36,10 @@ which will be used to configure the chos
   <disable-pdf-link>true</disable-pdf-link>
   <!-- Disable the POD link? -->
   <disable-pod-link>true</disable-pod-link>
-  <!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
+<!-- Disable the Text link? FIXME: NOT YET IMPLEMENETED. -->
   <disable-txt-link>true</disable-txt-link>
-  <!-- Disable the xml source link? -->
-  <!-- The xml source link makes it possible to access the xml rendition
+<!-- Disable the xml source link? -->
+<!-- The xml source link makes it possible to access the xml rendition
     of the source frim the html page, and to have it generated statically.
     This can be used to enable other sites and services to reuse the
     xml format for their uses. Keep this disabled if you don't want other
@@ -56,15 +54,12 @@ which will be used to configure the chos
     an alternate location default is left.
     (if the skin supports it) -->
   <disable-compliance-links>false</disable-compliance-links>
-
-  <!-- Render mailto: links unrecognisable by spam harvesters? -->
+<!-- Render mailto: links unrecognisable by spam harvesters? -->
   <obfuscate-mail-links>true</obfuscate-mail-links>
   <obfuscate-mail-value>.at.</obfuscate-mail-value>
-
-  <!-- Disable the javascript facility to change the font size -->
+<!-- Disable the javascript facility to change the font size -->
   <disable-font-script>true</disable-font-script>
-
-  <!-- mandatory project logo
+<!-- mandatory project logo
        default skin: renders it at the top -->
   <project-name>Apache Gump&#x2122;</project-name>
   <project-description>Continous Integration Tool: Apache Gump</project-description>
@@ -81,39 +76,42 @@ which will be used to configure the chos
   <group-logo>images/apache-gump.png</group-logo>
   Alternative static image:
   <group-logo>images/group-logo.gif</group-logo> -->
-  <!-- optional host logo (e.g. sourceforge logo)
+<!-- optional host logo (e.g. sourceforge logo)
        default skin: renders it at the bottom-left corner -->
   <host-url></host-url>
   <host-logo></host-logo>
-
-  <!-- relative url of a favicon file, normally favicon.ico -->
+<!-- relative url of a favicon file, normally favicon.ico -->
   <favicon-url>favicon.ico</favicon-url>
-
-  <!-- The following are used to construct a copyright statement -->
-  <year>2003-2011</year>
+<!-- The following are used to construct a copyright statement -->
+  <disable-copyright-footer>false</disable-copyright-footer>
+<!-- @inception enable automatic generation of a date-range to current date -->
+  <year inception="true">2003</year>
   <vendor>The Apache Software Foundation.</vendor>
-  <!-- The optional copyright-link URL will be used as a link in the
+<!-- The optional copyright-link URL will be used as a link in the
     copyright statement -->
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
+<!-- Optional text trademark statement below the copyright statement -->
   <trademark-statement>
     Apache Gump, Gump, Apache, the Apache feather logo, and the Apache Gump
     project logos are trademarks of The Apache Software Foundation.
   </trademark-statement>
-
-  <!-- Some skins use this to form a 'breadcrumb trail' of links.
+<!-- Some skins use this to form a 'breadcrumb trail' of links.
     Use location="alt" to move the trail to an alternate location
     (if the skin supports it).
-	  Omit the location attribute to display the trail in the default location.
-	  Use location="none" to not display the trail (if the skin supports it).
+    Omit the location attribute to display the trail in the default location.
+    Use location="none" to not display the trail (if the skin supports it).
     For some skins just set the attributes to blank.
+    
+    NOTE: If a breadcrumb entry points at a local file the href must
+    be complete, that is it must point to the file itself, not to a 
+    directory.
   -->
   <trail>
     <link1 name="Apache" href="http://www.apache.org/"/>
     <link2 name="Gump" href="http://gump.apache.org/"/>
     <link3 name="" href=""/>
   </trail>
-
-  <!-- Configure the TOC, i.e. the Table of Contents.
+<!-- Configure the TOC, i.e. the Table of Contents.
   @max-depth
    how many "section" levels need to be included in the
    generated Table of Contents (TOC). 
@@ -123,26 +121,70 @@ which will be used to configure the chos
    Where to show the TOC.
   -->
   <toc max-depth="2" min-sections="1" location="page"/>
-
-  <!-- Heading types can be clean|underlined|boxed  -->
+<!-- Heading types can be clean|underlined|boxed  -->
   <headings type="boxed"/>
-  
-  <!-- The optional feedback element will be used to construct a
+<!-- The optional feedback element will be used to construct a
     feedback link in the footer with the page pathname appended:
     <a href="@href">{@to}</a>
-    
-  <feedback to="webmaster@foo.com"
-    href="mailto:webmaster@foo.com?subject=Feedback&#160;" >
+    -->
+  <feedback to="webmaster@example.org"
+    href="mailto:webmaster@example.org?subject=Feedback&#160;" >
     Send feedback about the website to:
-  </feedback>-->
-  <!--
+  </feedback>
+<!-- Optional message of the day (MOTD).
+    Note: This is only implemented in the pelt skin.
+    Note: Beware issue FOR-677 if you use an absolute path uri.
+    If the optional <motd> element is used, then messages will be appended
+    depending on the URI string pattern.
+    motd-option : Each option will match a pattern and apply its text.
+      The "pattern" attribute specifies the pattern to be matched.
+      This can be a specific page, or a general pattern to match a set of pages,
+      e.g. everything in the "samples-b" directory.
+      The @starts-with=true anchors the string to the start, otherwise contains 
+    motd-title : This text will be added in brackets after the <html><title>
+      and this can be empty.
+    motd-page : This text will be added in a panel on the face of the page,
+      with the "motd-page-url" being the hyperlink "More".
+    Values for the "location" attribute are:
+      page : on the face of the page, e.g. in the spare space of the toc
+      alt : at the bottom of the left-hand navigation panel
+      both : both
+    -->
+ <motd>
+    <motd-option pattern="samples-b/index.html">
+      <motd-page location="both">
+        This is Samples 1 Documentation. There is 
+      </motd-page>
+      <motd-page-url>../samples-a/index.html</motd-page-url>
+    </motd-option>
+    <motd-option pattern="samples-c/index.html">
+      <motd-page location="both">
+        This is Samples 2 Documentation. There is 
+      </motd-page>
+      <motd-page-url>../samples-a/index.html</motd-page-url>
+    </motd-option>
+    <motd-option pattern="samples-b/sample.html">
+      <motd-title>sample</motd-title>
+      <motd-page location="both">
+        This is an example of a Message of the day (MOTD).
+      </motd-page>
+      <motd-page-url>faq.html</motd-page-url>
+    </motd-option>
+    <motd-option pattern="samples-b/faq.html">
+      <motd-page location="page">
+        How to enable this MOTD is on this page.
+      </motd-page>
+      <motd-page-url>http://forrest.apache.org/docs/faq.html</motd-page-url>
+    </motd-option>
+  </motd>
+<!--
     extra-css - here you can define custom css-elements that are 
-    a. overriding the fallback elements or 
-    b. adding the css definition from new elements that you may have 
+    A) overriding the fallback elements or 
+    B) adding the css definition from new elements that you may have 
        used in your documentation.
     -->
   <extra-css>
-    <!--Example of b. 
+<!--Example of reason B:
         To define the css definition of a new element that you may have used
         in the class attribute of a <p> node. 
         e.g. <p class="quote"/>
@@ -153,12 +195,65 @@ which will be used to configure the chos
       background-color: #f0f0f0;
       font-family: monospace;
     }
+    <!--Example:
+        Decrease font size.
+    -->
+    .copyright { font-size: 0.8em }
   </extra-css>
-
   <colors>
-  <!-- These values are used for the generated CSS files. -->
+<!-- These values are used for the generated CSS files.
+    They essentially "override" the default colors defined in the chosen skin.
+    There are four duplicate "groups" of colors below, denoted by comments:
+      Color group: Forrest, Krysalis, Collabnet, and Lenya using Pelt.
+    They are provided for example only. To customize the colors of any skin,
+    uncomment one of these groups of color elements and change the values
+    of the particular color elements that you wish to change.
+    Note that by default, all color groups are commented-out which means that
+    the default colors provided by the skin are being used.
+  -->
+<!-- Color group: Forrest: example colors similar to forrest.apache.org
+    Some of the element names are obscure, so comments are added to show how
+    the "pelt" skin uses them, other skins might use these elements in a different way.
+    Tip: temporarily change the value of an element to red (#ff0000) and see the effect.
+     pelt: breadtrail: the strip at the top of the page and the second strip under the tabs
+     pelt: header: top strip containing project and group logos
+     pelt: heading|subheading: section headings within the content
+     pelt: navstrip: the strip under the tabs which contains the published date
+     pelt: menu: the left-hand navigation panel
+     pelt: toolbox: the selected menu item
+     pelt: searchbox: the background of the searchbox
+     pelt: border: line border around selected menu item
+     pelt: body: any remaining parts, e.g. the bottom of the page
+     pelt: footer: the second from bottom strip containing credit logos and published date
+     pelt: feedback: the optional bottom strip containing feedback link
+  -->
+    <color name="breadtrail" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="header" value="#294563"/>
+    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="heading" value="#294563"/>
+    <color name="subheading" value="#4a6d8c"/>
+    <!--color name="published" value="#4C6C8F" font="#FFFFFF"/-->
+    <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+    <color name="navstrip" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+    <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>    
+    <color name="toolbox" value="#4a6d8c"/>
+    <color name="border" value="#294563"/>
+    <color name="dialog" value="#4a6d8c"/>
+    <color name="searchbox" value="#4a6d8c" font="#000000"/>
+    <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+    <color name="table" value="#7099C5"/>    
+    <color name="table-cell" value="#f0f0ff"/>    
+    <color name="highlight" value="#ffff00"/>
+    <color name="fixme" value="#cc6600"/>
+    <color name="note" value="#006699"/>
+    <color name="warning" value="#990000"/>
+    <color name="code" value="#CFDCED"/>
+    <color name="footer" value="#cedfef"/>
 
-  <!-- Krysalis -->
+<!-- Color group: Krysalis -->
 <!--
     <color name="header"    value="#FFFFFF"/>
 
@@ -189,40 +284,7 @@ which will be used to configure the chos
         
     <color name="footer" value="#a5b6c6"/>
 -->
-  
-  <!-- Forrest -->
-
-    <color name="header"    value="#294563"/>
-
-    <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-
-    <color name="heading" value="#294563"/>
-    <color name="subheading" value="#4a6d8c"/>
-        
-    <color name="navstrip" value="#cedfef" font="#0F3660" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-    <color name="toolbox" value="#4a6d8c"/>
-    <color name="border" value="#294563"/>
-    
-    <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>    
-    <color name="dialog" value="#4a6d8c"/>
-            
-    <color name="body" value="#ffffff"  link="#0F3660" vlink="#009999" hlink="#000066"/>
-    
-    <color name="table" value="#7099C5"/>    
-    <color name="table-cell" value="#f0f0ff"/>    
-    <color name="highlight" value="#ffff00"/>
-    <color name="fixme" value="#cc6600"/>
-    <color name="note" value="#006699"/>
-    <color name="warning" value="#990000"/>
-    <color name="code" value="#CFDCED"/>
-        
-    <color name="footer" value="#cedfef"/>
-
-
-  <!-- Collabnet --> 
+<!-- Color group: Collabnet -->
 <!--
     <color name="header"    value="#003366"/>
 
@@ -253,46 +315,41 @@ which will be used to configure the chos
         
     <color name="footer" value="#ffffff"/>
 -->
- <!-- Lenya using pelt-->
+<!-- Color group: Lenya using pelt-->
 <!--
+
     <color name="header" value="#ffffff"/>
 
-    <color name="tab-selected" value="#4C6C8F" link="#ffffff" vlink="#ffffff" hlink="#ffffff"/>
-    <color name="tab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="tab-selected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
+    <color name="tab-unselected" value="#F5F4E9" link="#000000" vlink="#000000" hlink="#000000"/>
     <color name="subtab-selected" value="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
     <color name="subtab-unselected" value="#E5E4D9" link="#000000" vlink="#000000" hlink="#000000"/>
 
     <color name="heading" value="#E5E4D9"/>
     <color name="subheading" value="#000000"/>
-    <color name="published" value="#4C6C8F" font="#FFFFFF"/>
-    <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+    <color name="published" value="#000000"/>
     <color name="navstrip" value="#E5E4D9" font="#000000"/>
-
     <color name="toolbox" value="#CFDCED" font="#000000"/>
-
     <color name="border" value="#999999"/>
-    <color name="menu" value="#4C6C8F" font="#ffffff" link="#ffffff" vlink="#ffffff" hlink="#ffffff" current="#FFCC33" />    
-    <color name="menuheading" value="#cfdced" font="#000000" />
-    <color name="searchbox" value="#E5E4D9" font="#000000"/>
-    
+
+    <color name="menu" value="#E5E4D9" font="#000000" link="#000000" vlink="#000000" hlink="#000000"/>
     <color name="dialog" value="#CFDCED"/>
-    <color name="body" value="#ffffff" />            
-    
-    <color name="table" value="#ccc"/>    
-    <color name="table-cell" value="#ffffff"/>   
+    <color name="body" value="#ffffff" />
+
+    <color name="table" value="#ccc"/>
+    <color name="table-cell" value="#ffffff"/>
     <color name="highlight" value="#ffff00"/>
     <color name="fixme" value="#cc6600"/>
     <color name="note" value="#006699"/>
     <color name="warning" value="#990000"/>
     <color name="code" value="#003366"/>
-        
+
     <color name="footer" value="#E5E4D9"/>
 -->
   </colors>
- 
-  <!-- Settings specific to PDF output. -->
+<!-- Settings specific to PDF output. -->
   <pdf>
-    <!-- 
+<!-- 
        Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
        folio, legal, ledger, letter, quarto, tabloid (default letter).
        Supported page orientations are portrait, landscape (default
@@ -300,8 +357,20 @@ which will be used to configure the chos
        Supported text alignments are left, right, justify (default left).
     -->
     <page size="letter" orientation="portrait" text-align="left"/>
-
-    <!--
+<!-- 
+       Pattern of the page numbering in the footer - Default is "Page x".
+       first occurrence of '1' digit represents the current page number,
+       second occurrence of '1' digit represents the total page number,
+       anything else is considered as the static part of the numbering pattern.
+       Examples : x is the current page number, y the total page number.
+       <page-numbering-format>none</page-numbering-format> Do not displays the page numbering
+       <page-numbering-format>1</page-numbering-format> Displays "x"
+       <page-numbering-format>p1.</page-numbering-format> Displays "px."
+       <page-numbering-format>Page 1/1</page-numbering-format> Displays "Page x/y"
+       <page-numbering-format>(1-1)</page-numbering-format> Displays "(x-y)"
+    -->
+    <page-numbering-format>Page 1</page-numbering-format>
+<!--
        Margins can be specified for top, bottom, inner, and outer
        edges. If double-sided="false", the inner edge is always left
        and the outer is always right. If double-sided="true", the
@@ -315,26 +384,49 @@ which will be used to configure the chos
       <inner>1.25in</inner>
       <outer>1in</outer>
     </margins>
-
-    <!--
+<!--
       Print the URL text next to all links going outside the file
     -->
     <show-external-urls>false</show-external-urls>
-
-    <!--
+<!--
+      Normally all links inside a Forrest site are relative. This
+      does not work well in PDFs which are typically viewed outside of
+      the web site. Setting this option adds the given prefix to all
+      relative URLs, both to the link as well as the optional, additional text.
+    -->
+    <url-prefix></url-prefix> 
+<!--
       Disable the copyright footer on each page of the PDF.
       A footer is composed for each page. By default, a "credit" with role=pdf
       will be used, as explained below. Otherwise a copyright statement
       will be generated. This latter can be disabled.
     -->
     <disable-copyright-footer>false</disable-copyright-footer>
-  </pdf>
 
-  <!-- Credits are typically rendered as a set of small clickable
+    <!--
+    Disable the generation of the table of content on the first page
+    of the PDF. By default the TOC is generated.
+    -->
+    <disable-toc>false</disable-toc>
+  </pdf>
+<!-- 
+    Credits are typically rendered as a set of small clickable
     images in the page footer.
-    Use box-location="alt" to move the credit to an alternate location
-    (if the skin supports it). 
-  -->
+    
+    Use box-location="alt" to move the credits to an alternate location
+    (if the skin supports it).
+
+    For example, pelt skin:
+    - box-location="alt" will place the logo at the end of the
+      left-hand coloured menu panel.
+    - box-location="alt2" will place them underneath that panel
+      in the left-hand whitespace.
+    - Otherwise they are placed next to the compatibility icons
+      at the bottom of the screen.
+
+    Comment out the whole <credit>-element if you want no credits in the
+    web pages  
+   -->
   <credits>
     <credit box-location="alt2">
       <name>ApacheCon</name>
@@ -350,15 +442,14 @@ which will be used to configure the chos
       <width>88</width>
       <height>31</height>
     </credit>
-    <!-- A credit with @role="pdf" will be used to compose a footer
+<!-- A credit with @role="pdf" will be used to compose a footer
      for each page in the PDF, using either "name" or "url" or both.
     -->
-    <!--
+<!--
     <credit role="pdf">
       <name>Built with Apache Forrest</name>
       <url>http://forrest.apache.org/</url>
     </credit>
     -->
   </credits>
-
 </skinconfig>