You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by cr...@apache.org on 2004/09/25 08:08:22 UTC

svn commit: rev 47185 - in forrest/site: . docs skin

Author: crossley
Date: Fri Sep 24 23:08:21 2004
New Revision: 47185

Modified:
   forrest/site/abs-linkmap
   forrest/site/abs-menulinks
   forrest/site/body-index.html
   forrest/site/changes.html
   forrest/site/changes.pdf
   forrest/site/changes.rss
   forrest/site/changes.xml
   forrest/site/contrib.html
   forrest/site/contrib.pdf
   forrest/site/docs/faq-v20.dtdx.html
   forrest/site/docs/faq-v20.dtdx.pdf
   forrest/site/faq.html
   forrest/site/faq.pdf
   forrest/site/faq.xml
   forrest/site/forrest-issues.html
   forrest/site/forrest-issues.pdf
   forrest/site/index.html
   forrest/site/index.pdf
   forrest/site/index.xml
   forrest/site/license.html
   forrest/site/linkmap.html
   forrest/site/linkmap.pdf
   forrest/site/live-sites.html
   forrest/site/mail-lists.html
   forrest/site/mail-lists.pdf
   forrest/site/menu-index.html
   forrest/site/skin/basic.css
   forrest/site/skin/print.css
   forrest/site/skin/profile.css
   forrest/site/skin/profile.css.xslt
   forrest/site/skin/screen.css
   forrest/site/todo.html
   forrest/site/who.html
Log:
Update website.


Modified: forrest/site/abs-linkmap
==============================================================================
--- forrest/site/abs-linkmap	(original)
+++ forrest/site/abs-linkmap	Fri Sep 24 23:08:21 2004
@@ -16,7 +16,7 @@
 
   <about label="About">
     <index label="Index" href="index.html"/>
-    <license label="License" href="license.html"/>
+    <license label="License" href="license.html" description="Apache License 2.0"/>
     <download label="Download" href="http://forrest.apache.org/mirrors.cgi"/>
     <download_html href="mirrors.html"/>
     <who label="Who we are" href="who.html"/>
@@ -135,7 +135,9 @@
 -->
   
   <getting-involved label="Getting Involved" tab="project">
-    <contrib label="Contributing" href="contrib.html"/>
+    <contrib label="Contributing" href="contrib.html">
+      <patch href="contrib.html#patch"/>
+    </contrib>
     <build label="Building Forrest" href="build.html"/>
     <SVN label="Browse SVN" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN"/>
     <mail-lists label="Mail lists" href="mail-lists.html">
@@ -157,7 +159,7 @@
     <cocoon label="Apache Cocoon" href="http://cocoon.apache.org/"/>
     <lenya label="Apache Lenya" href="http://cocoon.apache.org/lenya/"/>
     <xml label="Apache XML" href="http://xml.apache.org/"/>
-    <apache-stats label="Apache Stats" href="http://www.apache.org/~vgritsenko/stats/"/>
+    <apache-stats label="Statistics" href="http://www.apache.org/~vgritsenko/stats/"/>
   </references>
   <!-- Uncomment this if we want aggregate HTML/PDFs for this site 
   <pdfs label="PDFs">

Modified: forrest/site/abs-menulinks
==============================================================================
--- forrest/site/abs-menulinks	(original)
+++ forrest/site/abs-menulinks	Fri Sep 24 23:08:21 2004
@@ -16,7 +16,7 @@
 
   <about tab="home" label="About">
     <index tab="home" label="Index" href="index.html"/>
-    <license tab="home" label="License" href="license.html"/>
+    <license tab="home" label="License" href="license.html" description="Apache License 2.0"/>
     <download tab="home" label="Download" href="http://forrest.apache.org/mirrors.cgi"/>
     <download_html tab="home" href="mirrors.html"/>
     <who tab="home" label="Who we are" href="who.html"/>
@@ -135,7 +135,9 @@
 -->
   
   <getting-involved tab="project" label="Getting Involved">
-    <contrib tab="project" label="Contributing" href="contrib.html"/>
+    <contrib tab="project" label="Contributing" href="contrib.html">
+      <patch tab="project" href="contrib.html#patch"/>
+    </contrib>
     <build tab="project" label="Building Forrest" href="build.html"/>
     <SVN tab="project" label="Browse SVN" href="http://svn.apache.org/viewcvs.cgi/forrest/trunk/?root=Apache-SVN"/>
     <mail-lists tab="project" label="Mail lists" href="mail-lists.html">
@@ -157,7 +159,7 @@
     <cocoon tab="home" label="Apache Cocoon" href="http://cocoon.apache.org/"/>
     <lenya tab="home" label="Apache Lenya" href="http://cocoon.apache.org/lenya/"/>
     <xml tab="home" label="Apache XML" href="http://xml.apache.org/"/>
-    <apache-stats tab="home" label="Apache Stats" href="http://www.apache.org/~vgritsenko/stats/"/>
+    <apache-stats tab="home" label="Statistics" href="http://www.apache.org/~vgritsenko/stats/"/>
   </references>
   <!-- Uncomment this if we want aggregate HTML/PDFs for this site 
   <pdfs label="PDFs">

Modified: forrest/site/body-index.html
==============================================================================
--- forrest/site/body-index.html	(original)
+++ forrest/site/body-index.html	Fri Sep 24 23:08:21 2004
@@ -6,11 +6,9 @@
 <tocitem level="2" href="#Static+or+Dynamic" title="Static or Dynamic"></tocitem>
 </tocitem>
 <tocitem level="1" href="#History" title="History"></tocitem>
-<tocitem level="1" href="#Project+Status" title="Project Status">
-<tocitem level="2" href="#website-status" title="Website status"></tocitem>
-</tocitem>
-<tocitem level="1" href="#News+and+events" title="News and events"></tocitem>
-<tocitem level="1" href="#Help+Wanted%21" title="Help Wanted!"></tocitem>
+<tocitem level="1" href="#status" title="Project status and website status"></tocitem>
+<tocitem level="1" href="#news" title="News and events"></tocitem>
+<tocitem level="1" href="#help" title="Help Wanted!"></tocitem>
 </tocitems>
 <!--
   Copyright 2002-2004 The Apache Software Foundation
@@ -41,7 +39,7 @@
 <h1>Introduction</h1>  test - 
         </div>
 <div class="section">
-<p>Forrest is an XML standards-oriented documentation framework
+<p>Apache Forrest is an XML standards-oriented documentation framework
         based on Apache Cocoon, providing XSLT stylesheets and schemas, images
         and other resources. Forrest uses these to render the XML source
         content into a website via command-line, robot, or a dynamic web
@@ -63,7 +61,7 @@
 <ul>
         
 <li>
-<strong>Step 1</strong>: Type <span class="codefrag">'forrest seed'</span>, to populate
+<strong>Step 1</strong>: Do <span class="codefrag">'forrest seed'</span> to populate
           the directory with template site structure and contents.</li>
         
 <li>
@@ -71,23 +69,31 @@
           task-specific, presentation-neutral XML.</li>
         
 <li>
-<strong>Step 3</strong>: Type <span class="codefrag">'forrest'</span> to generate a
-          complete website from the XML. Various website styles (known as skins)
-          are available, and custom skins can be developed.</li>
+<strong>Step 3</strong>: Do <span class="codefrag">'forrest run'</span> then use
+          the web browser to immediately review
+          changes at <span class="codefrag">http://localhost:8888/</span>
+        
+</li>
+        
+<li>
+<strong>Step 4</strong>: Do <span class="codefrag">'forrest'</span> to generate the
+          complete website from the XML sources.
+          Various styles (known as skins) are available. Custom skins
+          can be developed.</li>
+        
+<li>
+<strong>Step 5</strong>: For more information about installation
+          and use, see the 
+          <a href="docs/your-project.html">Using Forrest</a> guide.
+        </li>
       
 </ul>
-<div class="frame note">
-<div class="label">Note</div>
-<div class="content">For more information on Forrest installation and use, see the 
-      <a href="docs/your-project.html">Using Forrest</a> guide.
-      </div>
-</div>
 <p>
         Forrest's focus on low "startup cost" makes it ideal for rapid
         development of small sites, where time and budget constraints do not
         allow time-wasting HTML experiments. Of course, that same methodology
-        can be applied to large projects.
-        Your development team does not need Java experience or even XML skills,
+        can scale up to large projects.
+        Your development team does not need Java experience, or even XML skills,
         to use Forrest. The framework lets you concentrate on content and design.
       </p>
 <p>
@@ -102,7 +108,7 @@
       </p>
 </div>
     
-<a name="N1005E"></a><a name="Powerful"></a>
+<a name="N1006B"></a><a name="Powerful"></a>
 <div class="skinconf-heading-1">
 <h1>Powerful</h1>  test - 
         </div>
@@ -129,8 +135,8 @@
         </li>
         
 <li>SVG to PNG rendering (using <a href="http://xml.apache.org/batik/">Apache
-            Batik</a>); simply drop a SVG in the appropriate directory and it
-          will be rendered as PNG.</li>
+            Batik</a>). Simply drop the SVG in the appropriate directory
+            and it will be rendered as PNG.</li>
         
 <li>
           Transparent inclusion and aggregation of external content, like
@@ -153,7 +159,7 @@
         </li>
       
 </ul>
-<a name="N100AA"></a><a name="Static+or+Dynamic"></a>
+<a name="N100B7"></a><a name="Static+or+Dynamic"></a>
 <div class="skinconf-heading-2">
 <h2>Static or Dynamic</h2>
 </div>
@@ -179,12 +185,12 @@
 </div>
 
     
-<a name="N100C2"></a><a name="History"></a>
+<a name="N100CF"></a><a name="History"></a>
 <div class="skinconf-heading-1">
 <h1>History</h1>  test - 
         </div>
 <div class="section">
-<p>Forrest was started in January 2002, with the major use-case being to
+<p>Apache Forrest was started in January 2002, with the major use-case being to
         create a consistent and efficient 
         <a href="http://xml.apache.org/">xml.apache.org</a> group of project
         websites with a
@@ -194,19 +200,19 @@
         the name 'Forrest').
       </p>
 <p>
-        The focus shifted for Forrest to primarily be a generic documentation
+        The focus shifted for Apache Forrest to primarily be a generic documentation
         tool capable of meeting many needs. Certain relevant project management
         facilities are being added.
       </p>
 </div>
 
     
-<a name="N100D7"></a><a name="Project+Status"></a>
+<a name="N100E4"></a><a name="status"></a>
 <div class="skinconf-heading-1">
-<h1>Project Status</h1>  test - 
+<h1>Project status and website status</h1>  test - 
         </div>
 <div class="section">
-<p>Forrest is currently progressing rapidly through a series of 0.x
+<p>Apache Forrest is currently progressing rapidly through a series of 0.x
         releases. It is certainly usable now (despite not yet being version 1.x).
          See the growing list of 
          <a href="live-sites.html">example sites</a> including
