Author: crossley
Date: Tue Dec 28 20:36:46 2004
New Revision: 123595

URL: http://svn.apache.org/viewcvs?view=rev&rev=123595
Log:
Update 2.1 with current changes.html and link to wiki review docs.

Modified:
   cocoon/site/site/2.1/changes.html
   cocoon/site/site/2.1/changes.pdf
   cocoon/site/site/2.1/changes.rss
   cocoon/site/site/2.1/howto/index.html
   cocoon/site/site/2.1/howto/index.pdf
   cocoon/site/site/2.1/plan/index.html
   cocoon/site/site/2.1/plan/index.pdf
   cocoon/site/site/2.1/plan/review-sitemap-docs.html
   cocoon/site/site/2.1/plan/review-sitemap-docs.pdf

Modified: cocoon/site/site/2.1/changes.html
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/changes.html?view=diff&rev=123595&p1=cocoon/site/site/2.1/changes.html&r1=123594&p2=cocoon/site/site/2.1/changes.html&r2=123595
==============================================================================
--- cocoon/site/site/2.1/changes.html   (original)
+++ cocoon/site/site/2.1/changes.html   Tue Dec 28 20:36:46 2004
@@ -384,6 +384,59 @@
 <ul>
    
 <li>
+<img class="icon" alt="add" src="images/add.jpg">
+     Added commons-transaction 1.0 and commons-codec 1.3. Both are needed by 
slide 2.1.
+   (AG)</li>
+   
+<li>
+<img class="icon" alt="update" src="images/update.jpg">
+     Updated jakarta-slide-webdavlib to 2.1, jdom to 1.0, slide-kernel to 2.1, 
slide-stores to 2.1, slide-webdavservlet to 2.1.
+   (AG)</li> 
+   
+<li>
+<img class="icon" alt="add" src="images/add.jpg">
+        Portal now allows Cocoon to be deployed as a war (only supports local 
JSR-168 portlets) and 
+        allows external portlets to be in a war.
+   (RG)</li>
+   
+<li>
+<img class="icon" alt="fix" src="images/fix.jpg">
+     CForms: the parser used to read form files now uses the EntityResolver 
defined in cocoon.xconf.
+   (SW) Fixes <a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=31668";>31668</a>.</li>
+   
+<li>
+<img class="icon" alt="fix" src="images/fix.jpg">
+     Tiny typo in AbstractTextSerializer
+   (AG) Thanks to <a href="mailto:[EMAIL PROTECTED]">Micah Dubinko</a>. Fixes 
<a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=32620";>32620</a>.</li>
+   
+<li>
+<img class="icon" alt="fix" src="images/fix.jpg">
+     Modified PortletURLProviderImpl.toString() to create a copy of itself and 
register that with the event.
+   (RG) Fixes <a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=32645";>32645</a>.</li>
+   
+<li>
+<img class="icon" alt="add" src="images/add.jpg">
+     ContinuationsManager default implementation can now store continuations 
in user session. 
+     Continuations are not available outside user session and invalidated 
automatically 
+     when session gets invalidated by servlet container. This is a good 
security option for web applications. 
+   (LG)</li>
+   
+<li>
+<img class="icon" alt="fix" src="images/fix.jpg">
+     Update Deli to x031104 (include over 300 vendor, operator and third party 
profiles)
+   (AG) Thanks to <a href="mailto:[EMAIL PROTECTED]">Mark H. Butler</a>. Fixes 
<a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=32083";>32083</a>.</li>
+   
+<li>
+<img class="icon" alt="update" src="images/update.jpg">
+     Updated hsqldb to 1.7.3, lucene to 1.4.3, ehcache to 1.1, log4j 1.2.9.
+   (AG)</li>
+   
+<li>
+<img class="icon" alt="add" src="images/add.jpg">
+    paranoid: make the classloader implementation configurable
+   (TC)</li>
+   
+<li>
 <img class="icon" alt="fix" src="images/fix.jpg">
      typo on the date-selector doc.
    (AG) Thanks to <a href="mailto:[EMAIL PROTECTED]">Juan Jose Pablos</a>. 
Fixes <a 
href="http://issues.apache.org/bugzilla/show_bug.cgi?id=32408";>32408</a>.</li>
@@ -493,7 +546,7 @@
 </ul>
 </div>
  
-<a name="N1009B"></a><a name="2.1.6"></a>
+<a name="N100EF"></a><a name="2.1.6"></a>
 <h3>Version 2.1.6 (November 19 2004)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -1191,7 +1244,7 @@
 </ul>
 </div>
  
-<a name="N104F7"></a><a name="2.1.5.1"></a>
+<a name="N1054B"></a><a name="2.1.5.1"></a>
 <h3>Version 2.1.5.1 (July 9 2004)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -1707,7 +1760,7 @@
 </ul>
 </div>
  
-<a name="N10811"></a><a name="2.1.4"></a>
+<a name="N10865"></a><a name="2.1.4"></a>
 <h3>Version 2.1.4 (February 12 2004)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2013,7 +2066,7 @@
 </ul>
 </div>
  