@@ -221,31 +227,25 @@
         adopters make, and will not make capricious or undocumented
         backwards-incompatible changes.
       </p>
-<a name="N100E7"></a><a name="website-status"></a>
-<div class="skinconf-heading-2">
-<h2>Website status</h2>
-</div>
-<p>
-          The documentation on the Forrest website relates to the current
-          head development version of the source repository. Whatever version
-          of Forrest that you are using provides the local documentation for
-          that specific version.
-          Do '<a href="build.html#run">forrest run</a>'
-          to view it.
-        </p>
 <p>
-          The <a href="/">Forrest website</a> is updated
-          manually as needed, while we develop the 
-          <a href="docs/forrestbot.html">forrestbot</a> facility.
+        The documentation on the Apache Forrest website relates to the current
+        head development version of the source repository. Whatever version
+        of Forrest that you are using, will provide the local documentation for
+        that specific version.
+        Do '<a href="build.html#run">forrest run</a>'
+        to view it.
+        The <a href="/">Apache Forrest website</a> is updated
+        manually as needed, while we develop the 
+        <a href="docs/forrestbot.html">forrestbot</a> deployment facility.
            <!-- FIXME: It is out-of-date.
            which produces the
           <link href="http://forrestbot.cocoondev.org/">automatically
             generated</link> site.
             -->
-        </p>
+      </p>
 </div>
     
-<a name="N10103"></a><a name="News+and+events"></a>
+<a name="N10106"></a><a name="news"></a>
 <div class="skinconf-heading-1">
 <h1>News and events</h1>  test - 
         </div>
@@ -257,22 +257,22 @@
          which has many efficiency and usability improvements.
         </li>
         
-<li>Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
-         tab and menu system, numerous skin improvements, DocBook support,
-         Wiki support, improved PDF output, eased maintenance of sitemaps,
-         and more.
+<li>Apache Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
+         tab and menu system, numerous skin improvements, support for a sub-set
+         of DocBook and Wiki source formats,
+         improved PDF output, eased maintenance of sitemaps, and more.
         </li>
       
 </ul>
 </div>
     
-<a name="N10113"></a><a name="Help+Wanted%21"></a>
+<a name="N10116"></a><a name="help"></a>
 <div class="skinconf-heading-1">
 <h1>Help Wanted!</h1>  test - 
         </div>
 <div class="section">
 <p>
-        Forrest is fairly new, and is in need of developers.  If you know (or
+        Apache Forrest is fairly new, and is in need of developers.  If you know (or
         want to learn) XML, Ant, HTML or CSS, then you are qualified to help!
       </p>
 <p>

Modified: forrest/site/changes.html
==============================================================================
--- forrest/site/changes.html	(original)
+++ forrest/site/changes.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -531,6 +531,11 @@
       (DB) Fixes <a class="external" href="http://issues.cocoondev.org/browse/FOR-140">FOR-140</a>.</li>
 <li>
 <img class="icon" alt="update" src="images/update.jpg">
+        Enable email address obfuscation to be configurable using the
+        obfuscate-mail-value option in skinconf.xml
+      (DC) Fixes <a class="external" href="http://issues.cocoondev.org/browse/FOR-122">FOR-122</a>.</li>
+<li>
+<img class="icon" alt="update" src="images/update.jpg">
          Enhance the document2pod functionality to handle many other elements
          and enable the link to this format to be configured via skinconf.
          See the issue report for some notes.
@@ -1012,7 +1017,7 @@
 </div>
 
     
-<a name="N10434"></a><a name="version_0.5.1"></a>
+<a name="N1043D"></a><a name="version_0.5.1"></a>
 <h2 class="underlined_10">Version 0.5.1 (2003-10-06)</h2>
 <div class="section">
 <ul>
@@ -1057,7 +1062,7 @@
 </div>
 
     
-<a name="N1047A"></a><a name="version_0.5"></a>
+<a name="N10483"></a><a name="version_0.5"></a>
 <h2 class="underlined_10">Version 0.5 (2003-09-13)</h2>
 <div class="section">
 <ul>
@@ -1443,7 +1448,7 @@
 </ul>
 </div>
     
-<a name="N10685"></a><a name="version_0.4"></a>
+<a name="N1068E"></a><a name="version_0.4"></a>
 <h2 class="underlined_10">Version 0.4 (2003-02-12)</h2>
 <div class="section">
 <ul>
@@ -1529,7 +1534,7 @@
 </div>
 
     
-<a name="N106F2"></a><a name="version_0.3"></a>
+<a name="N106FB"></a><a name="version_0.3"></a>
 <h2 class="underlined_10">Version 0.3 (2003-01-30)</h2>
 <div class="section">
 <ul>
@@ -1791,7 +1796,7 @@
 </ul>
 </div>
     
-<a name="N1082D"></a><a name="version_0.2"></a>
+<a name="N10836"></a><a name="version_0.2"></a>
 <h2 class="underlined_10">Version 0.2 (2002-11-16)</h2>
 <div class="section">
 <ul>
@@ -1813,7 +1818,7 @@
 </ul>
 </div>
     
-<a name="N10845"></a><a name="version_0.2rc1"></a>
+<a name="N1084E"></a><a name="version_0.2rc1"></a>
 <h2 class="underlined_10">Version 0.2rc1 (2002-11-13)</h2>
 <div class="section">
 <ul>

Modified: forrest/site/changes.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/changes.rss
==============================================================================
--- forrest/site/changes.rss	(original)
+++ forrest/site/changes.rss	Fri Sep 24 23:08:21 2004
@@ -7,6 +7,13 @@
       
         Added new document to facilitate
         upgrading to v0.6
+      </description></item><item><title>skins update</title><link>http://forrest.apache.org/changes.html</link><description>skins update
+              by 
+              DC
+              :
+              
+        Enable email address obfuscation to be configurable using the
+        obfuscate-mail-value option in skinconf.xml
       </description></item><item><title>core fix
                 (bug FOR-267)
               </title><link>http://forrest.apache.org/changes.html</link><description>core fix

Modified: forrest/site/changes.xml
==============================================================================
--- forrest/site/changes.xml	(original)
+++ forrest/site/changes.xml	Fri Sep 24 23:08:21 2004
@@ -205,6 +205,9 @@
       (JJP)</li><li><icon alt="remove" src="images/remove.jpg"/>
         Forrest-targets with ant proxy is obsolete; use forrestbot now
       (DB) Fixes <link href="http://issues.cocoondev.org/browse/FOR-140">FOR-140</link>.</li><li><icon alt="update" src="images/update.jpg"/>
+        Enable email address obfuscation to be configurable using the
+        obfuscate-mail-value option in skinconf.xml
+      (DC) Fixes <link href="http://issues.cocoondev.org/browse/FOR-122">FOR-122</link>.</li><li><icon alt="update" src="images/update.jpg"/>
          Enhance the document2pod functionality to handle many other elements
          and enable the link to this format to be configured via skinconf.
          See the issue report for some notes.

Modified: forrest/site/contrib.html
==============================================================================
--- forrest/site/contrib.html	(original)
+++ forrest/site/contrib.html	Fri Sep 24 23:08:21 2004
@@ -5,7 +5,7 @@
 <meta content="Apache Forrest" name="Generator">
 <meta name="Forrest-version" content="0.6-dev">
 <meta name="Forrest-skin-name" content="pelt">
-<title>Contributing to Forrest</title>
+<title>Contributing to Apache Forrest</title>
 <link type="text/css" href="skin/basic.css" rel="stylesheet">
 <link media="screen" type="text/css" href="skin/screen.css" rel="stylesheet">
 <link media="print" type="text/css" href="skin/print.css" rel="stylesheet">
@@ -151,11 +151,11 @@
 	          &nbsp;<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
 	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
 </div>
-<h1>Contributing to Forrest</h1>
+<h1>Contributing to Apache Forrest</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#Introduction">Introduction</a>
+<a href="#introduction">Introduction</a>
 </li>
 <li>
 <a href="#wanted">Help Wanted Here</a>
@@ -170,12 +170,15 @@
 <a href="#procedure">Procedure for Raising Development Issues</a>
 </li>
 <li>
+<a href="#patch">How to prepare and contribute patches</a>
+</li>
+<li>
 <a href="#tips">Contribution Notes and Tips</a>
 </li>
 </ul>
 </div>
     
-<a name="N1000D"></a><a name="Introduction"></a>
+<a name="N1000D"></a><a name="introduction"></a>
 <h2 class="underlined_10">Introduction</h2>
 <div class="section">
 <p> The Forrest Project is an <a class="external" href="http://www.opensource.org/">Open Source</a> volunteer project released
@@ -316,7 +319,39 @@
 </div>
 
     
-<a name="N100AF"></a><a name="tips"></a>
+<a name="N100AF"></a><a name="patch"></a>
+<h2 class="underlined_10">How to prepare and contribute patches</h2>
+<div class="section">
+<p>If you use the current development version of Forrest, then do
+       '<span class="codefrag">svn update; svn status</span>' to see what files that you
+       have changed.
+       Do '<span class="codefrag">svn diff &gt; mypatch.txt</span>' to make a patch which
+       includes every change. To make a patch for a specific file, do
+       <span class="codefrag">svn diff src/documentation/content/xdocs/faq.xml &gt; faq.xml.diff</span>'.
+       For more information about working with SVN, see
+       <a class="external" href="http://svnbook.red-bean.com/">Version Control with
+       Subversion</a> - the opensource SVN book.
+      </p>
+<p>If you use a downloaded released version of Forrest, then do
+        '<span class="codefrag">diff -u faq.xml.orig faq.xml &gt; faq.xml.diff</span>'
+      </p>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">Please send all contributions via our
+        <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a>.
+      </div>
+</div>
+<p>
+        It is always a good idea to check the Forrest
+        <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a>
+        and 
+        <a href="todo.html">to do list</a>
+        before diving in.
+      </p>
+</div>
+
+    
+<a name="N100DE"></a><a name="tips"></a>
 <h2 class="underlined_10">Contribution Notes and Tips</h2>
 <div class="section">
 <p> This is a collection of tips for contributing to the project in a
@@ -343,7 +378,7 @@
           unanswered. </li>
         
 <li> Prepend your email subject line with a marker when that is
-          appropriate, e.g. <span class="codefrag">[Patch]</span>, <span class="codefrag">[Proposal]</span>,
+          appropriate, e.g. <span class="codefrag">[Proposal]</span>,
           <span class="codefrag">[RT]</span> (Random Thought which quickly blossom into research topics
           :-), <span class="codefrag">[STATUS]</span> (development status of a certain facility). </li>
         

Modified: forrest/site/contrib.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/docs/faq-v20.dtdx.html
==============================================================================
--- forrest/site/docs/faq-v20.dtdx.html	(original)
+++ forrest/site/docs/faq-v20.dtdx.html	Fri Sep 24 23:08:21 2004
@@ -280,12 +280,6 @@
 <a href="#a"></a>
 </li>
 <li>
-<a href="#jump"></a>
-</li>
-<li>
-<a href="#fork"></a>
-</li>
-<li>
 <a href="#br"></a>
 </li>
 <li>
@@ -420,12 +414,6 @@
 <div class="section">
 <ul>
 <li>
-<a href="#jump">jump</a>
-</li>
-<li>
-<a href="#fork">fork</a>
-</li>
-<li>
 <a href="#document">document</a>
 </li>
 <li>
@@ -433,7 +421,7 @@
 </li>
 </ul>
 </div>
-<a name="N1001D"></a><a name="List+of+elements"></a>
+<a name="N10015"></a><a name="List+of+elements"></a>
 <h2 class="underlined_10">List of elements</h2>
 <div class="section">
 <ul>
@@ -504,9 +492,6 @@
 <a href="#footer">footer</a>
 </li>
 <li>
-<a href="#fork">fork</a>
-</li>
-<li>
 <a href="#header">header</a>
 </li>
 <li>
@@ -516,9 +501,6 @@
 <a href="#img">img</a>
 </li>
 <li>
-<a href="#jump">jump</a>
-</li>
-<li>
 <a href="#legal">legal</a>
 </li>
 <li>
@@ -592,10 +574,10 @@
 </li>
 </ul>
 </div>
-<a name="N100EE"></a><a name="Element+declarations"></a>
+<a name="N100DE"></a><a name="Element+declarations"></a>
 <h2 class="underlined_10">Element declarations</h2>
 <div class="section">
-<a name="N100F2"></a><a name="person"></a>
+<a name="N100E2"></a><a name="person"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -620,18 +602,23 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">name</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">name</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
         required attribute<br>
 </td>
 </tr>
 <tr>
-<td valign="top">email</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">email</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
         required attribute<br>
 </td>
@@ -651,7 +638,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10163"></a><a name="strong"></a>
+<a name="N10160"></a><a name="strong"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -676,7 +663,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -689,13 +681,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1023D"></a><a name="em"></a>
+<a name="N1023F"></a><a name="em"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -720,7 +712,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -733,13 +730,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10317"></a><a name="code"></a>
+<a name="N1031E"></a><a name="code"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -764,7 +761,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -777,13 +779,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N103C9"></a><a name="sup"></a>
+<a name="N103D5"></a><a name="sup"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -808,51 +810,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
-</table>
-</td>
-</tr>
-<tr>
-<td colspan="3">
-<hr noshade="noshade" width="100%">
-</td>
-</tr>
-<tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
-</tr>
 <tr>
-<td colspan="3">&nbsp;</td>
-</tr>
-</table>
-<a name="N1047B"></a><a name="sub"></a>
-<h3 class="underlined_5"></h3>
-<table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
-<tr>
-<td colspan="3"><span class="dtdTag">sub</span></td>
-</tr>
-<tr>
-<td nowrap="nowrap" valign="top"><b>Content model&nbsp;</b></td><td colspan="2" width="100%">( 
-  #PCDATA
- )</td>
-</tr>
-<tr>
-<td colspan="3">
-<hr noshade="noshade" width="100%">
-</td>
-</tr>
-<tr>
-<td valign="top"><b>Attributes</b></td><td colspan="2" width="100%">
-<table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
-<tr>
-<td bgcolor="#F1F7FF" valign="top">id</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
-        type: ID<br>
-</td>
-</tr>
-<tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -865,22 +828,22 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1052D"></a><a name="a"></a>
+<a name="N1048C"></a><a name="sub"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
-<td colspan="3"><span class="dtdTag">a</span></td>
+<td colspan="3"><span class="dtdTag">sub</span></td>
 </tr>
 <tr>
 <td nowrap="nowrap" valign="top"><b>Content model&nbsp;</b></td><td colspan="2" width="100%">( 
   #PCDATA
- | <a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#code">code</a> | <a href="#sub">sub</a> | <a href="#sup">sup</a> | <a href="#br">br</a> | <a href="#img">img</a> | <a href="#icon">icon</a> | <a href="#acronym">acronym</a> ) *</td>
+ )</td>
 </tr>
 <tr>
 <td colspan="3">
@@ -896,19 +859,13 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">href</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
-        type: CDATA<br>
-        required attribute<br>
-</td>
-</tr>
-<tr>
-<td valign="top">title</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
-        type: CDATA<br>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
 </td>
 </tr>
 </table>
@@ -920,17 +877,17 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#subtitle">subtitle</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1060C"></a><a name="jump"></a>
+<a name="N10543"></a><a name="a"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
-<td colspan="3"><span class="dtdTag">jump</span></td>
+<td colspan="3"><span class="dtdTag">a</span></td>
 </tr>
 <tr>
 <td nowrap="nowrap" valign="top"><b>Content model&nbsp;</b></td><td colspan="2" width="100%">( 
@@ -951,70 +908,42 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">href</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">href</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
         required attribute<br>
 </td>
 </tr>
 <tr>
-<td valign="top">title</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">title</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
 </td>
 </tr>
 </table>
 </td>
 </tr>
-</table>
-<a name="N1068A"></a><a name="fork"></a>
-<h3 class="underlined_5"></h3>
-<table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
-<tr>
-<td colspan="3"><span class="dtdTag">fork</span></td>
-</tr>
-<tr>
-<td nowrap="nowrap" valign="top"><b>Content model&nbsp;</b></td><td colspan="2" width="100%">( 
-  #PCDATA
- | <a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#code">code</a> | <a href="#sub">sub</a> | <a href="#sup">sup</a> | <a href="#br">br</a> | <a href="#img">img</a> | <a href="#icon">icon</a> | <a href="#acronym">acronym</a> ) *</td>
-</tr>
 <tr>
 <td colspan="3">
 <hr noshade="noshade" width="100%">
 </td>
 </tr>
 <tr>
-<td valign="top"><b>Attributes</b></td><td colspan="2" width="100%">
-<table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
-<tr>
-<td bgcolor="#F1F7FF" valign="top">id</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
-        type: ID<br>
-</td>
-</tr>
-<tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
-        type: NMTOKEN<br>
-</td>
-</tr>
-<tr>
-<td bgcolor="#F1F7FF" valign="top">href</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
-        type: CDATA<br>
-        required attribute<br>
-</td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
-<td valign="top">title</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
-        type: CDATA<br>
-</td>
-</tr>
-</table>
-</td>
+<td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10708"></a><a name="br"></a>
+<a name="N1062F"></a><a name="br"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1039,7 +968,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1052,13 +986,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N107B6"></a><a name="img"></a>
+<a name="N106E2"></a><a name="img"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1115,7 +1049,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1128,13 +1067,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N108AD"></a><a name="icon"></a>
+<a name="N107DE"></a><a name="icon"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1181,7 +1120,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1194,13 +1138,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1098D"></a><a name="acronym"></a>
+<a name="N108C3"></a><a name="acronym"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1231,7 +1175,12 @@
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1244,13 +1193,13 @@
 </td>
 </tr>
 <tr>
-<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#jump">jump</a> | <a href="#fork">fork</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
+<td nowrap="nowrap" valign="top"><b>Used inside</b></td><td width="100%"><a href="#strong">strong</a> | <a href="#em">em</a> | <a href="#a">a</a> | <a href="#p">p</a> | <a href="#source">source</a> | <a href="#note">note</a> | <a href="#warning">warning</a> | <a href="#fixme">fixme</a> | <a href="#caption">caption</a> | <a href="#th">th</a> | <a href="#td">td</a> | <a href="#li">li</a> | <a href="#dt">dt</a> | <a href="#dd">dd</a> | <a href="#title">title</a> | <a href="#notice">notice</a> | <a href="#abstract">abstract</a> | <a href="#legal">legal</a> | <a href="#question">question</a> | <a href="#elaboration">elaboration</a> | <a href="#answer">answer</a></td>
 </tr>
 <tr>
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10A4A"></a><a name="p"></a>
+<a name="N10982"></a><a name="p"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1275,12 +1224,17 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:space</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">xml:space</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         possible values: default preserve <br>
 </td>
 </tr>
@@ -1299,7 +1253,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10AED"></a><a name="source"></a>
+<a name="N10A2F"></a><a name="source"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1324,12 +1278,17 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:space</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">xml:space</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         default value: preserve<br>
         fixed value: preserve<br>
         possible values: default preserve <br>
@@ -1350,7 +1309,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10B94"></a><a name="note"></a>
+<a name="N10AE0"></a><a name="note"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1370,11 +1329,21 @@
 <td valign="top"><b>Attributes</b></td><td colspan="2" width="100%">
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
-<td bgcolor="#F1F7FF" valign="top">id</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">label</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: CDATA<br>
+</td>
+</tr>
+<tr>
+<td valign="top">id</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: ID<br>
 </td>
 </tr>
 <tr>
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
 <td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
@@ -1394,7 +1363,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10C2A"></a><a name="warning"></a>
+<a name="N10B8D"></a><a name="warning"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1414,11 +1383,21 @@
 <td valign="top"><b>Attributes</b></td><td colspan="2" width="100%">
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
-<td bgcolor="#F1F7FF" valign="top">id</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">label</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: CDATA<br>
+</td>
+</tr>
+<tr>
+<td valign="top">id</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: ID<br>
 </td>
 </tr>
 <tr>
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
 <td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
@@ -1438,7 +1417,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10CC0"></a><a name="fixme"></a>
+<a name="N10C3A"></a><a name="fixme"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1469,7 +1448,12 @@
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1488,7 +1472,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10D65"></a><a name="table"></a>
+<a name="N10CE9"></a><a name="table"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1511,7 +1495,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1530,7 +1519,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10DDB"></a><a name="caption"></a>
+<a name="N10D6C"></a><a name="caption"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1555,7 +1544,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1574,7 +1568,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10E59"></a><a name="tr"></a>
+<a name="N10DF7"></a><a name="tr"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1597,7 +1591,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1616,7 +1615,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10EB7"></a><a name="th"></a>
+<a name="N10E62"></a><a name="th"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1641,18 +1640,23 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">colspan</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">colspan</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
         default value: 1<br>
 </td>
 </tr>
 <tr>
-<td valign="top">rowspan</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">rowspan</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
         default value: 1<br>
 </td>
@@ -1672,7 +1676,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N10F7C"></a><a name="td"></a>
+<a name="N10F34"></a><a name="td"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1697,18 +1701,23 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">colspan</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">colspan</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
         default value: 1<br>
 </td>
 </tr>
 <tr>
-<td valign="top">rowspan</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">rowspan</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
         default value: 1<br>
 </td>
@@ -1728,7 +1737,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11041"></a><a name="li"></a>
+<a name="N11006"></a><a name="li"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1753,7 +1762,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1772,7 +1786,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N110EF"></a><a name="ul"></a>
+<a name="N110C1"></a><a name="ul"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1795,12 +1809,17 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">spacing</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">spacing</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         possible values: normal compact <br>
 </td>
 </tr>
@@ -1819,7 +1838,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1116E"></a><a name="ol"></a>
+<a name="N1114A"></a><a name="ol"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1842,12 +1861,17 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">spacing</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">spacing</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         possible values: normal compact <br>
 </td>
 </tr>
@@ -1866,7 +1890,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N111ED"></a><a name="dl"></a>
+<a name="N111D3"></a><a name="dl"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1889,7 +1913,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1908,7 +1937,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11263"></a><a name="dt"></a>
+<a name="N11256"></a><a name="dt"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -1933,7 +1962,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1977,7 +2011,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -1996,7 +2035,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1138B"></a><a name="figure"></a>
+<a name="N11398"></a><a name="figure"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2058,7 +2097,12 @@
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2077,7 +2121,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1144F"></a><a name="anchor"></a>
+<a name="N11466"></a><a name="anchor"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2103,7 +2147,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2122,7 +2171,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N114BF"></a><a name="document"></a>
+<a name="N114E3"></a><a name="document"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2145,7 +2194,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2153,7 +2207,7 @@
 </td>
 </tr>
 </table>
-<a name="N1150C"></a><a name="header"></a>
+<a name="N1153D"></a><a name="header"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2176,7 +2230,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2195,7 +2254,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11582"></a><a name="title"></a>
+<a name="N115C0"></a><a name="title"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2220,7 +2279,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2239,7 +2303,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1160C"></a><a name="subtitle"></a>
+<a name="N11657"></a><a name="subtitle"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2264,7 +2328,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2283,7 +2352,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11676"></a><a name="version"></a>
+<a name="N116CE"></a><a name="version"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2308,27 +2377,32 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">major</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">major</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
 </td>
 </tr>
 <tr>
-<td valign="top">minor</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">minor</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">fix</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td valign="top">fix</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: CDATA<br>
 </td>
 </tr>
 <tr>
-<td valign="top">tag</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td bgcolor="#F1F7FF" valign="top">tag</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: CDATA<br>
 </td>
 </tr>
@@ -2347,7 +2421,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N116FA"></a><a name="type"></a>
+<a name="N1175F"></a><a name="type"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2372,7 +2446,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2391,7 +2470,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11750"></a><a name="authors"></a>
+<a name="N117C2"></a><a name="authors"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2414,7 +2493,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2433,7 +2517,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N117AE"></a><a name="notice"></a>
+<a name="N1182D"></a><a name="notice"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2458,7 +2542,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2477,7 +2566,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1182C"></a><a name="abstract"></a>
+<a name="N118B8"></a><a name="abstract"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2502,7 +2591,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2521,7 +2615,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N118AA"></a><a name="meta"></a>
+<a name="N11943"></a><a name="meta"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2552,7 +2646,12 @@
 </td>
 </tr>
 <tr>
-<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+<td bgcolor="#F1F7FF" valign="top">class</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2571,7 +2670,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N1190F"></a><a name="body"></a>
+<a name="N119B2"></a><a name="body"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2594,7 +2693,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2613,7 +2717,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11995"></a><a name="section"></a>
+<a name="N11A45"></a><a name="section"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2636,7 +2740,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2655,7 +2764,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11A23"></a><a name="footer"></a>
+<a name="N11AE0"></a><a name="footer"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2676,7 +2785,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11A53"></a><a name="legal"></a>
+<a name="N11B10"></a><a name="legal"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2701,7 +2810,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2720,7 +2834,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11AD1"></a><a name="faqs"></a>
+<a name="N11B9B"></a><a name="faqs"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2743,7 +2857,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2751,7 +2870,7 @@
 </td>
 </tr>
 </table>
-<a name="N11B22"></a><a name="faqsection"></a>
+<a name="N11BF9"></a><a name="faqsection"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2774,7 +2893,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2793,7 +2917,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11B88"></a><a name="faq"></a>
+<a name="N11C6C"></a><a name="faq"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2816,7 +2940,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2835,7 +2964,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11BEA"></a><a name="question"></a>
+<a name="N11CDB"></a><a name="question"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2860,7 +2989,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2879,7 +3013,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11C6C"></a><a name="elaboration"></a>
+<a name="N11D6A"></a><a name="elaboration"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>
@@ -2904,7 +3038,12 @@
 </td>
 </tr>
 <tr>
-<td valign="top">xml:lang</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+<td valign="top">class</td><td>&nbsp;&nbsp;&nbsp;&nbsp;</td><td width="100%">
+        type: NMTOKEN<br>
+</td>
+</tr>
+<tr>
+<td bgcolor="#F1F7FF" valign="top">xml:lang</td><td bgcolor="#F1F7FF">&nbsp;&nbsp;&nbsp;&nbsp;</td><td bgcolor="#F1F7FF" width="100%">
         type: NMTOKEN<br>
 </td>
 </tr>
@@ -2923,7 +3062,7 @@
 <td colspan="3">&nbsp;</td>
 </tr>
 </table>
-<a name="N11CEA"></a><a name="answer"></a>
+<a name="N11DF5"></a><a name="answer"></a>
 <h3 class="underlined_5"></h3>
 <table class="dtdElement" cellspacing="0" cellpadding="0" border="0">
 <tr>

Modified: forrest/site/docs/faq-v20.dtdx.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/faq.html
==============================================================================
--- forrest/site/faq.html	(original)
+++ forrest/site/faq.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -278,10 +278,15 @@
       </a>
 </li>
 <li>
-<a href="#xsp">2.12. How do I enable XSP processing?</a>
+<a href="#label-entity">2.12. 
+        How to use special characters in the labels of the site.xml file?
+      </a>
+</li>
+<li>
+<a href="#xsp">2.13. How do I enable XSP processing?</a>
 </li>
 <li>
-<a href="#breadcrumbs">2.13. How do breadcrumbs work?  Why don't they work locally?</a>
+<a href="#breadcrumbs">2.14. How do breadcrumbs work?  Why don't they work locally?</a>
 </li>
 </ul>
 </li>
@@ -342,7 +347,12 @@
 </li>
 <li>
 <a href="#how_can_I_help">4.5. 
-        How can I help?
+        How to help?
+      </a>
+</li>
+<li>
+<a href="#patch">4.6. 
+        How to contribute a patch?
       </a>
 </li>
 </ul>
@@ -379,7 +389,7 @@
 <p>
           The documentation on the Forrest website relates to the current
           head development version of the source repository. See
-          <a href="index.html#website-status">further explanation</a>.
+          <a href="index.html#status">further explanation</a>.
         </p>
 </div>
 <a name="N10028"></a><a name="requirements"></a>
@@ -735,8 +745,30 @@
           local DTDs</a>.
         </p>
 </div>
-<a name="N10194"></a><a name="xsp"></a>
-<h4 class="faq">2.12. How do I enable XSP processing?</h4>
+<a name="N10194"></a><a name="label-entity"></a>
+<h4 class="faq">2.12. 
+        How to use special characters in the labels of the site.xml file?
+      </h4>
+<div align="right">
+<a href="#label-entity-menu">^</a>
+</div>
+<div style="margin-left: 15px">
+<p>
+        Use the numeric values for character entities.
+        For example, rather than using
+        <span class="codefrag">&amp;ouml;</span> use
+        <span class="codefrag">&amp;#246;</span>
+        
+</p>
+<p>
+        See the
+        <a class="external" href="http://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_xhtml_character_entities">XHTML Character Entities</a>
+        and see more discussion at
+        <a class="external" href="http://issues.cocoondev.org/browse/FOR-244">Issue FOR-244</a>.
+        </p>
+</div>
+<a name="N101AD"></a><a name="xsp"></a>
+<h4 class="faq">2.13. How do I enable XSP processing?</h4>
 <div align="right">
 <a href="#xsp-menu">^</a>
 </div>
@@ -782,8 +814,8 @@
 <p>See also the 
         <a class="external" href="http://wiki.apache.org/cocoon/AddingXSPToForrest">AddingXSPToForrest</a> Wiki page.</p>
 </div>
-<a name="N101C9"></a><a name="breadcrumbs"></a>
-<h4 class="faq">2.13. How do breadcrumbs work?  Why don't they work locally?</h4>
+<a name="N101E2"></a><a name="breadcrumbs"></a>
+<h4 class="faq">2.14. How do breadcrumbs work?  Why don't they work locally?</h4>
 <div align="right">
 <a href="#breadcrumbs-menu">^</a>
 </div>
@@ -804,9 +836,9 @@
       in <span class="codefrag">skinconf.xml</span>.
       </p>
 </div>
-<a name="N101DE"></a><a name="old_faqs"></a>
+<a name="N101F7"></a><a name="old_faqs"></a>
 <h3 class="underlined_5">3. Older versions</h3>
-<a name="N101E2"></a><a name="unresolved_project.home"></a>
+<a name="N101FB"></a><a name="unresolved_project.home"></a>
 <h4 class="faq">3.1. When invoking Forrest 0.4 from the
         forrest.antproxy.xml, the build fails because
         ${project.home} isn't resolved.
@@ -828,7 +860,7 @@
        &lt;classpath refid="forrest-classpath"/&gt;
        &lt;jvmarg value="-Dforrest.home=${forrest.home}"/&gt;</pre>
 </div>
-<a name="N101F7"></a><a name="odd_html"></a>
+<a name="N10210"></a><a name="odd_html"></a>
 <h4 class="faq">3.2. 
         After upgrading to 0.4 my HTML looks significantly different, and table
         widths are wrong. What happened?
@@ -851,7 +883,7 @@
 <pre class="code">
   &lt;doctype-system&gt;http://www.w3.org/TR/html4/loose.dtd&lt;/doctype-system&gt;</pre>
 </div>
-<a name="N1020D"></a><a name="validation_error-doctype_root_null"></a>
+<a name="N10226"></a><a name="validation_error-doctype_root_null"></a>
 <h4 class="faq">3.3. 
         When building my project, I get an validation error: Document root
           element "site", must match DOCTYPE root "null"..
@@ -874,7 +906,7 @@
           listed to prevent an attempt at DTD-based validation.
         </p>
 </div>
-<a name="N1022A"></a><a name="building_error-custom_sitemap"></a>
+<a name="N10243"></a><a name="building_error-custom_sitemap"></a>
 <h4 class="faq">3.4. 
         When building my project, I get any of these errors: 
 	menu.xmap (The system cannot find the file specified)
@@ -890,9 +922,9 @@
           <a href="docs/upgrading_05.html">Upgrading to Forrest 0.5</a>).
         </p>
 </div>
-<a name="N1023F"></a><a name="general"></a>
+<a name="N10258"></a><a name="general"></a>
 <h3 class="underlined_5">4. General</h3>
-<a name="N10243"></a><a name="generating_menus"></a>
+<a name="N1025C"></a><a name="generating_menus"></a>
 <h4 class="faq">4.1. What is the relationship between site.xml and
         book.xml?
       </h4>
@@ -911,7 +943,7 @@
           See <a href="docs/linking.html">Menus and Linking</a>.
       </p>
 </div>
-<a name="N1025E"></a><a name="docbook"></a>
+<a name="N10277"></a><a name="docbook"></a>
 <h4 class="faq">4.2. 
         How do I use DocBook as the xml documentation format?
       </h4>
@@ -965,7 +997,7 @@
          for configuration guidance.
         </p>
 </div>
-<a name="N1027F"></a><a name="version"></a>
+<a name="N10298"></a><a name="version"></a>
 <h4 class="faq">4.3. 
         How to report which version of Forrest is being used and the
         properties that are set?
@@ -984,7 +1016,7 @@
           Doing <span class="codefrag">'forrest -v'</span> will provide verbose build messages.
         </p>
 </div>
-<a name="N10293"></a><a name="logs"></a>
+<a name="N102AC"></a><a name="logs"></a>
 <h4 class="faq">4.4. 
         Where are the log files to find more infomation about errors?
       </h4>
@@ -1013,9 +1045,9 @@
           to the standard output.
         </p>
 </div>
-<a name="N102B7"></a><a name="how_can_I_help"></a>
+<a name="N102D0"></a><a name="how_can_I_help"></a>
 <h4 class="faq">4.5. 
-        How can I help?
+        How to help?
       </h4>
 <div align="right">
 <a href="#how_can_I_help-menu">^</a>
@@ -1029,11 +1061,27 @@
           blinds software developers to faults that are obvious to everyone
           else. Don't be shy!
         </p>
-<p>
-          More info about contributing can be found at the 
-          <a href="contrib.html">Contributing to Forrest</a> page.  Its always
-          a good idea to check the Forrest <a href="todo.html">to do</a>
-          list before diving in.
+</div>
+<a name="N102DC"></a><a name="patch"></a>
+<h4 class="faq">4.6. 
+        How to contribute a patch?
+      </h4>
+<div align="right">
+<a href="#patch-menu">^</a>
+</div>
+<div style="margin-left: 15px">
+<p>Please send all contributions via our
+          <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a>.
+          Here are notes about
+          <a href="contrib.html#patch">making patches</a>.
+        </p>
+<p>More info about contributing can be found at the 
+          <a href="contrib.html">Contributing to Forrest</a> page.
+          It is always a good idea to check the Forrest
+          <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a>
+          and 
+          <a href="todo.html">to do list</a>
+          before diving in.
         </p>
 </div>
 </div>

Modified: forrest/site/faq.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/faq.xml
==============================================================================
--- forrest/site/faq.xml	(original)
+++ forrest/site/faq.xml	Fri Sep 24 23:08:21 2004
@@ -24,7 +24,7 @@
         <p>
           The documentation on the Forrest website relates to the current
           head development version of the source repository. See
-          <link href="index.html#website-status">further explanation</link>.
+          <link href="index.html#status">further explanation</link>.
         </p>
       </section><section id="requirements"><title>1.3. 
         What are the system requirements for Forrest?
@@ -267,7 +267,22 @@
           <link href="site:catalog">Using Catalog Entity Resolver for
           local DTDs</link>.
         </p>
-      </section><section id="xsp"><title>2.12. How do I enable <acronym title="eXtensible Server Pages">XSP</acronym> processing?</title>
+      </section><section id="label-entity"><title>2.12. 
+        How to use special characters in the labels of the site.xml file?
+      </title>
+        <p>
+        Use the numeric values for character entities.
+        For example, rather than using
+        <code>&amp;ouml;</code> use
+        <code>&amp;#246;</code>
+        </p>
+        <p>
+        See the
+        <link href="http://www.w3.org/TR/xhtml-modularization/dtd_module_defs.html#a_xhtml_character_entities">XHTML Character Entities</link>
+        and see more discussion at
+        <link href="http://issues.cocoondev.org/browse/FOR-244">Issue FOR-244</link>.
+        </p>
+      </section><section id="xsp"><title>2.13. How do I enable <acronym title="eXtensible Server Pages">XSP</acronym> processing?</title>
         <p>First consider whether your needs would be better met by Cocoon itself, rather than Forrest.
         </p>
         <p>That said, there are valid reasons for wanting programmatically generated content, so here is how to enable
@@ -297,7 +312,7 @@
         </ol>
         <p>See also the 
         <link href="http://wiki.apache.org/cocoon/AddingXSPToForrest">AddingXSPToForrest</link> Wiki page.</p>
-      </section><section id="breadcrumbs"><title>2.13. How do breadcrumbs work?  Why don't they work locally?</title>
+      </section><section id="breadcrumbs"><title>2.14. How do breadcrumbs work?  Why don't they work locally?</title>
       <p>Breadcrumbs begin with up to three URLs specified in
       <code>skinconf.xml</code>.  Here is what the Forrest site uses:</p>
       <source xml:space="preserve">
@@ -470,7 +485,7 @@
           to the standard output.
         </p>
       </section><section id="how_can_I_help"><title>4.5. 
-        How can I help?
+        How to help?
       </title>
         <p>
           Join one of the Forrest project
@@ -480,10 +495,20 @@
           blinds software developers to faults that are obvious to everyone
           else. Don't be shy!
         </p>
-        <p>
-          More info about contributing can be found at the 
-          <link href="site:contrib">Contributing to Forrest</link> page.  Its always
-          a good idea to check the Forrest <link href="site:todo">to do</link>
-          list before diving in.
+      </section><section id="patch"><title>4.6. 
+        How to contribute a patch?
+      </title>
+        <p>Please send all contributions via our
+          <link href="site:bugs">issue tracker</link>.
+          Here are notes about
+          <link href="site:contrib/patch">making patches</link>.
+        </p>
+        <p>More info about contributing can be found at the 
+          <link href="site:contrib">Contributing to Forrest</link> page.
+          It is always a good idea to check the Forrest
+          <link href="site:bugs">issue tracker</link>
+          and 
+          <link href="site:todo">to do list</link>
+          before diving in.
         </p>
       </section></section></section></body></document>

Modified: forrest/site/forrest-issues.html
==============================================================================
--- forrest/site/forrest-issues.html	(original)
+++ forrest/site/forrest-issues.html	Fri Sep 24 23:08:21 2004
@@ -155,18 +155,6 @@
 <div id="minitoc-area">
 <ul class="minitoc">
 <li>
-<a href="#%5BFOR-297%5D+Use+Cocoon+from+branch+2.1+in+Forrest">[FOR-297] Use Cocoon from branch 2.1 in Forrest</a>
-</li>
-<li>
-<a href="#%5BFOR-293%5D+HTML+links+and+menus+are+not+being+generated+properly">[FOR-293] HTML links and menus are not being generated properly</a>
-</li>
-<li>
-<a href="#%5BFOR-277%5D+investiagte+use+of+forrest-0.6-dev+as+webapp+with+Tomcat+5">[FOR-277] investiagte use of forrest-0.6-dev as webapp with Tomcat 5</a>
-</li>
-<li>
-<a href="#%5BFOR-245%5D+changing+skins+and+going+out+in+the+public+view">[FOR-245] changing skins and going out in the public view</a>
-</li>
-<li>
 <a href="#%5BFOR-238%5D+HTML+serialization+has+no+space+between+publicId+and+systemId">[FOR-238] HTML serialization has no space between publicId and systemId</a>
 </li>
 <li>
@@ -182,57 +170,7 @@
        <a class="external" href="http://issues.cocoondev.org/secure/IssueNavigator.jspa?pid=10000&resolutionIds=-1&tempMax=1000&reset=true">all</a> open issues).
       The listing below is regenerated on each Forrest run.</div>
 </div>
-<a name="N10011"></a><a name="%5BFOR-297%5D+Use+Cocoon+from+branch+2.1+in+Forrest"></a>
-<h2 class="underlined_10">[FOR-297] Use Cocoon from branch 2.1 in Forrest</h2>
-<div class="section">
-<p>
-<a class="external" href="http://issues.cocoondev.org//browse/FOR-297">http://issues.cocoondev.org//browse/FOR-297</a>
-</p>
-<p>Need to put the passthrough code in the branch from the trunk, make teh jar, and revert the changes in the Forrest base sitemap.xmap and the LocationMap Java code done to work with trunk.</p>
-</div>
-<a name="N1001F"></a><a name="%5BFOR-293%5D+HTML+links+and+menus+are+not+being+generated+properly"></a>
-<h2 class="underlined_10">[FOR-293] HTML links and menus are not being generated properly</h2>
-<div class="section">
-<p>
-<a class="external" href="http://issues.cocoondev.org//browse/FOR-293">http://issues.cocoondev.org//browse/FOR-293</a>
-</p>
-<p>The left side menus and generated links are very messed up in both the pelt and tigris skins.
-<br>
-
-<br>
-Best way to describe this is simply to SVN checkout the head (or revision 46191) and do a &quot;forrest seed site&quot;.  Try it under both the default pelt and tigris skins.
-<br>
-
-<br>
-The tigris skin makes the menu / generated link problem quite clear.</p>
-</div>
-<a name="N1002D"></a><a name="%5BFOR-277%5D+investiagte+use+of+forrest-0.6-dev+as+webapp+with+Tomcat+5"></a>
-<h2 class="underlined_10">[FOR-277] investiagte use of forrest-0.6-dev as webapp with Tomcat 5</h2>
-<div class="section">
-<p>
-<a class="external" href="http://issues.cocoondev.org//browse/FOR-277">http://issues.cocoondev.org//browse/FOR-277</a>
-</p>
-<p>Some people report having troubles running Forrest as a webapp under Tomcat. Needs investigation before 0.6 release.
-<br>
-
-<br>
-This is the background email to forrest-users:
-<br>
-&nbsp;<a href="http://mail-archives.apache.org/eyebrowse/ReadMsg?listId=260&msgNo=282">http://mail-archives.apache.org/eyebrowse/ReadMsg?listId=260&amp;msgNo=282</a>
-<br>
-&nbsp;Forrest 0.6 Interaction with Tomcat 5.0.27
-<br>
-&nbsp;Wed, 4 Aug 2004 10:18:34 -0500</p>
-</div>
-<a name="N1003B"></a><a name="%5BFOR-245%5D+changing+skins+and+going+out+in+the+public+view"></a>
-<h2 class="underlined_10">[FOR-245] changing skins and going out in the public view</h2>
-<div class="section">
-<p>
-<a class="external" href="http://issues.cocoondev.org//browse/FOR-245">http://issues.cocoondev.org//browse/FOR-245</a>
-</p>
-<p>It almost time to change the skin on our public Forrest website.</p>
-</div>
-<a name="N10049"></a><a name="%5BFOR-238%5D+HTML+serialization+has+no+space+between+publicId+and+systemId"></a>
+<a name="N10011"></a><a name="%5BFOR-238%5D+HTML+serialization+has+no+space+between+publicId+and+systemId"></a>
 <h2 class="underlined_10">[FOR-238] HTML serialization has no space between publicId and systemId</h2>
 <div class="section">
 <p>
@@ -246,7 +184,7 @@
 <br>
 </p>
 </div>
-<a name="N10057"></a><a name="%5BFOR-224%5D+All+documentation+needs+review%2C+to+be+up-to-date+with+copyless+procedure"></a>
+<a name="N1001F"></a><a name="%5BFOR-224%5D+All+documentation+needs+review%2C+to+be+up-to-date+with+copyless+procedure"></a>
 <h2 class="underlined_10">[FOR-224] All documentation needs review, to be up-to-date with copyless procedure</h2>
 <div class="section">
 <p>

Modified: forrest/site/forrest-issues.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/index.html
==============================================================================
--- forrest/site/index.html	(original)
+++ forrest/site/index.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -196,18 +196,13 @@
 <a href="#History">History</a>
 </li>
 <li>
-<a href="#Project+Status">Project Status</a>
-<ul class="minitoc">
-<li>
-<a href="#website-status">Website status</a>
-</li>
-</ul>
+<a href="#status">Project status and website status</a>
 </li>
 <li>
-<a href="#News+and+events">News and events</a>
+<a href="#news">News and events</a>
 </li>
 <li>
-<a href="#Help+Wanted%21">Help Wanted!</a>
+<a href="#help">Help Wanted!</a>
 </li>
 </ul>
 </div> 
@@ -215,7 +210,7 @@
 <a name="N1000D"></a><a name="Introduction"></a>
 <h2 class="underlined_10">Introduction</h2>
 <div class="section">
-<p>Forrest is an XML standards-oriented documentation framework
+<p>Apache Forrest is an XML standards-oriented documentation framework
         based on Apache Cocoon, providing XSLT stylesheets and schemas, images
         and other resources. Forrest uses these to render the XML source
         content into a website via command-line, robot, or a dynamic web
@@ -235,7 +230,7 @@
 <ul>
         
 <li>
-<strong>Step 1</strong>: Type <span class="codefrag">'forrest seed'</span>, to populate
+<strong>Step 1</strong>: Do <span class="codefrag">'forrest seed'</span> to populate
           the directory with template site structure and contents.</li>
         
 <li>
@@ -243,23 +238,31 @@
           task-specific, presentation-neutral XML.</li>
         
 <li>
-<strong>Step 3</strong>: Type <span class="codefrag">'forrest'</span> to generate a
-          complete website from the XML. Various website styles (known as skins)
-          are available, and custom skins can be developed.</li>
+<strong>Step 3</strong>: Do <span class="codefrag">'forrest run'</span> then use
+          the web browser to immediately review
+          changes at <span class="codefrag">http://localhost:8888/</span>
+        
+</li>
+        
+<li>
+<strong>Step 4</strong>: Do <span class="codefrag">'forrest'</span> to generate the
+          complete website from the XML sources.
+          Various styles (known as skins) are available. Custom skins
+          can be developed.</li>
+        
+<li>
+<strong>Step 5</strong>: For more information about installation
+          and use, see the 
+          <a href="docs/your-project.html">Using Forrest</a> guide.
+        </li>
       
 </ul>
-<div class="frame note">
-<div class="label">Note</div>
-<div class="content">For more information on Forrest installation and use, see the 
-      <a href="docs/your-project.html">Using Forrest</a> guide.
-      </div>
-</div>
 <p>
         Forrest's focus on low "startup cost" makes it ideal for rapid
         development of small sites, where time and budget constraints do not
         allow time-wasting HTML experiments. Of course, that same methodology
-        can be applied to large projects.
-        Your development team does not need Java experience or even XML skills,
+        can scale up to large projects.
+        Your development team does not need Java experience, or even XML skills,
         to use Forrest. The framework lets you concentrate on content and design.
       </p>
 <p>
@@ -274,7 +277,7 @@
       </p>
 </div>
     
-<a name="N1005E"></a><a name="Powerful"></a>
+<a name="N1006B"></a><a name="Powerful"></a>
 <h2 class="underlined_10">Powerful</h2>
 <div class="section">
 <p>
@@ -299,8 +302,8 @@
         </li>
         
 <li>SVG to PNG rendering (using <a class="external" href="http://xml.apache.org/batik/">Apache
-            Batik</a>); simply drop a SVG in the appropriate directory and it
-          will be rendered as PNG.</li>
+            Batik</a>). Simply drop the SVG in the appropriate directory
+            and it will be rendered as PNG.</li>
         
 <li>
           Transparent inclusion and aggregation of external content, like