-<a name="N1098F"></a><a name="2.1.3"></a>
+<a name="N109E3"></a><a name="2.1.3"></a>
 <h3>Version 2.1.3 (November 13 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2185,7 +2238,7 @@
 </ul>
 </div>
  
-<a name="N10AB2"></a><a name="2.1.2"></a>
+<a name="N10B06"></a><a name="2.1.2"></a>
 <h3>Version 2.1.2 (September 30 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2280,7 +2333,7 @@
 </ul>
 </div>
  
-<a name="N10B27"></a><a name="2.1.1"></a>
+<a name="N10B7B"></a><a name="2.1.1"></a>
 <h3>Version 2.1.1 (September 05 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2433,7 +2486,7 @@
 </ul>
 </div>
  
-<a name="N10BFE"></a><a name="2.1"></a>
+<a name="N10C52"></a><a name="2.1"></a>
 <h3>Version 2.1 (August 12 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2518,7 +2571,7 @@
 </ul>
 </div>
  
-<a name="N10CA5"></a><a name="2.1rc1"></a>
+<a name="N10CF9"></a><a name="2.1rc1"></a>
 <h3>Version 2.1rc1 (July 29 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2687,7 +2740,7 @@
 </ul>
 </div>
  
-<a name="N10D8C"></a><a name="2.1m3"></a>
+<a name="N10DE0"></a><a name="2.1m3"></a>
 <h3>Version 2.1m3 (July 5 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -2885,7 +2938,7 @@
 </ul>
 </div>
  
-<a name="N10EDB"></a><a name="2.1m2"></a>
+<a name="N10F2F"></a><a name="2.1m2"></a>
 <h3>Version 2.1m2 (May 20 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>
@@ -3063,7 +3116,7 @@
 </ul>
 </div>
  
-<a name="N1102E"></a><a name="2.1-M1"></a>
+<a name="N11082"></a><a name="2.1-M1"></a>
 <h3>Version 2.1-M1 (April 29 2003)</h3>
 <div style="margin-left: 0 ; border: 2px">
 <ul>

Modified: cocoon/site/site/2.1/changes.pdf
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/changes.pdf?view=diff&rev=123595&p1=cocoon/site/site/2.1/changes.pdf&r1=123594&p2=cocoon/site/site/2.1/changes.pdf&r2=123595
==============================================================================
Binary files. No diff available.

Modified: cocoon/site/site/2.1/changes.rss
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/changes.rss?view=diff&rev=123595&p1=cocoon/site/site/2.1/changes.rss&r1=123594&p2=cocoon/site/site/2.1/changes.rss&r2=123595
==============================================================================
--- cocoon/site/site/2.1/changes.rss    (original)
+++ cocoon/site/site/2.1/changes.rss    Tue Dec 28 20:36:46 2004
@@ -1,6 +1,85 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE rss PUBLIC "-//Netscape Communications//DTD RSS 0.91//EN" 
"http://my.netscape.com/publish/formats/rss-0.91.dtd";>
-<rss version="0.91"><channel><title>Apache Cocoon 
Changes</title><link>http://cocoon.apache.org//changes.html</link><description>Apache
 Cocoon Changes</description><language>en-us</language><item><title> fix
+<rss version="0.91"><channel><title>Apache Cocoon 
Changes</title><link>http://cocoon.apache.org//changes.html</link><description>Apache
 Cocoon Changes</description><language>en-us</language><item><title> 
add</title><link>http://cocoon.apache.org//changes.html</link><description> add
+              by 
+              AG
+              :
+              
+     Added commons-transaction 1.0 and commons-codec 1.3. Both are needed by 
slide 2.1.
+   </description></item><item><title> 
update</title><link>http://cocoon.apache.org//changes.html</link><description> 
update
+              by 
+              AG
+              :
+              
+     Updated jakarta-slide-webdavlib to 2.1, jdom to 1.0, slide-kernel to 2.1, 
slide-stores to 2.1, slide-webdavservlet to 2.1.
+   </description></item><item><title> 
add</title><link>http://cocoon.apache.org//changes.html</link><description> add
+              by 
+              RG
+              :
+              
+        Portal now allows Cocoon to be deployed as a war (only supports local 
JSR-168 portlets) and 
+        allows external portlets to be in a war.
+   </description></item><item><title> fix
+                (bug 31668)
+              
</title><link>http://cocoon.apache.org//changes.html</link><description> fix
+              by 
+              SW
+                (fixes bug 31668)
+              
+              :
+              
+     CForms: the parser used to read form files now uses the EntityResolver 
defined in cocoon.xconf.
+   </description></item><item><title> fix
+                (bug 32620)
+              
</title><link>http://cocoon.apache.org//changes.html</link><description> fix
+              by 
+              AG
+                (fixes bug 32620)
+              
+              :
+              
+     Tiny typo in AbstractTextSerializer
+    Thanks to Micah Dubinko.</description></item><item><title> fix
+                (bug 32645)
+              
</title><link>http://cocoon.apache.org//changes.html</link><description> fix
+              by 
+              RG
+                (fixes bug 32645)
+              
+              :
+              
+     Modified PortletURLProviderImpl.toString() to create a copy of itself and 
register that with the event.
+   </description></item><item><title> 
add</title><link>http://cocoon.apache.org//changes.html</link><description> add
+              by 
+              LG
+              :
+              
+     ContinuationsManager default implementation can now store continuations 
in user session. 
+     Continuations are not available outside user session and invalidated 
automatically 
+     when session gets invalidated by servlet container. This is a good 
security option for web applications. 
+   </description></item><item><title> fix
+                (bug 32083)
+              
</title><link>http://cocoon.apache.org//changes.html</link><description> fix
+              by 
+              AG
+                (fixes bug 32083)
+              
+              :
+              
+     Update Deli to x031104 (include over 300 vendor, operator and third party 
profiles)
+    Thanks to Mark H. Butler.</description></item><item><title> 
update</title><link>http://cocoon.apache.org//changes.html</link><description> 
update
+              by 
+              AG
+              :
+              
+     Updated hsqldb to 1.7.3, lucene to 1.4.3, ehcache to 1.1, log4j 1.2.9.
+   </description></item><item><title> 
add</title><link>http://cocoon.apache.org//changes.html</link><description> add
+              by 
+              TC
+              :
+              
+    paranoid: make the classloader implementation configurable
+   </description></item><item><title> fix
                 (bug 32408)
               
</title><link>http://cocoon.apache.org//changes.html</link><description> fix
               by 

Modified: cocoon/site/site/2.1/howto/index.html
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/howto/index.html?view=diff&rev=123595&p1=cocoon/site/site/2.1/howto/index.html&r1=123594&p2=cocoon/site/site/2.1/howto/index.html&r2=123595
==============================================================================
--- cocoon/site/site/2.1/howto/index.html       (original)
+++ cocoon/site/site/2.1/howto/index.html       Tue Dec 28 20:36:46 2004
@@ -324,12 +324,9 @@
 <div style="margin-left: 0 ; border: 2px">
 <ul>
 
-<li>Perry Molendijk's <a 
href="http://www.cocooncenter.de/cc/documents/resources/xindice/index.html";>Running
 Xindice</a> How-To at cocooncenter.de.</li>
-
-<li>Bertrand Delacr&eacute;taz's <a 
href="http://www.cocooncenter.de/cc/documents/resources/hot-plugging/index.html";>Automount</a>
 How-To at cocooncenter.de.</li>
-
-<li>Perry Molendijk's <a 
href="http://www.cocooncenter.de/cc/documents/resources/sendmail/index.html";>Sendmail
 Logicsheet</a> How-To at cocooncenter.de.</li>
-
+<li>
+<a href="http://cocooncenter.org/";>cocooncenter.org has a few tutorials and 
articles</a>
+</li>
 
 <li>
 <a href="http://www.galatea.com/flashguides/index.html";>Galatea 
FlashGuides(TM)</a>

Modified: cocoon/site/site/2.1/howto/index.pdf
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/howto/index.pdf?view=diff&rev=123595&p1=cocoon/site/site/2.1/howto/index.pdf&r1=123594&p2=cocoon/site/site/2.1/howto/index.pdf&r2=123595
==============================================================================
Binary files. No diff available.

Modified: cocoon/site/site/2.1/plan/index.html
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/plan/index.html?view=diff&rev=123595&p1=cocoon/site/site/2.1/plan/index.html&r1=123594&p2=cocoon/site/site/2.1/plan/index.html&r2=123595
==============================================================================
--- cocoon/site/site/2.1/plan/index.html        (original)
+++ cocoon/site/site/2.1/plan/index.html        Tue Dec 28 20:36:46 2004
@@ -260,12 +260,18 @@
    
 <li>
 <a href="release.html">Release Plan</a>
-    - major things to do before the next release</li>
+    - major things to do before the next release.</li>
    
 <li>
 <a href="review-sitemap-docs.html">Review Sitemap Docs</a>
     - a coordinated review of the generated documentation for sitemap
-     components
+     components.
+   </li>
+   
+<li>
+<a href="http://wiki.apache.org/cocoon/22NewDocuments";>New Cocoon 2.2 
Documentation</a>
+    - a coordinated review of all documentation, to prepare for the
+    Cocoon-2.2 release.
    </li>
   
 </ul>

Modified: cocoon/site/site/2.1/plan/index.pdf
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/plan/index.pdf?view=diff&rev=123595&p1=cocoon/site/site/2.1/plan/index.pdf&r1=123594&p2=cocoon/site/site/2.1/plan/index.pdf&r2=123595
==============================================================================
Binary files. No diff available.

Modified: cocoon/site/site/2.1/plan/review-sitemap-docs.html
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/plan/review-sitemap-docs.html?view=diff&rev=123595&p1=cocoon/site/site/2.1/plan/review-sitemap-docs.html&r1=123594&p2=cocoon/site/site/2.1/plan/review-sitemap-docs.html&r2=123595
==============================================================================
--- cocoon/site/site/2.1/plan/review-sitemap-docs.html  (original)
+++ cocoon/site/site/2.1/plan/review-sitemap-docs.html  Tue Dec 28 20:36:46 2004
@@ -262,7 +262,9 @@
       </p>
 <p>
         This review focusses only on this set of documentation, as part of
-        the overall documentation review. This set is a key part, because it
+        the overall documentation
+        <a href="http://wiki.apache.org/cocoon/22NewDocuments";>review</a>.
+        This set is a key part, because it
         addresses the heart of Cocoon - the sitemap components. Having a
         well-defined "User Guide" will assist both users and developers to
         be more productive.
@@ -313,7 +315,7 @@
 </div>
 
     
-<a name="N10057"></a><a name="Coordination+table"></a>
+<a name="N1005B"></a><a name="Coordination+table"></a>
 <h3>Coordination table</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>The table columns are:</p>
@@ -349,8 +351,8 @@
 <li>* - Has issues, needs more work.</li>
       
 </ul>
-<p>There are 318 entries.</p>
-<a name="N1008F"></a><a name="Actions"></a>
+<p>There are 314 entries.</p>
+<a name="N10093"></a><a name="Actions"></a>
 <h4>Actions</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -369,9 +371,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractAction.html">AbstractAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -381,9 +383,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractComplementaryConfigurableAction.html">AbstractComplementaryConfigurableAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -393,9 +395,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractConfigurableAction.html">AbstractConfigurableAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -405,9 +407,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractDatabaseAction.html">AbstractDatabaseAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -417,9 +419,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/forms/acting/AbstractFormsAction.html">AbstractFormsAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">forms</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -429,9 +431,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractMultiAction.html">AbstractMultiAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -441,9 +443,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/AbstractValidatorAction.html">AbstractValidatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -453,9 +455,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/authentication/acting/AuthAction.html">AuthAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">authentication-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -465,9 +467,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/portal/acting/AuthAction.html">AuthAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -477,9 +479,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/BookmarkAction.html">BookmarkAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -489,9 +491,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/CacheEventAction.html">CacheEventAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">eventcache</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -501,9 +503,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ClearCacheAction.html">ClearCacheAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -513,9 +515,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ClearPersistentStoreAction.html">ClearPersistentStoreAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -525,9 +527,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/CommandAction.html">CommandAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -537,9 +539,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ComposerAction.html">ComposerAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -549,9 +551,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ConfigurableComposerAction.html">ConfigurableComposerAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -561,21 +563,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ConfigurableServiceableAction.html">ConfigurableServiceableAction</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
-  <!-- B --><td colspan="1" rowspan="1">core</td>
-  <!-- C --><td colspan="1" rowspan="1">n</td>
-  <!-- D --><td colspan="1" rowspan="1"></td>
-  <!-- E --><td colspan="1" rowspan="1"></td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ConfigurationHelper.html">ConfigurationHelper</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -585,9 +575,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/CookieCreatorAction.html">CookieCreatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -597,9 +587,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/CookieValidatorAction.html">CookieValidatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -609,9 +599,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/CopletSetDataAction.html">CopletSetDataAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -621,9 +611,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/CopySourceAction.html">CopySourceAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -633,9 +623,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseAddAction.html">DatabaseAddAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -645,9 +635,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseAuthenticatorAction.html">DatabaseAuthenticatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -657,9 +647,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseCookieAuthenticatorAction.html">DatabaseCookieAuthenticatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -669,9 +659,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseDeleteAction.html">DatabaseDeleteAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -681,9 +671,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseSelectAction.html">DatabaseSelectAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -693,9 +683,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DatabaseUpdateAction.html">DatabaseUpdateAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -705,9 +695,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/DbXMLAuthenticatorAction.html">DbXMLAuthenticatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xmldb</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -717,9 +707,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/faces/FacesAction.html">FacesAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">faces</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -729,9 +719,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ExpiresPipelineAction.html">ExpiresPipelineAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -741,9 +731,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/acting/FormManagerAction.html">FormManagerAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -753,9 +743,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/FormValidatorAction.html">FormValidatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -765,9 +755,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/forms/acting/HandleFormSubmitAction.html">HandleFormSubmitAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">forms</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -777,9 +767,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/HelloAction.html">HelloAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -789,9 +779,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/HttpCacheAction.html">HttpCacheAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -801,9 +791,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/HttpHeaderAction.html">HttpHeaderAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -813,9 +803,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/InputModuleAction.html">InputModuleAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -825,9 +815,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/JMSPublisherAction.html">JMSPublisherAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">jms</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -837,9 +827,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/LinkTranslatorMapAction.html">LinkTranslatorMapAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -849,9 +839,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/LocaleAction.html">LocaleAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -861,9 +851,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/authentication/acting/LoggedInAction.html">LoggedInAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">authentication-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -873,9 +863,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/authentication/acting/LoginAction.html">LoginAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">authentication-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -885,9 +875,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/LoginAction.html">LoginAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -897,9 +887,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/authentication/acting/LogoutAction.html">LogoutAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">authentication-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -909,9 +899,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/LogoutAction.html">LogoutAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -921,9 +911,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/mail/MailAction.html">MailAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -933,9 +923,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/forms/acting/MakeFormAction.html">MakeFormAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">forms</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -945,9 +935,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseAction.html">modular/DatabaseAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -957,9 +947,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseAddAction.html">modular/DatabaseAddAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -969,9 +959,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseDeleteAction.html">modular/DatabaseDeleteAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -981,9 +971,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseSelectAction.html">modular/DatabaseSelectAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -993,9 +983,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseQueryAction.html">modular/DatabaseQueryAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1005,9 +995,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/DatabaseUpdateAction.html">modular/DatabaseUpdateAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1017,9 +1007,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/ObjectModelAction.html">ObjectModelAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1029,9 +1019,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/OraAddAction.html">OraAddAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1041,9 +1031,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/OraUpdateAction.html">OraUpdateAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1053,21 +1043,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/helpers/PreemptiveLoaderAction.html">PreemptiveLoaderAction</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
-  <!-- B --><td colspan="1" rowspan="1">core</td>
-  <!-- C --><td colspan="1" rowspan="1">n</td>
-  <!-- D --><td colspan="1" rowspan="1"></td>
-  <!-- E --><td colspan="1" rowspan="1"></td>
-
-</tr>
-
-<tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/PropagatorAction.html">PropagatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1077,9 +1055,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/RequestParamAction.html">RequestParamAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1089,9 +1067,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/RequestParameterExistsAction.html">RequestParameterExistsAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1101,9 +1079,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ResourceExistsAction.html">ResourceExistsAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1113,9 +1091,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/acting/SaveAction.html">SaveAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1125,9 +1103,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ScriptAction.html">ScriptAction</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/actions/script-action.html">script</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/actions/script-action.html">script</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">bsf</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1137,9 +1115,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SectionCutterAction.html">SectionCutterAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1149,9 +1127,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SendmailAction.html">SendmailAction</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/actions/sendmail-action.html">sendmail</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/actions/sendmail-action.html">sendmail</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1161,9 +1139,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ServerPagesAction.html">ServerPagesAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1173,9 +1151,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ServiceableAction.html">ServiceableAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1185,9 +1163,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/acting/SessionAction.html">SessionAction</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/actions/session-action.html">session</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/actions/session-action.html">session</a></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1197,9 +1175,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/acting/SessionFormAction.html">SessionFormAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1209,9 +1187,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SessionInvalidatorAction.html">SessionInvalidatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1221,9 +1199,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SessionIsValidAction.html">SessionIsValidAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1233,9 +1211,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SessionPropagatorAction.html">SessionPropagatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1245,9 +1223,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SessionStateAction.html">SessionStateAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1257,9 +1235,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SessionValidatorAction.html">SessionValidatorAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1269,9 +1247,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/SetCharacterEncodingAction.html">SetCharacterEncodingAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1281,9 +1259,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/taglib/acting/TagtestAction.html">TagtestAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 1 -->
+<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/taglib/test/acting/TagtestAction.html">TagtestAction</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">taglib</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1293,9 +1271,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/modular/TestAction.html">modular/TestAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core/samples</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1305,9 +1283,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/samples/castor/TestBeanAction.html">castor/TestBeanAction</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1315,34 +1293,10 @@
   <!-- E --><td colspan="1" rowspan="1"></td>
 
 </tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ValidatorActionHelper.html">ValidatorActionHelper</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
-  <!-- B --><td colspan="1" rowspan="1">core</td>
-  <!-- C --><td colspan="1" rowspan="1">n</td>
-  <!-- D --><td colspan="1" rowspan="1"></td>
-  <!-- E --><td colspan="1" rowspan="1"></td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/acting/ValidatorActionResult.html">ValidatorActionResult</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
-  <!-- B --><td colspan="1" rowspan="1">core</td>
-  <!-- C --><td colspan="1" rowspan="1">n</td>
-  <!-- D --><td colspan="1" rowspan="1"></td>
-  <!-- E --><td colspan="1" rowspan="1"></td>
-
-</tr>
       
 </table>
 </div>
-<a name="N10E12"></a><a name="Generators"></a>
+<a name="N10E08"></a><a name="Generators"></a>
 <h4>Generators</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -1361,9 +1315,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/generation/AbstractCopletGenerator.html">AbstractCopletGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1373,9 +1327,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/AbstractGenerator.html">AbstractGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1385,9 +1339,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/ant/AntBuildGenerator.html">AntBuildGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1397,9 +1351,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/asciiart/AsciiArtSVGGenerator.html">AsciiArtSVGGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">asciiart</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1409,9 +1363,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/portal/coplets/basket/BasketContentGenerator.html">BasketContentGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 1 -->
+<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.html">BasketContentGenerator</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1421,9 +1375,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/portal/coplets/basket/BasketGenerator.html">BasketGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 1 -->
+<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/coplets/basket/BasketGenerator.html">BasketGenerator</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1433,9 +1387,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/CalendarGenerator.html">CalendarGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/calendar-generator.html">calendar</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/calendar-generator.html">calendar</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1445,9 +1399,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/flow/ws/ClientBindingGenerator.html">ClientBindingGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/flow</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1457,9 +1411,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ComposerGenerator.html">ComposerGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1469,9 +1423,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/authentication/generation/ConfigurationGenerator.html">ConfigurationGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">authentication-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1481,9 +1435,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/portal/generation/ConfigurationGenerator.html">ConfigurationGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1493,9 +1447,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/DirectoryGenerator.html">DirectoryGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/directory-generator.html">directory</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/directory-generator.html">directory</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1505,9 +1459,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/error-generator.html">error</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/error-generator.html">error</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1517,9 +1471,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/EventCacheGenerator.html">EventCacheGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">eventcache</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1529,9 +1483,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/samples/errorhandling/ExceptionGenerator.html">ExceptionGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core/samples</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1541,9 +1495,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/extractor-generator.html">extractor</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/extractor-generator.html">extractor</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1553,9 +1507,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/FileGenerator.html">FileGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/file-generator.html">file</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/file-generator.html">file</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1565,9 +1519,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/forms/generation/FormsGenerator.html">FormsGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1577,9 +1531,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/FragmentExtractorGenerator.html">FragmentExtractorGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">batik</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1589,9 +1543,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/GarbageGenerator.html">GarbageGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1601,9 +1555,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/GenericProxyGenerator.html">GenericProxyGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">proxy</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1613,9 +1567,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/HTMLGenerator.html">HTMLGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/html-generator.html">html</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/html-generator.html">html</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">html</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1625,9 +1579,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/HttpProxyGenerator.html">HttpProxyGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">proxy</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1637,9 +1591,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ImageDirectoryGenerator.html">ImageDirectoryGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/imagedirectory-generator.html">imagedirectory</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/imagedirectory-generator.html">imagedirectory</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1649,9 +1603,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/IMAPGenerator.html">IMAPGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1661,9 +1615,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/JellyGenerator.html">JellyGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1673,9 +1627,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/markup/xsp/JSGenerator.html">JSGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1685,9 +1639,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/JSPGenerator.html">JSPGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/jsp-generator.html">jsp</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/jsp-generator.html">jsp</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">jsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1697,9 +1651,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/JXTemplateGenerator.html">JXTemplateGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/jx-generator.html">jx</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/jx-generator.html">jx</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1709,9 +1663,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/LinkStatusGenerator.html">LinkStatusGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/linkstatus-generator.html">linkstatus</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/linkstatus-generator.html">linkstatus</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1721,9 +1675,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/markup/LogicsheetCodeGenerator.html">LogicsheetCodeGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1733,9 +1687,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/markup/MarkupCodeGenerator.html">MarkupCodeGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1745,9 +1699,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/MP3DirectoryGenerator.html">MP3DirectoryGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/mp3directory-generator.html">mp3directory</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/mp3directory-generator.html">mp3directory</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1757,9 +1711,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/NekoHTMLGenerator.html">NekoHTMLGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">html</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1769,9 +1723,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/sitemap/NotifyingGenerator.html">NotifyingGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1781,9 +1735,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ParseExceptionGenerator.html">ParseExceptionGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1793,9 +1747,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/PauseGenerator.html">PauseGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core/test</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1805,9 +1759,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/PhpGenerator.html">PhpGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/php-generator.html">php</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/php-generator.html">php</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">php</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1817,9 +1771,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/generation/PortalGenerator.html">PortalGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1829,9 +1783,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/portal/generation/PortalGenerator.html">PortalGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1841,9 +1795,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/profile-generator.html">profile</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/profile-generator.html">profile</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1853,9 +1807,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ProfilerGenerator.html">ProfilerGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">profiler</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1865,9 +1819,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/generator/ProgramGenerator.html">ProgramGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1877,9 +1831,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/markup/xsp/PythonGenerator.html">xsp/PythonGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">python</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1889,9 +1843,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/RequestAttributeGenerator.html">RequestAttributeGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1901,9 +1855,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/RequestGenerator.html">RequestGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/request-generator.html">request</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/request-generator.html">request</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1913,9 +1867,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/RequestParameterGenerator.html">RequestParameterGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1925,9 +1879,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ScriptGenerator.html">ScriptGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/script-generator.html">script</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/script-generator.html">script</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">bsf</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1937,9 +1891,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/SearchGenerator.html">SearchGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/search-generator.html">search</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/search-generator.html">search</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">lucene</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1949,9 +1903,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ServerPagesGenerator.html">ServerPagesGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/serverpages-generator.html">serverpages</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/serverpages-generator.html">serverpages</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1961,9 +1915,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ServiceableGenerator.html">ServiceableGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1973,9 +1927,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/ServletGenerator.html">ServletGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -1985,9 +1939,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/SessionAttributeGenerator.html">SessionAttributeGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -1997,9 +1951,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/slop/generation/SlopGenerator.html">SlopGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">slop</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2009,9 +1963,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/StatusGenerator.html">StatusGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/status-generator.html">status</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/status-generator.html">status</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -2021,9 +1975,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/StreamGenerator.html">StreamGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/stream-generator.html">stream</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/stream-generator.html">stream</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -2033,9 +1987,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/SWFGenerator.html">SWFGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">swf</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2045,9 +1999,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/TextGenerator.html">TextGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2057,9 +2011,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/TraversableGenerator.html">TraversableGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">repository</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2069,21 +2023,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/TraversableSourceDescriptionGenerator.html">TraversableSourceDescriptionGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
-  <!-- B --><td colspan="1" rowspan="1">repository</td>
-  <!-- C --><td colspan="1" rowspan="1">n</td>
-  <!-- D --><td colspan="1" rowspan="1"></td>
-  <!-- E --><td colspan="1" rowspan="1"></td>
-
-</tr>
-
-<tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/TraversableSourceGenerator.html">TraversableSourceGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">repository</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2093,9 +2035,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/TraxGenerator.html">TraxGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2105,9 +2047,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/VelocityGenerator.html">VelocityGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/velocity-generator.html">velocity</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/velocity-generator.html">velocity</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">velocity</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2117,9 +2059,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/wsproxy-generator.html">wsproxy</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/wsproxy-generator.html">wsproxy</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2129,9 +2071,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/WebServiceProxyGenerator.html">WebServiceProxyGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">proxy</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2141,9 +2083,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/XMidiGenerator.html">XMidiGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">midi</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2153,9 +2095,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/XMLDBGenerator.html">XMLDBGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xmldb-generator.html">xmldb</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xmldb-generator.html">xmldb</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">xmldb</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2165,9 +2107,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/XMLDBCollectionGenerator.html">XMLDBCollectionGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xmldbcollection-generator.html">xmldbcollection</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xmldbcollection-generator.html">xmldbcollection</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">xmldb</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2177,9 +2119,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/XPathDirectoryGenerator.html">XPathDirectoryGenerator</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xpathdirectory-generator.html">xpathdirectory</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/generators/xpathdirectory-generator.html">xpathdirectory</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -2189,9 +2131,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/generation/XPathTraversableGenerator.html">XPathTraversableGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">repository</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2201,9 +2143,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.html">XSPGenerator</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2214,7 +2156,7 @@
       
 </table>
 </div>
-<a name="N11A20"></a><a name="Matchers"></a>
+<a name="N11A78"></a><a name="Matchers"></a>
 <h4>Matchers</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -2233,9 +2175,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/AbstractPreparableMatcher.html">AbstractPreparableMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2245,9 +2187,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/AbstractRegexpMatcher.html">AbstractRegexpMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2257,9 +2199,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/AbstractWildcardMatcher.html">AbstractWildcardMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2269,9 +2211,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/CookieMatcher.html">CookieMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2281,9 +2223,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/HeaderMatcher.html">HeaderMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2293,9 +2235,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/LocaleMatcher.html">LocaleMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2305,9 +2247,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/modular/CachingRegexpMatcher.html">modular/CachingRegexpMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2317,9 +2259,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/modular/CachingWildcardMatcher.html">modular/CachingWildcardMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2329,9 +2271,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/modular/WildcardMatcher.html">modular/WildcardMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2341,9 +2283,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/MountTableMatcher.html">MountTableMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2353,9 +2295,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/ParameterMatcher.html">ParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2365,9 +2307,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/PreparableMatcher.html">PreparableMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2377,9 +2319,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpHeaderMatcher.html">RegexpHeaderMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2389,9 +2331,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpHostMatcher.html">RegexpHostMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2401,9 +2343,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpParameterMatcher.html">RegexpParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2413,9 +2355,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpRequestAttributeMatcher.html">RegexpRequestAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2425,9 +2367,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpRequestParameterMatcher.html">RegexpRequestParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2437,9 +2379,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpSessionAttributeMatcher.html">RegexpSessionAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2449,9 +2391,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpURIMatcher.html">RegexpURIMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2461,9 +2403,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RegexpURIDefaultsMatcher.html">RegexpURIDefaultsMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2473,9 +2415,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RequestAttributeMatcher.html">RequestAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2485,9 +2427,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/RequestParameterMatcher.html">RequestParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2497,9 +2439,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/SessionAttributeMatcher.html">SessionAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2509,9 +2451,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardHeaderMatcher.html">WildcardHeaderMatcher</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/matchers/wildcardheader-matcher.html">wildcardheader</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/matchers/wildcardheader-matcher.html">wildcardheader</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2521,9 +2463,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardHostMatcher.html">WildcardHostMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2533,9 +2475,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardParameterMatcher.html">WildcardParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2545,9 +2487,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardRequestAttributeMatcher.html">WildcardRequestAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2557,9 +2499,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardRequestParameterMatcher.html">WildcardRequestParameterMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2569,9 +2511,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardSessionAttributeMatcher.html">WildcardSessionAttributeMatcher</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2581,9 +2523,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/matching/WildcardURIMatcher.html">WildcardURIMatcher</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/matchers/wildcarduri-matcher.html">wildcarduri</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/matchers/wildcarduri-matcher.html">wildcarduri</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2594,7 +2536,7 @@
       
 </table>
 </div>
-<a name="N11F42"></a><a name="Readers"></a>
+<a name="N11FD6"></a><a name="Readers"></a>
 <h4>Readers</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -2613,9 +2555,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/AbstractReader.html">AbstractReader</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2625,9 +2567,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/AxisRPCReader.html">AxisRPCReader</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/axisrpc-reader.html">axisrpc</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/axisrpc-reader.html">axisrpc</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">axis</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2637,9 +2579,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/ComposerReader.html">ComposerReader</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2649,9 +2591,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/DatabaseReader.html">DatabaseReader</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/database-reader.html">database</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/database-reader.html">database</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2661,9 +2603,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/DirectoryZipArchiver.html">DirectoryZipArchiver</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/directoryziparchiver-reader.html">directoryziparchiver</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/directoryziparchiver-reader.html">directoryziparchiver</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2673,9 +2615,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/ImageReader.html">ImageReader</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/image-reader.html">image</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/image-reader.html">image</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2685,9 +2627,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/JSPReader.html">JSPReader</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/jsp-reader.html">jsp</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/jsp-reader.html">jsp</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">jsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2697,9 +2639,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/reading/ProxyReader.html">ProxyReader</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2709,9 +2651,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/ResourceReader.html">ResourceReader</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/readers/resource-reader.html">resource</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/readers/resource-reader.html">resource</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2721,9 +2663,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/reading/ServiceableReader.html">ServiceableReader</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2734,7 +2676,7 @@
       
 </table>
 </div>
-<a name="N12128"></a><a name="Selectors"></a>
+<a name="N121D0"></a><a name="Selectors"></a>
 <h4>Selectors</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -2753,9 +2695,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/AbstractRegexpSelector.html">AbstractRegexpSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2765,9 +2707,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/AbstractSwitchSelector.html">AbstractSwitchSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2777,9 +2719,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/BrowserSelector.html">BrowserSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/browser-selector.html">browser</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/browser-selector.html">browser</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2789,9 +2731,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/CookieSelector.html">CookieSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2801,9 +2743,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.html">ComponentsSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2813,9 +2755,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/DateSelector.html">DateSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/date-selector.html">date</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/date-selector.html">date</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2825,9 +2767,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/ExceptionSelector.html">ExceptionSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2837,9 +2779,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/language/generator/GeneratorSelector.html">GeneratorSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xsp</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2849,9 +2791,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/HeaderSelector.html">HeaderSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2861,9 +2803,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/HostSelector.html">HostSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/host-selector.html">host</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/host-selector.html">host</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2873,9 +2815,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/mail/MailCommandSelector.html">MailCommandSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2885,9 +2827,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/selection/MediaSelector.html">MediaSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2897,9 +2839,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/NamedPatternsSelector.html">NamedPatternsSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2909,9 +2851,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/pipeline/OutputComponentSelector.html">OutputComponentSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2921,9 +2863,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/ParameterSelector.html">ParameterSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/parameter-selector.html">parameter</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/parameter-selector.html">parameter</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2933,9 +2875,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/RegexpHeaderSelector.html">RegexpHeaderSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/regular-expression-header-selector.html">regular-expression-header</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/regular-expression-header-selector.html">regular-expression-header</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2945,9 +2887,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/RegexpRequestParameterSelector.html">RegexpRequestParameterSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2957,9 +2899,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/RequestAttributeSelector.html">RequestAttributeSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/requestattribute-selector.html">requestattribute</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/requestattribute-selector.html">requestattribute</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2969,10 +2911,10 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/RequestMethodSelector.html">RequestMethodSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
-  <!-- A --><td colspan="1" rowspan="1">n</td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/requestmethod-selector.html">requestmethod</a></td>
+  <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
   <!-- D --><td colspan="1" rowspan="1"></td>
@@ -2981,9 +2923,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/RequestParameterSelector.html">RequestParameterSelector</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/requestparameter-selector.html">requestparameter</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/selectors/requestparameter-selector.html">requestparameter</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -2993,9 +2935,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/ResourceExistsSelector.html">ResourceExistsSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3005,9 +2947,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/SessionAttributeSelector.html">SessionAttributeSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3017,9 +2959,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/SimpleSelector.html">SimpleSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3029,9 +2971,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/sitemap/SitemapComponentSelector.html">SitemapComponentSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3041,9 +2983,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/SwitchSelector.html">SwitchSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3053,9 +2995,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/selection/XPathExceptionSelector.html">XPathExceptionSelector</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3066,7 +3008,7 @@
       
 </table>
 </div>
-<a name="N125B1"></a><a name="Serializers"></a>
+<a name="N12690"></a><a name="Serializers"></a>
 <h4>Serializers</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -3085,9 +3027,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/AbstractSerializer.html">AbstractSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3097,9 +3039,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/AbstractSerializer.html">AbstractSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3109,9 +3051,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/AbstractTextSerializer.html">AbstractTextSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3121,9 +3063,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/ElementProcessorSerializer.html">ElementProcessorSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">poi</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3133,9 +3075,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/serializers/EncodingSerializer.html">EncodingSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">serializers</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3145,9 +3087,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/EncodingSerializer.html">EncodingSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3157,9 +3099,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/FOPSerializer.html">FOPSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">fop</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3169,9 +3111,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/HSSFSerializer.html">HSSFSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">poi</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3181,9 +3123,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/HTMLSerializer.html">HTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/html-serializer.html">html</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/html-serializer.html">html</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3193,9 +3135,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/serializers/HTMLSerializer.html">HTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">serializers</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3205,9 +3147,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/HTMLSerializer.html">HTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3217,9 +3159,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.html">IncludingHTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3229,9 +3171,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/iTextSerializer.html">iTextSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">itext</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3241,9 +3183,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/LinkSerializer.html">LinkSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/link-serializer.html">link</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/link-serializer.html">link</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3253,9 +3195,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/pcl-serializer.html">pcl</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/pcl-serializer.html">pcl</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3265,9 +3207,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/pdf-serializer.html">pdf</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/pdf-serializer.html">pdf</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3277,9 +3219,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/POIFSSerializer.html">POIFSSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">poi</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3289,9 +3231,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/ps-serializer.html">ps</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/ps-serializer.html">ps</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3301,9 +3243,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/RTFSerializer.html">RTFSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">jfor</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3313,9 +3255,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/Serializer.html">Serializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3325,9 +3267,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/SVGSerializer.html">SVGSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svg-serializer.html">svg</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svg-serializer.html">svg</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">batik</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3337,9 +3279,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgjpeg-serializer.html">svgjpeg</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgjpeg-serializer.html">svgjpeg</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3349,9 +3291,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgpng-serializer.html">svgpng</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgpng-serializer.html">svgpng</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3361,9 +3303,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgtiff-serializer.html">svgtiff</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgtiff-serializer.html">svgtiff</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3373,9 +3315,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgxml-serializer.html">svgxml</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/svgxml-serializer.html">svgxml</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3385,9 +3327,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/SWFSerializer.html">SWFSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">swf</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3397,9 +3339,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/TextSerializer.html">TextSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/text-serializer.html">text</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/text-serializer.html">text</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3409,9 +3351,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/vrml-serializer.html">vrml</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/vrml-serializer.html">vrml</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3421,9 +3363,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/wap-serializer.html">wap</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/wap-serializer.html">wap</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3433,9 +3375,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xhtml-serializer.html">xhtml</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xhtml-serializer.html">xhtml</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3445,9 +3387,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/serializers/XHTMLSerializer.html">XHTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">serializers</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3457,9 +3399,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/XHTMLSerializer.html">XHTMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3469,9 +3411,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xls-serializer.html">xls</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xls-serializer.html">xls</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3481,9 +3423,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/XMidiSerializer.html">XMidiSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">midi</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3493,9 +3435,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/XMLSerializer.html">XMLSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xml-serializer.html">xml</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/xml-serializer.html">xml</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3505,9 +3447,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/sax/XMLSerializer.html">sax/XMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">serializers</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3517,9 +3459,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/components/serializers/XMLSerializer.html">XMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">serializers</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3529,9 +3471,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/garbage/serializer/XMLSerializer.html">XMLSerializer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad/garbage</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3541,9 +3483,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/serialization/ZipArchiveSerializer.html">ZipArchiveSerializer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/ziparchive-serializer.html">ziparchive</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/serializers/ziparchive-serializer.html">ziparchive</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3554,7 +3496,7 @@
 
 </table>
 </div>
-<a name="N12C4E"></a><a name="Transformers"></a>
+<a name="N12D7B"></a><a name="Transformers"></a>
 <h4>Transformers</h4>
 <div style="margin-left: 0 ; border: 2px">
 <table class="ForrestTable" cellspacing="1" cellpadding="4">
@@ -3573,9 +3515,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/constrained/AbstractConstrainedTransformer.html">AbstractConstrainedTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3585,9 +3527,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.html">AbstractCopletTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3597,9 +3539,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/AbstractDOMTransformer.html">AbstractDOMTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3609,9 +3551,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/AbstractExtractionTransformer.html">AbstractExtractionTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3621,9 +3563,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/AbstractSAXTransformer.html">AbstractSAXTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3633,9 +3575,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/transformation/AbstractSessionTransformer.html">AbstractSessionTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3645,9 +3587,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/AbstractTransformer.html">AbstractTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3657,9 +3599,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/AugmentTransformer.html">AugmentTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/augment-transformer.html">augment</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/augment-transformer.html">augment</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3669,9 +3611,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/portal/coplets/basket/BasketTransformer.html">BasketTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 1 -->
+<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/coplets/basket/BasketTransformer.html">BasketTransformer</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3681,9 +3623,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/BetwixtTransformer.html">BetwixtTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3693,9 +3635,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/CastorTransformer.html">CastorTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3705,9 +3647,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/CIncludeTransformer.html">CIncludeTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/cinclude-transformer.html">cinclude</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/cinclude-transformer.html">cinclude</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3717,9 +3659,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/CopletTransformer.html">CopletTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3729,9 +3671,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/DASLTransformer.html">DASLTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">webdav</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3741,9 +3683,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/DeliTransformer.html">DeliTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">deli</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3753,9 +3695,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/EncodeURLTransformer.html">EncodeURLTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/encodeurl-transformer.html">encodeurl</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/encodeurl-transformer.html">encodeurl</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3765,9 +3707,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/ErrorAwareTraxTransformer.html">ErrorAwareTraxTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3777,9 +3719,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/EventLinkTransformer.html">EventLinkTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3789,9 +3731,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/ExtendedParserTransformer.html">ExtendedParserTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3801,9 +3743,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/extractor-transformer.html">extractor</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/extractor-transformer.html">extractor</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1"></td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3813,9 +3755,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/FragmentExtractorTransformer.html">FragmentExtractorTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">batik</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3825,9 +3767,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/FilterTransformer.html">FilterTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/filter-transformer.html">filter</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/filter-transformer.html">filter</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3837,9 +3779,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/forms/transformation/FormsTemplateTransformer.html">FormsTemplateTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">forms</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3849,9 +3791,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.html">HTMLEventLinkTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3861,9 +3803,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/HTMLRootTransformer.html">HTMLRootTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3873,9 +3815,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/HTMLTransformer.html">HTMLTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">html</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3885,9 +3827,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/I18nTransformer.html">I18nTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/i18n-transformer.html">i18n</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/i18n-transformer.html">i18n</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3897,9 +3839,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/IncludeTransformer.html">IncludeTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">scratchpad</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3909,9 +3851,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/JPathTransformer.html">JPathTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -3921,9 +3863,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/JXTemplateTransformer.html">JXTemplateTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3933,9 +3875,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/LDAPTransformer.html">LDAPTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/ldap-transformer.html">ldap</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/ldap-transformer.html">ldap</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">naming</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3945,9 +3887,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/LuceneIndexTransformer.html">LuceneIndexTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">lucene</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3957,9 +3899,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/LexicalTransformer.html">LexicalTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/lexer-transformer.html">lexer</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/lexer-transformer.html">lexer</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3969,9 +3911,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/LinkTransformer.html">LinkTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3981,9 +3923,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/LinkRewriterTransformer.html">LinkRewriterTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">linkrewriter</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -3993,9 +3935,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/LogTransformer.html">LogTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/log-transformer.html">log</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/log-transformer.html">log</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4005,9 +3947,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.html">NewEventLinkTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4017,9 +3959,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/ParserTransformer.html">ParserTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/parser-transformer.html">parser</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/parser-transformer.html">parser</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4029,9 +3971,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/PatternTransformer.html">PatternTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/pattern-transformer.html">pattern</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/pattern-transformer.html">pattern</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">chaperon</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4041,9 +3983,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/ProxyTransformer.html">ProxyTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4053,9 +3995,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/ReadDOMSessionTransformer.html">ReadDOMSessionTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/readdomsession-transformer.html">readdomsession</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/readdomsession-transformer.html">readdomsession</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4065,9 +4007,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/RoleFilterTransformer.html">RoleFilterTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4077,9 +4019,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/portal/transformation/RSSTransformer.html">RSSTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">portal</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4089,9 +4031,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/mail/transformation/SendMailTransformer.html">SendMailTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">mail</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4101,9 +4043,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/ServiceableTransformer.html">ServiceableTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4113,9 +4055,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/transformation/SessionTransformer.html">SessionTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4125,9 +4067,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/transformation/SessionPostTransformer.html">SessionPostTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4137,9 +4079,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/webapps/session/transformation/SessionPreTransformer.html">SessionPreTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">session-fw</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4149,9 +4091,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/SimpleFormInstanceExtractionTransformer.html">SimpleFormInstanceExtractionTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4161,9 +4103,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/SimpleFormTransformer.html">SimpleFormTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4173,9 +4115,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/SourcePropsWritingTransformer.html">SourcePropsWritingTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">repository</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4185,9 +4127,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/SourceWritingTransformer.html">SourceWritingTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/sourcewriting-transformer.html">sourcewriting</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/sourcewriting-transformer.html">sourcewriting</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4197,9 +4139,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/SQLTransformer.html">SQLTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/sql-transformer.html">sql</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/sql-transformer.html">sql</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">databases</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4209,9 +4151,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/TagTransformer.html">TagTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">taglib</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4221,9 +4163,9 @@
 </tr>
 
 <tr>
-  
-<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/TraxTransformer.html">TraxTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 1 -->
+<td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/Transformer.html">TraxTransformer</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4233,9 +4175,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/VariableRewriterTransformer.html">VariableRewriterTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">linkrewriter</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4245,9 +4187,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/Web3RfcTransformer.html">Web3RfcTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">web3</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4257,9 +4199,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/WriteDOMSessionTransformer.html">WriteDOMSessionTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/writedomsession-transformer.html">writedomsession</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/writedomsession-transformer.html">writedomsession</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4269,9 +4211,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/XIncludeTransformer.html">XIncludeTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/xinclude-transformer.html">xinclude</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/xinclude-transformer.html">xinclude</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4281,9 +4223,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/XMLDBTransformer.html">XMLDBTransformer</a></td>
-  <td colspan="1" rowspan="1"></td>
+  <!-- 2 --><td colspan="1" rowspan="1"></td>
   <!-- A --><td colspan="1" rowspan="1">n</td>
   <!-- B --><td colspan="1" rowspan="1">xmldb</td>
   <!-- C --><td colspan="1" rowspan="1">n</td>
@@ -4293,9 +4235,9 @@
 </tr>
 
 <tr>
-  
+  <!-- 1 -->
 <td colspan="1" rowspan="1"><a 
href="../apidocs/org/apache/cocoon/transformation/TraxTransformer.html">TraxTransformer</a></td>
-  <td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/xslt-transformer.html">xslt</a></td>
+  <!-- 2 --><td colspan="1" rowspan="1"><a 
href="../userdocs/transformers/xslt-transformer.html">xslt</a></td>
   <!-- A --><td colspan="1" rowspan="1">y</td>
   <!-- B --><td colspan="1" rowspan="1">core</td>
   <!-- C --><td colspan="1" rowspan="1">y</td>
@@ -4309,7 +4251,7 @@
 </div>
 
     
-<a name="N136B0"></a><a name="To+Do"></a>
+<a name="N13857"></a><a name="To+Do"></a>
 <h3>To Do</h3>
 <div style="margin-left: 0 ; border: 2px">
 <p>Not a list of everything to be done, just a few notes ...</p>
@@ -4344,7 +4286,8 @@
         </li>
         
 <li>
-          Add basic SitemapTask attributes to the java code. This could be
+          Add basic SitemapTask attributes to the java code for each compoent.
+          This could be
           automated. Check if the SitemapTask.java copes with empty default
           values. Add to column C.
         </li>
@@ -4370,7 +4313,8 @@
         
 <li>
           Develop tools to analyse the table and ensure that it remains
-          synchronised.
+          synchronised. See the script in the repository at:
+          tools/review-sitemap-docs/correlate-table.sh
         </li>
         
 <li>

Modified: cocoon/site/site/2.1/plan/review-sitemap-docs.pdf
Url: 
http://svn.apache.org/viewcvs/cocoon/site/site/2.1/plan/review-sitemap-docs.pdf?view=diff&rev=123595&p1=cocoon/site/site/2.1/plan/review-sitemap-docs.pdf&r1=123594&p2=cocoon/site/site/2.1/plan/review-sitemap-docs.pdf&r2=123595
==============================================================================
Binary files. No diff available.

Reply via email to