@@ -323,7 +326,7 @@
         </li>
       
 </ul>
-<a name="N100AA"></a><a name="Static+or+Dynamic"></a>
+<a name="N100B7"></a><a name="Static+or+Dynamic"></a>
 <h3 class="underlined_5">Static or Dynamic</h3>
 <p>
           Unique amongst comparable documentation tools, Forrest generates
@@ -347,10 +350,10 @@
 </div>
 
     
-<a name="N100C2"></a><a name="History"></a>
+<a name="N100CF"></a><a name="History"></a>
 <h2 class="underlined_10">History</h2>
 <div class="section">
-<p>Forrest was started in January 2002, with the major use-case being to
+<p>Apache Forrest was started in January 2002, with the major use-case being to
         create a consistent and efficient 
         <a class="external" href="http://xml.apache.org/">xml.apache.org</a> group of project
         websites with a
@@ -360,17 +363,17 @@
         the name 'Forrest').
       </p>
 <p>
-        The focus shifted for Forrest to primarily be a generic documentation
+        The focus shifted for Apache Forrest to primarily be a generic documentation
         tool capable of meeting many needs. Certain relevant project management
         facilities are being added.
       </p>
 </div>
 
     
-<a name="N100D7"></a><a name="Project+Status"></a>
-<h2 class="underlined_10">Project Status</h2>
+<a name="N100E4"></a><a name="status"></a>
+<h2 class="underlined_10">Project status and website status</h2>
 <div class="section">
-<p>Forrest is currently progressing rapidly through a series of 0.x
+<p>Apache Forrest is currently progressing rapidly through a series of 0.x
         releases. It is certainly usable now (despite not yet being version 1.x).
          See the growing list of 
          <a href="live-sites.html">example sites</a> including
@@ -385,29 +388,25 @@
         adopters make, and will not make capricious or undocumented
         backwards-incompatible changes.
       </p>
-<a name="N100E7"></a><a name="website-status"></a>
-<h3 class="underlined_5">Website status</h3>
 <p>
-          The documentation on the Forrest website relates to the current
-          head development version of the source repository. Whatever version
-          of Forrest that you are using provides the local documentation for
-          that specific version.
-          Do '<a href="build.html#run">forrest run</a>'
-          to view it.
-        </p>
-<p>
-          The <a href="/">Forrest website</a> is updated
-          manually as needed, while we develop the 
-          <a href="docs/forrestbot.html">forrestbot</a> facility.
+        The documentation on the Apache Forrest website relates to the current
+        head development version of the source repository. Whatever version
+        of Forrest that you are using, will provide the local documentation for
+        that specific version.
+        Do '<a href="build.html#run">forrest run</a>'
+        to view it.
+        The <a href="/">Apache Forrest website</a> is updated
+        manually as needed, while we develop the 
+        <a href="docs/forrestbot.html">forrestbot</a> deployment facility.
            <!-- FIXME: It is out-of-date.
            which produces the
           <link href="http://forrestbot.cocoondev.org/">automatically
             generated</link> site.
             -->
-        </p>
+      </p>
 </div>
     
-<a name="N10103"></a><a name="News+and+events"></a>
+<a name="N10106"></a><a name="news"></a>
 <h2 class="underlined_10">News and events</h2>
 <div class="section">
 <ul>
@@ -417,20 +416,20 @@
          which has many efficiency and usability improvements.
         </li>
         
-<li>Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
-         tab and menu system, numerous skin improvements, DocBook support,
-         Wiki support, improved PDF output, eased maintenance of sitemaps,
-         and more.
+<li>Apache Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
+         tab and menu system, numerous skin improvements, support for a sub-set
+         of DocBook and Wiki source formats,
+         improved PDF output, eased maintenance of sitemaps, and more.
         </li>
       
 </ul>
 </div>
     
-<a name="N10113"></a><a name="Help+Wanted%21"></a>
+<a name="N10116"></a><a name="help"></a>
 <h2 class="underlined_10">Help Wanted!</h2>
 <div class="section">
 <p>
-        Forrest is fairly new, and is in need of developers.  If you know (or
+        Apache Forrest is fairly new, and is in need of developers.  If you know (or
         want to learn) XML, Ant, HTML or CSS, then you are qualified to help!
       </p>
 <p>

Modified: forrest/site/index.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/index.xml
==============================================================================
--- forrest/site/index.xml	(original)
+++ forrest/site/index.xml	Fri Sep 24 23:08:21 2004
@@ -20,7 +20,7 @@
   <body> 
     <section>
       <title>Introduction</title>
-      <p>Forrest is an XML standards-oriented documentation framework
+      <p>Apache Forrest is an XML standards-oriented documentation framework
         based on Apache Cocoon, providing XSLT stylesheets and schemas, images
         and other resources. Forrest uses these to render the XML source
         content into a website via command-line, robot, or a dynamic web
@@ -36,23 +36,29 @@
         <strong>simple</strong>:
       </p>
       <ul>
-        <li><strong>Step 1</strong>: Type <code>'forrest seed'</code>, to populate
+        <li><strong>Step 1</strong>: Do <code>'forrest seed'</code> to populate
           the directory with template site structure and contents.</li>
         <li><strong>Step 2</strong>: Add content by editing docs in
           task-specific, presentation-neutral XML.</li>
-        <li><strong>Step 3</strong>: Type <code>'forrest'</code> to generate a
-          complete website from the XML. Various website styles (known as skins)
-          are available, and custom skins can be developed.</li>
+        <li><strong>Step 3</strong>: Do <code>'forrest run'</code> then use
+          the web browser to immediately review
+          changes at <code>http://localhost:8888/</code>
+        </li>
+        <li><strong>Step 4</strong>: Do <code>'forrest'</code> to generate the
+          complete website from the XML sources.
+          Various styles (known as skins) are available. Custom skins
+          can be developed.</li>
+        <li><strong>Step 5</strong>: For more information about installation
+          and use, see the 
+          <link href="site:your-project">Using Forrest</link> guide.
+        </li>
       </ul>
-      <note>For more information on Forrest installation and use, see the 
-      <link href="site:your-project">Using Forrest</link> guide.
-      </note>
       <p>
         Forrest's focus on low "startup cost" makes it ideal for rapid
         development of small sites, where time and budget constraints do not
         allow time-wasting HTML experiments. Of course, that same methodology
-        can be applied to large projects.
-        Your development team does not need Java experience or even XML skills,
+        can scale up to large projects.
+        Your development team does not need Java experience, or even XML skills,
         to use Forrest. The framework lets you concentrate on content and design.
       </p>
       <p>
@@ -87,8 +93,8 @@
           <link href="ext:fop">Apache FOP</link>).
         </li>
         <li>SVG to PNG rendering (using <link href="ext:batik">Apache
-            Batik</link>); simply drop a SVG in the appropriate directory and it
-          will be rendered as PNG.</li>
+            Batik</link>). Simply drop the SVG in the appropriate directory
+            and it will be rendered as PNG.</li>
         <li>
           Transparent inclusion and aggregation of external content, like
           <link href="site:changes-rss">RSS feeds</link>.
@@ -133,7 +139,7 @@
 
     <section>
       <title>History</title>
-      <p>Forrest was started in January 2002, with the major use-case being to
+      <p>Apache Forrest was started in January 2002, with the major use-case being to
         create a consistent and efficient 
         <link href="http://xml.apache.org/">xml.apache.org</link> group of project
         websites with a
@@ -143,15 +149,15 @@
         the name 'Forrest').
       </p>
       <p>
-        The focus shifted for Forrest to primarily be a generic documentation
+        The focus shifted for Apache Forrest to primarily be a generic documentation
         tool capable of meeting many needs. Certain relevant project management
         facilities are being added.
       </p>
     </section>
 
-    <section>
-      <title>Project Status</title>
-      <p>Forrest is currently progressing rapidly through a series of 0.x
+    <section id="status">
+      <title>Project status and website status</title>
+      <p>Apache Forrest is currently progressing rapidly through a series of 0.x
         releases. It is certainly usable now (despite not yet being version 1.x).
          See the growing list of 
          <link href="site:live-sites">example sites</link> including
@@ -166,46 +172,42 @@
         adopters make, and will not make capricious or undocumented
         backwards-incompatible changes.
       </p>
-      <section id="website-status">
-        <title>Website status</title>
-        <p>
-          The documentation on the Forrest website relates to the current
-          head development version of the source repository. Whatever version
-          of Forrest that you are using provides the local documentation for
-          that specific version.
-          Do '<link href="build.html#run">forrest run</link>'
-          to view it.
-        </p>
-        <p>
-          The <link href="ext:forrest">Forrest website</link> is updated
-          manually as needed, while we develop the 
-          <link href="site:forrestbot">forrestbot</link> facility.
+
+      <p>
+        The documentation on the Apache Forrest website relates to the current
+        head development version of the source repository. Whatever version
+        of Forrest that you are using, will provide the local documentation for
+        that specific version.
+        Do '<link href="build.html#run">forrest run</link>'
+        to view it.
+        The <link href="ext:forrest">Apache Forrest website</link> is updated
+        manually as needed, while we develop the 
+        <link href="site:forrestbot">forrestbot</link> deployment facility.
            <!-- FIXME: It is out-of-date.
            which produces the
           <link href="http://forrestbot.cocoondev.org/">automatically
             generated</link> site.
             -->
-        </p>
-      </section>
+      </p>
     </section>
-    <section>
+    <section id="news">
       <title>News and events</title>
       <ul>
         <li>The Forrest project has evolved to become a "top-level" Apache
          project. We are making good progress towards the 0.6 release
          which has many efficiency and usability improvements.
         </li>
-        <li>Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
-         tab and menu system, numerous skin improvements, DocBook support,
-         Wiki support, improved PDF output, eased maintenance of sitemaps,
-         and more.
+        <li>Apache Forrest 0.5 was released on 2003-09-13 - much faster, new flexible
+         tab and menu system, numerous skin improvements, support for a sub-set
+         of DocBook and Wiki source formats,
+         improved PDF output, eased maintenance of sitemaps, and more.
         </li>
       </ul>
     </section>
-    <section>
+    <section id="help">
       <title>Help Wanted!</title>
       <p>
-        Forrest is fairly new, and is in need of developers.  If you know (or
+        Apache Forrest is fairly new, and is in need of developers.  If you know (or
         want to learn) XML, Ant, HTML or CSS, then you are qualified to help!
       </p>
       <p>

Modified: forrest/site/license.html
==============================================================================
--- forrest/site/license.html	(original)
+++ forrest/site/license.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: forrest/site/linkmap.html
==============================================================================
--- forrest/site/linkmap.html	(original)
+++ forrest/site/linkmap.html	Fri Sep 24 23:08:21 2004
@@ -297,7 +297,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>
@@ -633,6 +633,10 @@
 <li>
 <a href="contrib.html">Contributing</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>contrib</em>
 </li>
+<ul>
+      
+    
+</ul>
     
 <li>
 <a href="build.html">Building Forrest</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>build</em>
@@ -688,7 +692,7 @@
 </li>
     
 <li>
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apache-stats</em>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>&nbsp;&nbsp;&nbsp;_________________________&nbsp;&nbsp;<em>apache-stats</em>
 </li>
   
 </ul>

Modified: forrest/site/linkmap.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/live-sites.html
==============================================================================
--- forrest/site/live-sites.html	(original)
+++ forrest/site/live-sites.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: forrest/site/mail-lists.html
==============================================================================
--- forrest/site/mail-lists.html	(original)
+++ forrest/site/mail-lists.html	Fri Sep 24 23:08:21 2004
@@ -199,15 +199,15 @@
 <div class="frame note">
 <div class="label">Note</div>
 <div class="content">
-      If contributing code patches, use <span class="codefrag">./build.sh patch</span> (or <span class="codefrag">build patch</span> in Windows)
-      to generate a patch file.   Then use our Jira <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a> to submit it (create
-      a new issue if appropriate).
+      Please use our Jira <a class="external" href="http://issues.cocoondev.org/secure/BrowseProject.jspa?id=10000">issue tracker</a>
+      to submit attachments, rather than the mailing list. Create a new
+      issue, if necessary.
       </div>
 </div>
 </div> 
 
     
-<a name="N10044"></a><a name="Lists"></a>
+<a name="N1003E"></a><a name="Lists"></a>
 <h2 class="underlined_10">Lists</h2>
 <div class="section">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -280,7 +280,7 @@
 </div>
 
     
-<a name="N100E8"></a><a name="Related+Mailing+Lists"></a>
+<a name="N100E2"></a><a name="Related+Mailing+Lists"></a>
 <h2 class="underlined_10">Related Mailing Lists</h2>
 <div class="section">
 <ul> 

Modified: forrest/site/mail-lists.pdf
==============================================================================
Binary files. No diff available.

Modified: forrest/site/menu-index.html
==============================================================================
--- forrest/site/menu-index.html	(original)
+++ forrest/site/menu-index.html	Fri Sep 24 23:08:21 2004
@@ -10,7 +10,7 @@
 </li>
     
 <li>
-<a href="license.html">License</a>
+<a href="license.html" title="Apache License 2.0">License</a>
 </li>
     
 <li>
@@ -62,7 +62,7 @@
 </li>
     
 <li>
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </li>
   
 </ul>

Modified: forrest/site/skin/basic.css
==============================================================================
--- forrest/site/skin/basic.css	(original)
+++ forrest/site/skin/basic.css	Fri Sep 24 23:08:21 2004
@@ -20,48 +20,48 @@
 img { border: 0; }
 
 #content table {
-	border: 0;
-	width: 100%;
+  border: 0;
+  width: 100%;
 }
 #content th,
 #content td {
-	margin: 0;
-	padding: 0;
-	vertical-align: top;
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
 }
 
 .clearboth {
-	clear: both;
+  clear: both;
 }
 
 .frame {
-	border: solid black 1px;
-	margin: 1em 3em;
+  border: solid black 1px;
+  margin: 1em 3em;
 }
 
 .frame .label {
-	background: #369;
-	color: white;
-	font-weight: bold;
-	padding: 5px 10px;
+  background: #369;
+  color: white;
+  font-weight: bold;
+  padding: 5px 10px;
 }
 .frame .content {
-	padding: 5px 10px;
-	background: #F0F0FF;
-	color: black;
-	line-height: 170%;
-	font-size: 90%;
+  padding: 5px 10px;
+  background: #F0F0FF;
+  color: black;
+  line-height: 120%;
+  font-size: 90%;
 }
 .warning .label {
-	background: #C00;
-	color: white;
+  background: #C00;
+  color: white;
 }
 .warning .content {
-	background: #FFF0F0;
-	color: black;
+  background: #FFF0F0;
+  color: black;
 }
 .fixme .label {
-	background: #C6C600;
+  background: #C6C600;
 }
 
 /**
@@ -69,73 +69,75 @@
  */
 
 body {
-	font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif;
-	font-size: 100%;
+  font-family: verdana, "Trebuchet MS", arial, helvetica, sans-serif;
+  font-size: 100%;
 }
 
 #content {
-	font-family: Georgia, Palatino, Times, serif;
-	font-size: 95%;
+  font-family: Georgia, Palatino, Times, serif;
+  font-size: 95%;
 }
 #tabs {
-	font-size: 70%;
+  font-size: 70%;
 }
 #menu {
-	font-size: 80%;
+  font-size: 80%;
 }
 #footer {
-	font-size: 70%;
+  font-size: 70%;
 }
 
-h1, h2, h3, h4, h5, h6	{
-	font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif;
-	font-weight: bold;
-	margin-top: 1em;
-	margin-bottom: .5em;
+h1, h2, h3, h4, h5, h6 {
+  font-family: "Trebuchet MS", verdana, arial, helvetica, sans-serif;
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: .5em;
 }
 
 h1 {
     margin-top: 0;
     margin-bottom: 1em;
-	font-size: 1.4em;
+  font-size: 1.4em;
 }
 #content h1 {
-	font-size: 160%;
-	margin-bottom: .5em;
+  font-size: 160%;
+  margin-bottom: .5em;
 }
 #menu h1 {
-	margin: 0;
-	padding: 10px;
-	background: #336699;
-	color: white;
+  margin: 0;
+  padding: 10px;
+  background: #336699;
+  color: white;
 }
 h2 { font-size: 120%; }
-h3 { font-size: 100%; } 
-h4 { font-size: 90%; } 	
+h3 { font-size: 100%; }
+h4 { font-size: 90%; }
 h5 { font-size: 80%; }
 h6 { font-size: 75%; }
 
 p {
-	line-height: 170%;
-	text-align: left;
-	margin-top: .5em;
-	margin-bottom: 1em;
+  line-height: 120%;
+  text-align: left;
+  margin-top: .5em;
+  margin-bottom: 1em;
 }
 
 #content li,
 #content th,
 #content td {
-	line-height: 170%;
+  line-height: 110%;  
+  margin-top: .1em;
+  margin-bottom: .1em;
 }
 
-#content .attribution { 
-	text-align: right; 
-	font-style: italic; 
-	font-size: 85%;
-	margin-top: 1em;
+#content .attribution {
+  text-align: right;
+  font-style: italic;
+  font-size: 85%;
+  margin-top: 1em;
 }
 
 .codefrag {
-	font-family: "Courier New", Courier, monospace;
-	font-size: 110%;
+  font-family: "Courier New", Courier, monospace;
+  font-size: 110%;
 }

Modified: forrest/site/skin/print.css
==============================================================================
--- forrest/site/skin/print.css	(original)
+++ forrest/site/skin/print.css	Fri Sep 24 23:08:21 2004
@@ -14,40 +14,40 @@
 * limitations under the License.
 */
 body {
-	font-family: Georgia, Palatino, serif;
-	font-size: 12pt;
-	background: white;
+  font-family: Georgia, Palatino, serif;
+  font-size: 12pt;
+  background: white;
 }
 
 #tabs,
 #menu,
 #content .toc {
-	display: none;
+  display: none;
 }
 
 #content {
-	width: auto;
-	padding: 0;
-	float: none !important;
-	color: black;
-	background: transparent;
+  width: auto;
+  padding: 0;
+  float: none !important;
+  color: black;
+  background: transparent;
 }
 
 a:link, a:visited {
-	color: #336699;
-	background: transparent;
-	text-decoration: underline;
+  color: #336699;
+  background: transparent;
+  text-decoration: underline;
 }
 
 #top .logo {
-	padding: 0;
-	margin: 0 0 2em 0;
+  padding: 0;
+  margin: 0 0 2em 0;
 }
 
 #footer {
-	margin-top: 4em;
+  margin-top: 4em;
 }
 
 acronym {
-	border: 0;
+  border: 0;
 }

Modified: forrest/site/skin/profile.css
==============================================================================
--- forrest/site/skin/profile.css	(original)
+++ forrest/site/skin/profile.css	Fri Sep 24 23:08:21 2004
@@ -62,7 +62,7 @@
 color: #000000;
 }
 
-#published { 
+#publishedStrip { 
 color: #FFFFFF;
 background: #4C6C8F; 
 }
@@ -76,7 +76,7 @@
 color: #FFFFFF;
 }   
 
-#published { 
+#publishedStrip { 
 color: #ffffff;
 background: #4a6d8c; 
 }

Modified: forrest/site/skin/profile.css.xslt
==============================================================================
--- forrest/site/skin/profile.css.xslt	(original)
+++ forrest/site/skin/profile.css.xslt	Fri Sep 24 23:08:21 2004
@@ -99,14 +99,14 @@
 </xsl:template>
 <!--Fix for other (old) profiles-->
 <xsl:template match="color[@name='navstrip']">
-#published { 
+#publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>; 
 }
 </xsl:template> 
 <!--has to go after the nav-strip (no 'navstrip')-->
 <xsl:template match="color[@name='published']">
-#published { 
+#publishedStrip { 
 color: <xsl:value-of select="@font"/>;
 background: <xsl:value-of select="@value"/>; 
 }

Modified: forrest/site/skin/screen.css
==============================================================================
--- forrest/site/skin/screen.css	(original)
+++ forrest/site/skin/screen.css	Fri Sep 24 23:08:21 2004
@@ -16,10 +16,10 @@
 body {  margin: 0px 0px 0px 0px; font-family: Verdana, Helvetica, sans-serif; }
 
 h1     { font-size : 160%; margin: 0px 0px 0px 0px;  padding: 0px; }
-h2     { font-size : 140%; margin: 0px 0px 0px 0px; padding: 0px; font-weight : bold;}
-h3     { font-size : 130%; margin: 0px 0px 0px 0px; padding: 0px; font-weight : bold; }
+h2     { font-size : 140%; margin: 0.9em 0px 0px 0px; padding: 0px; font-weight : bold;}
+h3     { font-size : 130%; margin: 0.8em 0px 0px 0px; padding: 0px; font-weight : bold; }
 .h3 { margin: 22px 0px 3px 0px; }
-h4     { font-size : 120%; margin: 0px 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
+h4     { font-size : 120%; margin: 0.7em 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
 .h4 { margin: 18px 0px 0px 0px; }
 h4.faq { font-size : 120%; margin: 18px 0px 0px 0px; padding: 0px; font-weight : bold;   text-align: left; }
 h5     { font-size : 100%; margin: 14px 0px 0px 0px; padding: 0px; font-weight : normal; text-align: left; }
@@ -28,23 +28,23 @@
 * table
 */
 table .title { background-color: #000000; }
-.ForrestTable         { 
-    color: #ffffff; 
+.ForrestTable         {
+    color: #ffffff;
     background-color: #7099C5;
-    width: 100%; 
-    font-size : 100%; 
+    width: 100%;
+    font-size : 100%;
     empty-cells: show;
 }
-table caption { 
+table caption {
     padding-left: 5px;
     color: white;
-    text-align: left; 
-    font-weight: bold; 
+    text-align: left;
+    font-weight: bold;
     background-color: #000000;
 }
-.ForrestTable td { 
-    color: black;   
-    background-color: #f0f0ff; 
+.ForrestTable td {
+    color: black;
+    background-color: #f0f0ff;
 }
 .ForrestTable th { text-align: center; }
 /**
@@ -103,7 +103,7 @@
     z-index:0;
     background-image: url(images/rc-t-l-5-1header-2searchbox-3searchbox.png);
     background-repeat: no-repeat;
-    background-position: top left;    
+    background-position: top left;
     bottom: -1px; /* compensate for IE rendering issue */
 }
 
@@ -171,13 +171,13 @@
     background-repeat: no-repeat;
     background-position: top left;
 }
-#publishedStrip { 
+#publishedStrip {
     padding-right: 10px;
     padding-left: 20px;
     padding-top: 3px;
     padding-bottom:3px;
     color: #ffffff;
-    font-size : 60%; 
+    font-size : 60%;
     font-weight: bold;
     background-color: #4C6C8F;
     text-align:right;
@@ -185,7 +185,7 @@
 
 #level2tabs {
 margin: 0;
-float:left; 
+float:left;
 position:relative;
 }
 
@@ -211,7 +211,7 @@
 /**
 * Round corner
 */
-#roundtop { 
+#roundtop {
     background-image: url(images/rc-t-r-15-1body-2menu-3menu.png);
     background-repeat: no-repeat;
     background-position: top right;
@@ -230,10 +230,10 @@
    display: block !important;
 }
 
-.roundtopsmall { 
+.roundtopsmall {
     background-image: url(images/rc-t-r-5-1header-2searchbox-3searchbox.png);
     background-repeat: no-repeat;
-    background-position: top right;    
+    background-position: top right;
 }
 
 #roundbottomsmall {
@@ -262,14 +262,14 @@
     float: left;
     width: 160px;
     padding-top: 0px;
-    top:-18px; 
-    left:10px; 
+    top:-18px;
+    left:10px;
     z-index: 20;
     background-color: #f90;
-    font-size : 70%;    
+    font-size : 70%;
 }
 
-.menutitle { 
+.menutitle {
         cursor:pointer;
         padding: 3px 12px;
         margin-left: 10px;
@@ -279,63 +279,63 @@
         font-weight : bold;
 }
 
-#menu .menuitemgroup { 
-        margin: 0px 0px 6px 8px; 
-        padding: 0px;  
+#menu .menuitemgroup {
+        margin: 0px 0px 6px 8px;
+        padding: 0px;
         font-weight : bold; }
-        
-#menu .selectedmenuitemgroup{ 
-        margin: 0px 0px 6px 8px; 
-        padding: 0px;  
+
+#menu .selectedmenuitemgroup{
+        margin: 0px 0px 6px 8px;
+        padding: 0px;
         font-weight : bold; }
-        
-#menu .menuitem { 
-        padding: 0px 0px 2px 12px;  
+
+#menu .menuitem {
+        padding: 0px 0px 2px 12px;
         background-image: url('images/page.gif');
         background-repeat: no-repeat;
         background-position: center left;
-        font-weight : normal; 
+        font-weight : normal;
         margin-left: 10px;
 }
 
-#menu .menupage {         
-        margin: 5px 0px 5px 10px; 
-        padding: 0px 3px 0px 12px;  
+#menu .menupage {
+        margin: 5px 0px 5px 10px;
+        padding: 0px 3px 0px 12px;
         background-image: url('images/current.gif');
         background-repeat: no-repeat;
         background-position: top left;
         font-style : normal;
 }
-#menu .menupagetitle { 
-        padding: 0px 0px 0px 6px;     
+#menu .menupagetitle {
+        padding: 0px 0px 0px 6px;
         font-style : normal;
-        border-style: solid; 
+        border-style: solid;
         border-width: 1px;
         margin-right: 10px;
 }
-#menu .menupageitemgroup { 
-        padding: 3px 0px 4px 6px;    
+#menu .menupageitemgroup {
+        padding: 3px 0px 4px 6px;
         font-style : normal;
         border-bottom: 1px solid ;
         border-left: 1px solid ;
-        border-right: 1px solid ;        
+        border-right: 1px solid ;
         margin-right: 10px;
 }
-#menu .menupageitem {             
+#menu .menupageitem {
         font-style : normal;
-        font-weight : normal; 
+        font-weight : normal;
         border-width: 0px;
         font-size : 90%;
 }
 #menu #credit {
-    text-align: center;  
+    text-align: center;
 }
 
 #content {
     padding: 20px 20px 20px 180px;
     margin: 0;
-    font : small Verdana, Helvetica, sans-serif;  
-    font-size : 80%; 
+    font : small Verdana, Helvetica, sans-serif;
+    font-size : 80%;
 }
 
 #content ul {
@@ -396,7 +396,7 @@
 
 .trail {
   position: relative; /* IE bugfix cont'd */
-  font-size: 70%; 
+  font-size: 70%;
   text-align: right;
   float: right;
   margin: -10px 5px 0px 5px;
@@ -405,15 +405,15 @@
 
 #minitoc-area {
     border-top: solid 1px #4C6C8F;
-    border-bottom: solid 1px #4C6C8F;    
+    border-bottom: solid 1px #4C6C8F;
     margin-bottom: 15px;
     margin-left: 15px;
     margin-right: 10%;
     padding-bottom: 5px;
     padding-top: 5px;
 }
-.minitoc    { 
-    list-style-image: url('images/current.gif'); 
+.minitoc {
+    list-style-image: url('images/current.gif');
     font-weight: normal;
 }
 li p {

Modified: forrest/site/todo.html
==============================================================================
--- forrest/site/todo.html	(original)
+++ forrest/site/todo.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>

Modified: forrest/site/who.html
==============================================================================
--- forrest/site/who.html	(original)
+++ forrest/site/who.html	Fri Sep 24 23:08:21 2004
@@ -147,7 +147,7 @@
 <a href="http://xml.apache.org/">Apache XML</a>
 </div>
 <div class="menuitem">
-<a href="http://www.apache.org/~vgritsenko/stats/">Apache Stats</a>
+<a href="http://www.apache.org/~vgritsenko/stats/">Statistics</a>
 </div>
 </div>
 <div id="credit"></div>