Return-Path: 
 <cvs-return-26365-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 14279 invoked from network); 15 Feb 2006 06:38:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 15 Feb 2006 06:38:08 -0000
Received: (qmail 99698 invoked by uid 500); 15 Feb 2006 06:38:05 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 99521 invoked by uid 500); 15 Feb 2006 06:38:03 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 99410 invoked by uid 99); 15 Feb 2006 06:38:02 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2006 22:38:02 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Tue, 14 Feb 2006 22:37:50 -0800
Received: (qmail 13074 invoked by uid 65534); 15 Feb 2006 06:37:30 -0000
Message-ID: <20060215063730.13073.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r377949 [10/21] - in /cocoon/site/site/2.1: ./
 developing/
 developing/portal/ developing/portal/coplets/ developing/webapps/
 developing/webapps/authentication/ faq/ howto/ installing/
 plan/documentation/ plan/otherplanning/ plan/overview/ s...
Date: Wed, 15 Feb 2006 06:36:23 -0000
To: cvs@cocoon.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.0.6
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Modified: cocoon/site/site/2.1/userdocs/file-generator.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/file-generator.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/file-generator.html (original)
+++ cocoon/site/site/2.1/userdocs/file-generator.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1231,7 +1229,7 @@
      
 </pre>
 <p>You can also use an absolute filesystem pathname. See the explanation of
-<a href="../../2.1/">file: URLs</a>
+<a href="../../2.1/userdocs/concepts/sitemap/../sitemap.html#file-url">file: URLs</a>
 </p>
 <p>Be careful to only request xml or xhtml documents, and not html documents.
 You would get surprising results, including network trips for HTML DTDs that are

Modified: cocoon/site/site/2.1/userdocs/filter-transformer.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/filter-transformer.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/filter-transformer.html (original)
+++ cocoon/site/site/2.1/userdocs/filter-transformer.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/flow/api.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/api.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/api.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/api.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1225,7 +1223,7 @@
 incorporated into official Mozilla Rhino version and is shipped with Cocoon 2.2.
 </p>
 </div>
-<a name="N10015"></a><a name="Flow+Object+Model"></a>
+<a name="N10015"></a><a name="FOM"></a>
 <h2 class="h3">Flow Object Model</h2>
 <div class="section">
 <p>Cocoon provides a set of system objects for use by Flowscripts. We call this
@@ -1266,7 +1264,7 @@
 </li>
 
 </ul>
-<a name="N10048"></a><a name="Cocoon+Object"></a>
+<a name="N10049"></a><a name="Cocoon+Object"></a>
 <h3 class="h4">Cocoon Object</h3>
 <p>The <tt>Cocoon</tt> object represents the current Cocoon Sitemap. This is the
 entry point into the FOM. There is one instance of <tt>Cocoon</tt> which you may
@@ -1276,43 +1274,43 @@
     </pre>
 <p>The <tt>Cocoon</tt> object supports the following properties and functions:
 </p>
-<a name="N1005E"></a><a name="request"></a>
+<a name="N10060"></a><a name="request-N10060"></a>
 <h4>request</h4>
 <p>The current Cocoon request:</p>
 <p>
 <em>Property</em> [<a href="#request">Request</a>] <tt>request</tt>
 </p>
-<a name="N1006E"></a><a name="response"></a>
+<a name="N10070"></a><a name="response-N10070"></a>
 <h4>response</h4>
 <p>The current Cocoon response:</p>
 <p>
 <em>Property</em> [<a href="#response">Response</a>] <tt>response</tt>
 </p>
-<a name="N1007E"></a><a name="session"></a>
+<a name="N10080"></a><a name="session-N10080"></a>
 <h4>session</h4>
 <p>The current Cocoon session:</p>
 <p>
 <em>Property</em> [<a href="#session">Session</a>] <tt>session</tt>
 </p>
-<a name="N1008E"></a><a name="context"></a>
+<a name="N10090"></a><a name="context-N10090"></a>
 <h4>context</h4>
 <p>The current Cocoon application context:</p>
 <p>
 <em>Property</em> [<a href="#context">Context</a>] <tt>context</tt>
 </p>
-<a name="N1009E"></a><a name="log"></a>
+<a name="N100A0"></a><a name="log-N100A0"></a>
 <h4>log</h4>
 <p>A reference to the current logger:</p>
 <p>
 <em>Property</em> [<a href="#log">Log</a>] <tt>log</tt>
 </p>
-<a name="N100AE"></a><a name="parameters"></a>
+<a name="N100B0"></a><a name="parameters"></a>
 <h4>parameters</h4>
 <p>Any parameters passed to the script by the Cocoon Sitemap</p>
 <p>
 <em>Property</em> <tt>[Object] parameters</tt>
 </p>
-<a name="N100BA"></a><a name="sendPage"></a>
+<a name="N100BC"></a><a name="sendPage-N100BC"></a>
 <h4>sendPage</h4>
 <p>
 <em>Function</em> <tt>sendPage([String] uri, [Object] bean)</tt>
@@ -1332,7 +1330,7 @@
 <div class="content">Use <tt>value="{flow-attribute:name}"</tt> in any parameter tag
 in the sitemap to access a value from the bean.</div>
 </div>
-<a name="N100D9"></a><a name="sendPageAndWait"></a>
+<a name="N100DC"></a><a name="sendPageAndWait-N100DC"></a>
 <h4>sendPageAndWait</h4>
 <p>
 <em>Function</em> <tt>[WebContinuation] sendPageAndWait([String] uri,
@@ -1378,13 +1376,13 @@
 created.</p>
 <p>The return value is the <a href="#WebContinuation">continuation</a> object.
 </p>
-<a name="N1010B"></a><a name="sendStatus"></a>
+<a name="N1010F"></a><a name="sendStatus-N1010F"></a>
 <h4>sendStatus</h4>
 <p>
 <em>Function</em> <tt>sendStatus([Number] sc)</tt>
 </p>
 <p>Sends an empty response with the provided HTTP status code.</p>
-<a name="N10117"></a><a name="createPageLocal"></a>
+<a name="N1011C"></a><a name="createPageLocal-N1011C"></a>
 <h4>createPageLocal</h4>
 <p>
 <em>Function</em> <tt>[Object] createPageLocal()</tt>
@@ -1394,7 +1392,7 @@
 <a href="#sendPageAndWait">sendPageAndWait</a> was originally called, each time
 a page is resubmitted (e.g. after hitting the back button). Such objects can be
 used to associate state with one particular page sent to the browser.</p>
-<a name="N1012A"></a><a name="processPipelineTo"></a>
+<a name="N10130"></a><a name="processPipelineTo"></a>
 <h4>processPipelineTo</h4>
 <p>
 <em>Function</em> <tt>processPipelineTo([String] uri, [Object] bizData,
@@ -1413,14 +1411,14 @@
 <p>
 <tt>stream</tt> is an <tt>OutputStream</tt> where the output should be
 written to.</p>
-<a name="N10148"></a><a name="redirectTo"></a>
+<a name="N1014E"></a><a name="redirectTo"></a>
 <h4>redirectTo</h4>
 <p>
 <em>Function</em> <tt>redirectTo([String] uri)</tt>
 </p>
 <p>Send a client-side redirect to the browser. The <tt>uri</tt> argument is the
 URI to which the browser should be redirected.</p>
-<a name="N10157"></a><a name="createWebContinuation"></a>
+<a name="N1015D"></a><a name="createWebContinuation-N1015D"></a>
 <h4>createWebContinuation</h4>
 <p>
 <em>Function</em> <tt>[WebContinuation] createWebContinuation()</tt>
@@ -1441,26 +1439,26 @@
                          function() { releaseData(biz); });
 }
 </pre>
-<a name="N1016B"></a><a name="load"></a>
+<a name="N10172"></a><a name="load"></a>
 <h4>load</h4>
 <p>
 <em>Function</em> <tt>load([String] uri)</tt>
 </p>
 <p>Load the JavaScript script specified by <tt>uri</tt>. The Cocoon source
 resolver is used to resolve <tt>uri</tt>.</p>
-<a name="N1017D"></a><a name="getComponent"></a>
+<a name="N10184"></a><a name="getComponent"></a>
 <h4>getComponent</h4>
 <p>
 <em>Function</em> <tt>Object getComponent([String] id)</tt>
 </p>
 <p>Access an Avalon component.</p>
-<a name="N10189"></a><a name="releaseComponent"></a>
+<a name="N10190"></a><a name="releaseComponent"></a>
 <h4>releaseComponent</h4>
 <p>
 <em>Function</em> <tt>releaseComponent([Object] component)</tt>
 </p>
 <p>Release a pooled Avalon component.</p>
-<a name="N10195"></a><a name="createObject"></a>
+<a name="N1019C"></a><a name="createObject"></a>
 <h4>createObject</h4>
 <p>
 <em>Function</em> <tt>createObject([JavaClass] componentClass)</tt>
@@ -1468,13 +1466,13 @@
 <p>Create and setup an object so that it can access the information provided to
 regular components. This is done by calling the various Avalon lifecycle
 interfaces implemented by the object.</p>
-<a name="N101A1"></a><a name="disposeObject"></a>
+<a name="N101A8"></a><a name="disposeObject"></a>
 <h4>disposeObject</h4>
 <p>
 <em>Function</em> <tt>disposeObject([Object] object)</tt>
 </p>
 <p>Dispose an object that has been created using <tt>createObject</tt>.</p>
-<a name="N101B0"></a><a name="exit"></a>
+<a name="N101B7"></a><a name="exit"></a>
 <h4>exit</h4>
 <p>
 <em>Function</em> exit()</p>
@@ -1485,192 +1483,192 @@
 <p>An example is a "login" function where the caller function expects this
 function to exit only if login is successful, but that has to handle e.g. a
 registration process that includes a "cancel" button.</p>
-<a name="N101BE"></a><a name="Request+Object"></a>
+<a name="N101C5"></a><a name="Request+Object"></a>
 <h3 class="h4">Request Object</h3>
 <p>The <tt>Request</tt> object represents the current Cocoon request. It
 provides the following functions and properties:</p>
-<a name="N101C7"></a><a name="get"></a>
+<a name="N101CF"></a><a name="get"></a>
 <h4>get</h4>
 <p>
 <em>Function</em> <tt>[String] get([String] name)</tt>
 </p>
 <p>Get the request parameter or attribute with the specified <tt>name</tt>.</p>
-<a name="N101D6"></a><a name="getAttribute"></a>
+<a name="N101DE"></a><a name="getAttribute"></a>
 <h4>getAttribute</h4>
 <p>
 <em>Function</em> <tt>[String] getAttribute([String] name)</tt>
 </p>
 <p>Get the request attribute with the specified <tt>name</tt>.</p>
-<a name="N101E5"></a><a name="getAttributeNames"></a>
+<a name="N101ED"></a><a name="getAttributeNames"></a>
 <h4>getAttributeNames</h4>
 <p>
 <em>Function</em> <tt>[java.util.Enumeration] getAttributeNames()</tt>
 </p>
 <p>Get an enumeration of request attribute names.</p>
-<a name="N101F1"></a><a name="setAttribute"></a>
+<a name="N101F9"></a><a name="setAttribute"></a>
 <h4>setAttribute</h4>
 <p>
 <em>Function</em> <tt>setAttribute([String] name, [Object] value)</tt>
 </p>
 <p>Set the value of a request attribute.</p>
-<a name="N101FD"></a><a name="removeAttribute"></a>
+<a name="N10205"></a><a name="removeAttribute"></a>
 <h4>removeAttribute</h4>
 <p>
 <em>Function</em> <tt>removeAttribute([String] name)</tt>
 </p>
 <p>Remove the attribute with the name <tt>name</tt> from this request.</p>
-<a name="N1020C"></a><a name="getCharacterEncoding"></a>
+<a name="N10214"></a><a name="getCharacterEncoding"></a>
 <h4>getCharacterEncoding</h4>
 <p>
 <em>Function</em> <tt>[String]getCharacterEncoding()</tt>
 </p>
 <p>Return the character encoding used by this request.</p>
-<a name="N10218"></a><a name="setCharacterEncoding"></a>
+<a name="N10220"></a><a name="setCharacterEncoding"></a>
 <h4>setCharacterEncoding</h4>
 <p>
 <em>Function</em> <tt>setCharacterEncoding([String] value)</tt>
 </p>
 <p>Set the character encoding used by this request.</p>
-<a name="N10224"></a><a name="getContentLength"></a>
+<a name="N1022C"></a><a name="getContentLength"></a>
 <h4>getContentLength</h4>
 <p>
 <em>Function</em> <tt>[Number] getContentLength()</tt>
 </p>
 <p>Get the content-length of this request</p>
-<a name="N10230"></a><a name="getContentType"></a>
+<a name="N10238"></a><a name="getContentType"></a>
 <h4>getContentType</h4>
 <p>
 <em>Function</em> <tt>[String] getContentType()</tt>
 </p>
 <p>Get the content-type of this request</p>
-<a name="N1023C"></a><a name="getParameter"></a>
+<a name="N10244"></a><a name="getParameter"></a>
 <h4>getParameter</h4>
 <p>
 <em>Function</em> <tt>[String] getParameter([String] name)</tt>
 </p>
 <p>Get the request parameter with the specified <tt>name</tt>.</p>
-<a name="N1024B"></a><a name="getParameterValues"></a>
+<a name="N10253"></a><a name="getParameterValues"></a>
 <h4>getParameterValues</h4>
 <p>
 <em>Function</em> <tt>[Array] getParameterValues([String] name)</tt>
 </p>
 <p>Get an array of request parameters with the specified <tt>name</tt>.</p>
-<a name="N1025A"></a><a name="getParameterNames"></a>
+<a name="N10262"></a><a name="getParameterNames"></a>
 <h4>getParameterNames</h4>
 <p>
 <em>Function</em> <tt>[java.util.Enumeration] getParameterNames()</tt>
 </p>
 <p>Get an enumeration of the parameter names in this request.</p>
-<a name="N10266"></a><a name="getAuthType"></a>
+<a name="N1026E"></a><a name="getAuthType"></a>
 <h4>getAuthType</h4>
 <p>
 <em>Function</em> <tt>[String] getAuthType()</tt>
 </p>
 <p>Get the authorization type used in this request.</p>
-<a name="N10272"></a><a name="getProtocol"></a>
+<a name="N1027A"></a><a name="getProtocol"></a>
 <h4>getProtocol</h4>
 <p>
 <em>Function</em> <tt>[String] getProtocol()</tt>
 </p>
 <p>Get the protocol used in this request.</p>
-<a name="N1027E"></a><a name="getScheme"></a>
+<a name="N10286"></a><a name="getScheme"></a>
 <h4>getScheme</h4>
 <p>
 <em>Function</em> <tt>[String] getScheme()</tt>
 </p>
 <p>Get the scheme used in this request.</p>
-<a name="N1028A"></a><a name="getMethod"></a>
+<a name="N10292"></a><a name="getMethod"></a>
 <h4>getMethod</h4>
 <p>
 <em>Function</em> <tt>[String] getMethod()</tt>
 </p>
 <p>Get the method used in this request.</p>
-<a name="N10296"></a><a name="getServerName"></a>
+<a name="N1029E"></a><a name="getServerName"></a>
 <h4>getServerName</h4>
 <p>
 <em>Function</em> <tt>[String] getServerName()</tt>
 </p>
 <p>Get the server name of this request.</p>
-<a name="N102A2"></a><a name="getServerPort"></a>
+<a name="N102AA"></a><a name="getServerPort"></a>
 <h4>getServerPort</h4>
 <p>
 <em>Function</em> <tt>[Number] getServerPort()</tt>
 </p>
 <p>Get the server port of this request.</p>
-<a name="N102AE"></a><a name="getRemoteAddr"></a>
+<a name="N102B6"></a><a name="getRemoteAddr"></a>
 <h4>getRemoteAddr</h4>
 <p>
 <em>Function</em> <tt>[String] getRemoteAddr()</tt>
 </p>
 <p>Get the remote address of this request.</p>
-<a name="N102BA"></a><a name="isSecure"></a>
+<a name="N102C2"></a><a name="isSecure"></a>
 <h4>isSecure</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isSecure()</tt>
 </p>
 <p>Get the <tt>secure</tt> property of this request.</p>
-<a name="N102C9"></a><a name="getLocale"></a>
+<a name="N102D1"></a><a name="getLocale"></a>
 <h4>getLocale</h4>
 <p>
 <em>Function</em> <tt>[String] getLocale()</tt>
 </p>
 <p>Get the locale of this request.</p>
-<a name="N102D5"></a><a name="getLocales"></a>
+<a name="N102DD"></a><a name="getLocales"></a>
 <h4>getLocales</h4>
 <p>
 <em>Function</em> <tt>[Array [String]] getLocales()</tt>
 </p>
 <p>Get the locales of this request.</p>
-<a name="N102E1"></a><a name="getCookies"></a>
+<a name="N102E9"></a><a name="getCookies"></a>
 <h4>getCookies</h4>
 <p>
 <em>Function</em> <tt>[Array [Cookie]] getCookies()</tt>
 </p>
 <p>Get the cookies associated with this request.</p>
-<a name="N102ED"></a><a name="getHeader"></a>
+<a name="N102F5"></a><a name="getHeader"></a>
 <h4>getHeader</h4>
 <p>
 <em>Function</em> <tt>[String] getHeader([String] name)</tt>
 </p>
 <p>Get the header with <tt>name</tt> from this request.</p>
-<a name="N102FC"></a><a name="getHeaders"></a>
+<a name="N10304"></a><a name="getHeaders"></a>
 <h4>getHeaders</h4>
 <p>
 <em>Function</em> <tt>[Array] getHeaders()</tt>
 </p>
 <p>Get the headers associated with this request.</p>
-<a name="N10308"></a><a name="getHeaderNames"></a>
+<a name="N10310"></a><a name="getHeaderNames"></a>
 <h4>getHeaderNames</h4>
 <p>
 <em>Function</em> <tt>[java.util.Enumeration] getHeaderNames()</tt>
 </p>
 <p>Get an enumeration of header names from this request.</p>
-<a name="N10314"></a><a name="getRemoteUser"></a>
+<a name="N1031C"></a><a name="getRemoteUser"></a>
 <h4>getRemoteUser</h4>
 <p>
 <em>Function</em> <tt>[String] getRemoteUser()</tt>
 </p>
 <p>Get the remote user associated with this request.</p>
-<a name="N10320"></a><a name="getUserPrincipal"></a>
+<a name="N10328"></a><a name="getUserPrincipal"></a>
 <h4>getUserPrincipal</h4>
 <p>
 <em>Function</em> <tt>[String] getUserPrincipal()</tt>
 </p>
 <p>Get the user principal associated with this request.</p>
-<a name="N1032C"></a><a name="isUserInRole"></a>
+<a name="N10334"></a><a name="isUserInRole"></a>
 <h4>isUserInRole</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isUserInRole([String] role)</tt>
 </p>
 <p>Returns whether the user associated with this request is in the specified
 <tt>role</tt>.</p>
-<a name="N1033B"></a><a name="Properties"></a>
+<a name="N10343"></a><a name="Properties"></a>
 <h4>Properties</h4>
 <p>
 <tt>Request</tt> properties map to request parameters, i.e.
 <tt>request.blah</tt> is equivalent to <tt>request.getParameter("blah")</tt>.
 </p>
-<a name="N10349"></a><a name="Response+Object"></a>
+<a name="N10351"></a><a name="Response+Object"></a>
 <h3 class="h4">Response Object</h3>
 <p>The <tt>Response</tt> object represents the Cocoon response associated with
 the current request.</p>
@@ -1679,76 +1677,76 @@
 machinery (like output encoding, for example, which should *NOT* be determined
 by the flow).</p>
 <p>It provides the following functions and properties:</p>
-<a name="N10356"></a><a name="createCookie"></a>
+<a name="N1035F"></a><a name="createCookie"></a>
 <h4>createCookie</h4>
 <p>
 <em>Function</em> <tt>[Cookie] createCookie([String] name, [String]
 value)</tt>
 </p>
 <p>Creates a new <a href="#cookie">Cookie</a>.</p>
-<a name="N10366"></a><a name="addCookie"></a>
+<a name="N1036F"></a><a name="addCookie"></a>
 <h4>addCookie</h4>
 <p>
 <em>Function</em> <tt>addCookie([Cookie] cookie)</tt>
 </p>
 <p>Adds <tt>cookie</tt> to the current response.</p>
-<a name="N10375"></a><a name="containsHeader"></a>
+<a name="N1037E"></a><a name="containsHeader"></a>
 <h4>containsHeader</h4>
 <p>
 <em>Function</em> <tt>[Boolean] containsHeader([String] name)</tt>
 </p>
 <p>Returns whether the current response contains a header with the specified
 <tt>name</tt>.</p>
-<a name="N10384"></a><a name="setHeader"></a>
+<a name="N1038D"></a><a name="setHeader"></a>
 <h4>setHeader</h4>
 <p>
 <em>Function</em> <tt>setHeader([String] name, [String] value)</tt>
 </p>
 <p>Replaces the value of the header with <tt>name</tt> with <tt>value</tt>.</p>
-<a name="N10396"></a><a name="addHeader"></a>
+<a name="N1039F"></a><a name="addHeader"></a>
 <h4>addHeader</h4>
 <p>
 <em>Function</em> <tt>addHeader([String] name, [String] value)</tt>
 </p>
 <p>Creates a new header in the current response with the specified <tt>name</tt>
 and <tt>value</tt>.</p>
-<a name="N103A8"></a><a name="setStatus"></a>
+<a name="N103B1"></a><a name="setStatus"></a>
 <h4>setStatus</h4>
 <p>
 <em>Function</em> <tt>setStatus([Number] sc)</tt>
 </p>
 <p>Sets the status code for this response.</p>
-<a name="N103B4"></a><a name="Session+Object"></a>
+<a name="N103BD"></a><a name="Session+Object"></a>
 <h3 class="h4">Session Object</h3>
 <p>The <tt>Session</tt> object represents the user session associated with the
 current Cocoon request.</p>
 <p>It provides the following functions and properties:</p>
-<a name="N103BF"></a><a name="getAttribute-N103BF"></a>
+<a name="N103C9"></a><a name="getAttribute-N103C9"></a>
 <h4>getAttribute</h4>
 <p>
 <em>Function</em> <tt>[Object] getAttribute([String] name)</tt>
 </p>
 <p>Get the value of the session attribute with the specified <tt>name</tt>.</p>
-<a name="N103CE"></a><a name="setAttribute-N103CE"></a>
+<a name="N103D8"></a><a name="setAttribute-N103D8"></a>
 <h4>setAttribute</h4>
 <p>
 <em>Function</em> <tt>setAttribute([String] name, [Object] value)</tt>
 </p>
 <p>Set the value of the session attribute with the specified <tt>name</tt> to
 <tt>value</tt>.</p>
-<a name="N103E0"></a><a name="removeAttribute-N103E0"></a>
+<a name="N103EA"></a><a name="removeAttribute-N103EA"></a>
 <h4>removeAttribute</h4>
 <p>
 <em>Function</em> <tt>removeAttribute([String] name)</tt>
 </p>
 <p>Remove the session attribute with the specified <tt>name</tt>.</p>
-<a name="N103EF"></a><a name="invalidate"></a>
+<a name="N103F9"></a><a name="invalidate"></a>
 <h4>invalidate</h4>
 <p>
 <em>Function</em> <tt>invalidate()</tt>
 </p>
 <p>Invalidate this session, releasing all resources associated with it.</p>
-<a name="N103FB"></a><a name="isNew"></a>
+<a name="N10405"></a><a name="isNew"></a>
 <h4>isNew</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isNew()</tt>
@@ -1757,27 +1755,27 @@
 the client chooses not to join the session. For example, if the server used only
 cookie-based sessions, and the client had disabled the use of cookies, then a
 session would be new on each request.</p>
-<a name="N1040A"></a><a name="getId"></a>
+<a name="N10414"></a><a name="getId"></a>
 <h4>getId</h4>
 <p>
 <em>Function</em> <tt>[String] getId()</tt>
 </p>
 <p>Returns the unique id associated with this session.</p>
-<a name="N10416"></a><a name="getCreationTime"></a>
+<a name="N10420"></a><a name="getCreationTime"></a>
 <h4>getCreationTime</h4>
 <p>
 <em>Function</em> <tt>[Number] getCreationTime()</tt>
 </p>
 <p>Returns the time when this session was created, measured in milliseconds
 since midnight January 1, 1970 GMT.</p>
-<a name="N10422"></a><a name="getLastAccessedTime"></a>
+<a name="N1042C"></a><a name="getLastAccessedTime"></a>
 <h4>getLastAccessedTime</h4>
 <p>
 <em>Function</em> <tt>[Number] getLastAccessedTime()</tt>
 </p>
 <p>Returns the last time the client sent a request associated with this session,
 as the number of milliseconds since midnight January 1, 1970 GMT.</p>
-<a name="N1042E"></a><a name="setMaxInactiveInterval"></a>
+<a name="N10438"></a><a name="setMaxInactiveInterval"></a>
 <h4>setMaxInactiveInterval</h4>
 <p>
 <em>Function</em> <tt>setMaxInactiveInterval([Number] interval)</tt>
@@ -1785,7 +1783,7 @@
 <p>Specifies the time, in seconds, between client requests before the
 contextcontainer will invalidate this session. A negative time indicates the
 session should never timeout.</p>
-<a name="N1043A"></a><a name="getMaxInactiveInterval"></a>
+<a name="N10444"></a><a name="getMaxInactiveInterval"></a>
 <h4>getMaxInactiveInterval</h4>
 <p>
 <em>Function</em> <tt>[Number] getMaxInactiveInterval()</tt>
@@ -1795,137 +1793,137 @@
 context container will invalidate the session. The maximum time interval can be
 set with the <tt>setMaxInactiveInterval</tt> method. A negative time indicates
 the session should never timeout.</p>
-<a name="N10449"></a><a name="Properties-N10449"></a>
+<a name="N10453"></a><a name="Properties-N10453"></a>
 <h4>Properties</h4>
 <p>
 <tt>Session</tt> properties map to session attributes, i.e.
 <tt>session.blah</tt> is equivalent to <tt>session.getAttribute("blah")</tt>.
 </p>
-<a name="N10457"></a><a name="Context+Object"></a>
+<a name="N10461"></a><a name="Context+Object"></a>
 <h3 class="h4">Context Object</h3>
 <p>The <tt>Context</tt> object represents the client context associated with the
 current Cocoon request.</p>
 <p>It provides the following functions and properties:</p>
-<a name="N10462"></a><a name="getAttribute-N10462"></a>
+<a name="N1046D"></a><a name="getAttribute-N1046D"></a>
 <h4>getAttribute</h4>
 <p>
 <em>Function</em> <tt>[Object] getAttribute([String] name)</tt>
 </p>
 <p>Get the value of the context attribute with the specified <tt>name</tt>.</p>
-<a name="N10471"></a><a name="setAttribute-N10471"></a>
+<a name="N1047C"></a><a name="setAttribute-N1047C"></a>
 <h4>setAttribute</h4>
 <p>
 <em>Function</em> <tt>setAttribute([String] name, [Object] value)</tt>
 </p>
 <p>Set the value of the context attribute with the specified <tt>name</tt> to
 <tt>value</tt>.</p>
-<a name="N10483"></a><a name="removeAttribute-N10483"></a>
+<a name="N1048E"></a><a name="removeAttribute-N1048E"></a>
 <h4>removeAttribute</h4>
 <p>
 <em>Function</em> <tt>removeAttribute([String] name)</tt>
 </p>
 <p>Remove the context attribute with the specified <tt>name</tt>.</p>
-<a name="N10492"></a><a name="getInitParameter"></a>
+<a name="N1049D"></a><a name="getInitParameter"></a>
 <h4>getInitParameter</h4>
 <p>
 <em>Function</em> <tt>getInitParameter([String] name)</tt>
 </p>
 <p>Get the value of the context initialization parameter with the specified
 <tt>name</tt>.</p>
-<a name="N104A1"></a><a name="Properties-N104A1"></a>
+<a name="N104AC"></a><a name="Properties-N104AC"></a>
 <h4>Properties</h4>
 <p>
 <tt>Context</tt> properties map to context attributes, i.e.
 <tt>context.blah</tt> is equivalent to <tt>context.getAttribute("blah")</tt>.
 </p>
-<a name="N104AF"></a><a name="Cookie+Object"></a>
+<a name="N104BA"></a><a name="Cookie+Object"></a>
 <h3 class="h4">Cookie Object</h3>
 <p>
 <tt>Cookie</tt> provides the following functions and properties:</p>
-<a name="N104B7"></a><a name="getName"></a>
+<a name="N104C3"></a><a name="getName"></a>
 <h4>getName</h4>
 <p>
 <em>Function</em> <tt>[String] getName()</tt>
 </p>
 <p>Get the name of this cookie.</p>
-<a name="N104C3"></a><a name="getVersion"></a>
+<a name="N104CF"></a><a name="getVersion"></a>
 <h4>getVersion</h4>
 <p>
 <em>Function</em> <tt>[String] getVersion()</tt>
 </p>
 <p>Get the version of this cookie.</p>
-<a name="N104CF"></a><a name="setVersion"></a>
+<a name="N104DB"></a><a name="setVersion"></a>
 <h4>setVersion</h4>
 <p>
 <em>Function</em> <tt>setVersion([String] version)</tt>
 </p>
 <p>Set the version of this cookie.</p>
-<a name="N104DB"></a><a name="getValue"></a>
+<a name="N104E7"></a><a name="getValue"></a>
 <h4>getValue</h4>
 <p>
 <em>Function</em> <tt>[String] getValue()</tt>
 </p>
 <p>Get the value of this cookie.</p>
-<a name="N104E7"></a><a name="setValue"></a>
+<a name="N104F3"></a><a name="setValue"></a>
 <h4>setValue</h4>
 <p>
 <em>Function</em> <tt>setValue([String] value)</tt>
 </p>
 <p>Set the value of this cookie.</p>
-<a name="N104F3"></a><a name="getComment"></a>
+<a name="N104FF"></a><a name="getComment"></a>
 <h4>getComment</h4>
 <p>
 <em>Function</em> <tt>[String] getComment()</tt>
 </p>
 <p>Get the comment of this cookie.</p>
-<a name="N104FF"></a><a name="setComment"></a>
+<a name="N1050B"></a><a name="setComment"></a>
 <h4>setComment</h4>
 <p>
 <em>Function</em> <tt>setComment([String] comment)</tt>
 </p>
 <p>Set the comment of this cookie.</p>
-<a name="N1050B"></a><a name="getDomain"></a>
+<a name="N10517"></a><a name="getDomain"></a>
 <h4>getDomain</h4>
 <p>
 <em>Function</em> <tt>[String] getDomain()</tt>
 </p>
 <p>Get the domain of this cookie.</p>
-<a name="N10517"></a><a name="setDomain"></a>
+<a name="N10523"></a><a name="setDomain"></a>
 <h4>setDomain</h4>
 <p>
 <em>Function</em> <tt>setDomain([String] domain)</tt>
 </p>
 <p>Set the domain of this cookie.</p>
-<a name="N10523"></a><a name="getPath"></a>
+<a name="N1052F"></a><a name="getPath"></a>
 <h4>getPath</h4>
 <p>
 <em>Function</em> <tt>[String] getPath()</tt>
 </p>
 <p>Get the path of this cookie.</p>
-<a name="N1052F"></a><a name="setPath"></a>
+<a name="N1053B"></a><a name="setPath"></a>
 <h4>setPath</h4>
 <p>
 <em>Function</em> <tt>setPath([String] path)</tt>
 </p>
 <p>Set the path of this cookie.</p>
-<a name="N1053B"></a><a name="getSecure"></a>
+<a name="N10547"></a><a name="getSecure"></a>
 <h4>getSecure</h4>
 <p>
 <em>Function</em> <tt>[Boolean] getSecure()</tt>
 </p>
 <p>Get the secure property of this cookie.</p>
-<a name="N10547"></a><a name="setSecure"></a>
+<a name="N10553"></a><a name="setSecure"></a>
 <h4>setSecure</h4>
 <p>
 <em>Function</em> <tt>setSecure([Boolean] value)</tt>
 </p>
 <p>Set the secure property of this cookie.</p>
-<a name="N10553"></a><a name="Log+Object"></a>
+<a name="N1055F"></a><a name="Log+Object"></a>
 <h3 class="h4">Log Object</h3>
 <p>The <tt>Log</tt> object provides an interface to the Cocoon logging system.
 </p>
 <p>It supports the following functions:</p>
-<a name="N1055E"></a><a name="error"></a>
+<a name="N1056B"></a><a name="error"></a>
 <h4>error</h4>
 <p>
 <em>Function</em> <tt>error([String] message, [java.lang.Throwable]
@@ -1933,7 +1931,7 @@
 </p>
 <p>Log an error message. If <tt>exception</tt> is provided its stack trace will
 also be logged.</p>
-<a name="N1056D"></a><a name="debug"></a>
+<a name="N1057A"></a><a name="debug"></a>
 <h4>debug</h4>
 <p>
 <em>Function</em> <tt>debug([String] message, [java.lang.Throwable]
@@ -1941,7 +1939,7 @@
 </p>
 <p>Log a debug message. If <tt>exception</tt> is provided its stack trace will
 also be logged.</p>
-<a name="N1057C"></a><a name="warn"></a>
+<a name="N10589"></a><a name="warn"></a>
 <h4>warn</h4>
 <p>
 <em>Function</em> <tt>warn([String] message, [java.lang.Throwable]
@@ -1949,7 +1947,7 @@
 </p>
 <p>Log a warning message. If <tt>exception</tt> is provided its stack trace will
 also be logged.</p>
-<a name="N1058B"></a><a name="info"></a>
+<a name="N10598"></a><a name="info"></a>
 <h4>info</h4>
 <p>
 <em>Function</em> <tt>info([String] message, [java.lang.Throwable]
@@ -1957,31 +1955,31 @@
 </p>
 <p>Log an information message. If <tt>exception</tt> is provided its stack trace
 will also be logged.</p>
-<a name="N1059A"></a><a name="isErrorEnabled"></a>
+<a name="N105A7"></a><a name="isErrorEnabled"></a>
 <h4>isErrorEnabled</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isErrorEnabled()</tt>
 </p>
 <p>Returns whether error message logging is enabled.</p>
-<a name="N105A6"></a><a name="isDebugEnabled"></a>
+<a name="N105B3"></a><a name="isDebugEnabled"></a>
 <h4>isDebugEnabled</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isDebugEnabled()</tt>
 </p>
 <p>Returns whether debug message logging is enabled.</p>
-<a name="N105B2"></a><a name="isWarnEnabled"></a>
+<a name="N105BF"></a><a name="isWarnEnabled"></a>
 <h4>isWarnEnabled</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isWarnEnabled()</tt>
 </p>
 <p>Returns whether warning message logging is enabled.</p>
-<a name="N105BE"></a><a name="isInfoEnabled"></a>
+<a name="N105CB"></a><a name="isInfoEnabled"></a>
 <h4>isInfoEnabled</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isInfoEnabled()</tt>
 </p>
 <p>Returns whether information message logging is enabled.</p>
-<a name="N105CA"></a><a name="WebContinuation"></a>
+<a name="N105D7"></a><a name="WebContinuation-N105D7"></a>
 <h3 class="h4">WebContinuation</h3>
 <p>A <tt>WebContinuation</tt> represents a continuation of a Flowscript. Because
 a user may click on the back button in the browser and restart a saved
@@ -1992,20 +1990,20 @@
 <p>
 <tt>WebContinuation</tt> objects support the following functions and
 properties:</p>
-<a name="N105E2"></a><a name="id"></a>
+<a name="N105F0"></a><a name="id"></a>
 <h4>id</h4>
 <p>
 <em>Property</em> <tt>[String] id</tt>
 </p>
 <p>Returns the unique string identifier of this Web Continuation.</p>
-<a name="N105EE"></a><a name="continuation"></a>
+<a name="N105FC"></a><a name="continuation"></a>
 <h4>continuation</h4>
 <p>
 <em>Property</em> <tt>[Continuation] continuation</tt>
 </p>
 <p>Returns the JavaScript continuation associated with this Web Continuation.
 </p>
-<a name="N105FA"></a><a name="previousBookmark"></a>
+<a name="N10608"></a><a name="previousBookmark"></a>
 <h4>previousBookmark</h4>
 <p>
 <em>Property</em> <tt>[WebContinuation] previousBookmark</tt>
@@ -2014,26 +2012,26 @@
 preceding the one associated with this object, or null if no such bookmark
 continuation exists. The returned object is the continuation you would invoke to
 implement a "Back" button.</p>
-<a name="N10606"></a><a name="isBookmark"></a>
+<a name="N10614"></a><a name="isBookmark"></a>
 <h4>isBookmark</h4>
 <p>
 <em>Function</em> <tt>[Boolean] isBookmark()</tt>
 </p>
 <p>Returns <tt>true</tt> if this continuation was <em>not</em> created by
 <a href="#sendPageAndWait">sendPageAndWait</a>.</p>
-<a name="N1061C"></a><a name="getParent"></a>
+<a name="N1062A"></a><a name="getParent"></a>
 <h4>getParent</h4>
 <p>
 <em>Function</em> <tt>[WebContinuation] getParent()</tt>
 </p>
 <p>Get the parent continuation of this continuation.</p>
-<a name="N10628"></a><a name="getChildren"></a>
+<a name="N10636"></a><a name="getChildren"></a>
 <h4>getChildren</h4>
 <p>
 <em>Function</em> <tt>[Array [WebContinuation]] getChildren()</tt>
 </p>
 <p>Get the child continuations of this continuation.</p>
-<a name="N10634"></a><a name="invalidate-N10634"></a>
+<a name="N10642"></a><a name="invalidate-N10642"></a>
 <h4>invalidate</h4>
 <p>
 <em>Function</em> <tt>invalidate()</tt>

Modified: cocoon/site/site/2.1/userdocs/flow/continuations.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/continuations.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/continuations.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/continuations.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/flow/how-does-it-work.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/how-does-it-work.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/how-does-it-work.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/how-does-it-work.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/flow/index.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/index.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/index.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/index.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/flow/java.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/java.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/java.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/java.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1215,14 +1213,14 @@
     +-->
 <div id="content">
 <h1>Advanced Control Flow - Java</h1>
-<a name="N10007"></a><a name="Calling+Java"></a>
+<a name="N10007"></a><a name="Java"></a>
 <h2 class="h3">Calling Java</h2>
 <div class="section">
 <p>You can easily call Java code from your Flowscripts, for example:</p>
 <pre>    var map = new java.util.HashMap();
     map.put("foo", "bar");
     </pre>
-<a name="N1000F"></a><a name="Imports"></a>
+<a name="N10010"></a><a name="Imports"></a>
 <h3 class="h4">Imports</h3>
 <p>Classes in packages under <tt>java</tt> are accessible directly in your
 scripts.</p>
@@ -1289,14 +1287,14 @@
 <p>Example:</p>
 <pre>    importPackage(java.util);   
     var set = new TreeSet();</pre>
-<a name="N10064"></a><a name="Bean+Properties"></a>
+<a name="N10065"></a><a name="Bean+Properties"></a>
 <h3 class="h4">Bean Properties</h3>
 <p>If your Java classes have getters and setters you can access them as
 properties in JavaScript:</p>
 <pre>    var d = new java.util.Date();
     d.year = 2003;    // same effect as d.setYear(2003);
 </pre>
-<a name="N1006C"></a><a name="Dynamic+Compilation"></a>
+<a name="N1006D"></a><a name="Dynamic+Compilation"></a>
 <h3 class="h4">Dynamic Compilation</h3>
 <p>Cocoon includes an embedded Java compiler that can dynamically compile Java
 source files and load and execute the resulting classes at runtime. During
@@ -1313,7 +1311,7 @@
       obj.someMethod();              // call a method
 
 </pre>
-<a name="N10076"></a><a name="Configuration"></a>
+<a name="N10077"></a><a name="Configuration"></a>
 <h4>Configuration</h4>
 <p>You control this behavior by specifying configuration properties in the
 <tt>cocoon.xconf</tt> file located in the WEB-INF/ directory of your

Modified: cocoon/site/site/2.1/userdocs/flow/jpath.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/jpath.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/jpath.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/jpath.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/flow/jxtemplate.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/jxtemplate.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/jxtemplate.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/jxtemplate.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1263,21 +1261,21 @@
 <p>Embedded JXPath expressions are contained in <tt>#{}</tt>.</p>
 <p>The referenced objects may be Java Beans, DOM, or JavaScript objects from a
 Flowscript. In addition, a special <tt>cocoon</tt> object providing access to
-the Cocoon <a href="../../../2.1/">FOM</a> is available as both a JXPath and
+the Cocoon <a href="../../../2.1/userdocs/flow/api.html#FOM">FOM</a> is available as both a JXPath and
 Jexl variable in a template.</p>
 <p>The <tt>cocoon</tt> object contains the following properties:</p>
 <ul>
 
 <li>
-<a href="../../../2.1/">request</a>: <br>
+<a href="../../../2.1/userdocs/flow/api.html#request">request</a>: <br>
 The current Cocoon request</li>
 
 <li>
-<a href="../../../2.1/">session</a>: <br>
+<a href="../../../2.1/userdocs/flow/api.html#session">session</a>: <br>
 The user session associated with the current request</li>
 
 <li>
-<a href="../../../2.1/">context</a>: <br>
+<a href="../../../2.1/userdocs/flow/api.html#context">context</a>: <br>
 The Cocoon context associated with the current request</li>
 
 <li>
@@ -1285,7 +1283,7 @@
 A map containing the parameters passed to the generator in the pipeline</li>
 
 <li>
-<a href="../../../2.1/">continuation</a>: <br>
+<a href="../../../2.1/userdocs/flow/api.html#WebContinuation">continuation</a>: <br>
 The current Web Continuation from your Flowscript</li>
 
 </ul>
@@ -1336,11 +1334,24 @@
 instead)</li>
 
 </ul>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">When used inside flow, JXTemplate has access to Java and can
+therefore evaluate expressions like "java.util.Date()" or "java.util.HashMap()".
+This does <strong>NOT</strong> work when JXTemplates are used without flow. Some
+symptoms:<br>
+[*&lt;jx:out value="${java.util.Date()"/&gt;*] results in [**]</div>
+</div>
+<div class="frame note">
+<div class="label">Note</div>
+<div class="content">&lt;jx:formatDate value="${java.util.Date()}"
+pattern="yyyyMMdd"/&gt; results in 'Cannot format given Object as a Date'</div>
+</div>
 </div>
-<a name="N100F2"></a><a name="Parameters"></a>
+<a name="N10107"></a><a name="Parameters"></a>
 <h2 class="h3">Parameters</h2>
 <div class="section">
-<a name="N100F6"></a><a name="lenient-xpath"></a>
+<a name="N1010B"></a><a name="lenient-xpath"></a>
 <h3 class="h4">lenient-xpath</h3>
 <p>By default XPath evaluation throws an exception if the supplied XPath does
 not map to an existing property. This constraint can be relaxed by setting the
@@ -1355,20 +1366,20 @@
     &lt;/map:match&gt;
 </pre>
 </div>
-<a name="N10106"></a><a name="Tags"></a>
+<a name="N1011B"></a><a name="Tags"></a>
 <h2 class="h3">Tags</h2>
 <div class="section">
 <p>The JXTemplate Generator tags are defined in the namespace</p>
 <pre>http://apache.org/cocoon/templates/jx/1.0
 </pre>
-<a name="N1010E"></a><a name="template"></a>
+<a name="N10123"></a><a name="template"></a>
 <h3 class="h4">template</h3>
 <p>The <tt>template</tt> tag defines a new template:</p>
 <pre>&lt;jx:template xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"&gt;
    body
 &lt;/jx:template&gt;
 </pre>
-<a name="N10119"></a><a name="import"></a>
+<a name="N1012E"></a><a name="import"></a>
 <h3 class="h4">import</h3>
 <p>The <tt>import</tt> tag allows you to include another template within the
 current template. The content of the imported template is compiled and will be
@@ -1378,7 +1389,7 @@
 <p>The Cocoon source resolver is used to resolve <tt>uri</tt>. If
 <tt>context</tt> is present, then its value is used as the context for
 evaluating the imported template, otherwise the current context is used.</p>
-<a name="N1012F"></a><a name="set"></a>
+<a name="N10144"></a><a name="set"></a>
 <h3 class="h4">set</h3>
 <p>The <tt>set</tt> tag creates a local alias of an object. The <tt>var</tt>
 attribute specifies the name of a variable to assign the object to. The
@@ -1398,7 +1409,7 @@
 <pre>&lt;jx:set var="greeting" value="Hello #{user}"/&gt;
 The value of greeting is #{$greeting}
 </pre>
-<a name="N10156"></a><a name="if"></a>
+<a name="N1016B"></a><a name="if"></a>
 <h3 class="h4">if</h3>
 <p>The <tt>if</tt> tag allows the conditional execution of its body according to
 value of its <tt>test</tt> attribute:</p>
@@ -1416,7 +1427,7 @@
   Your cart is empty
 &lt;/jx:if&gt;
 </pre>
-<a name="N1016C"></a><a name="choose"></a>
+<a name="N10181"></a><a name="choose"></a>
 <h3 class="h4">choose</h3>
 <p>The <tt>choose</tt> tag performs conditional block execution by its embedded
 <tt>when</tt> sub tags. It renders the body of the first <tt>when</tt> tag whose
@@ -1452,7 +1463,7 @@
   &lt;/jx:otherwise&gt;
 &lt;/jx:choose&gt;
 </pre>
-<a name="N10194"></a><a name="out"></a>
+<a name="N101A9"></a><a name="out"></a>
 <h3 class="h4">out</h3>
 <p>The <tt>out</tt> tag evaluates an expression and outputs the result of the
 evaluation:</p>
@@ -1464,7 +1475,7 @@
 <p>JXPath Example:</p>
 <pre>&lt;jx:out value="#{cart/numberOfItems}"&gt;
 </pre>
-<a name="N101A7"></a><a name="forEach"></a>
+<a name="N101BC"></a><a name="forEach"></a>
 <h3 class="h4">forEach</h3>
 <p>The <tt>forEach</tt> tag allows you to iterate over a collection of objects:
 </p>
@@ -1671,7 +1682,7 @@
     end=#{$status/end}
 &lt;/jx:forEach&gt;
 </pre>
-<a name="N1029C"></a><a name="formatNumber"></a>
+<a name="N102B1"></a><a name="formatNumber"></a>
 <h3 class="h4">formatNumber</h3>
 <p>The <tt>formatNumber</tt> tag is used to display numeric data, including
 currencies and percentages, in a locale-specific manner. It determines from the
@@ -1714,7 +1725,7 @@
 with each set of three delimited by a comma. Other locales delimit such
 groupings with a period or a space. The default value for this attribute is
 <tt>true</tt>.</p>
-<a name="N102EF"></a><a name="formatDate"></a>
+<a name="N10304"></a><a name="formatDate"></a>
 <h3 class="h4">formatDate</h3>
 <p>The <tt>formatDate</tt> tag provides facilities to format Date values:</p>
 <pre>&lt;jx:formatDate value="Expression" [dateStyle="Style"] 
@@ -1751,7 +1762,7 @@
 <p>If the <tt>var</tt> attribute is specified, then a String value containing
 the formatted date is assigned to the named variable. Otherwise, the
 <tt>formatDate</tt> tag will write out the formatting results.</p>
-<a name="N10327"></a><a name="macro"></a>
+<a name="N1033C"></a><a name="macro"></a>
 <h3 class="h4">macro</h3>
 <p>The <tt>macro</tt> tag allows you define a new custom tag.</p>
 <pre>&lt;jx:macro name="Name" [targetNamespace="Namespace"]&gt;
@@ -1802,7 +1813,7 @@
   &lt;tr&gt;&lt;td bgcolor="blue"&gt;Ontario&lt;/td&gt;&lt;/tr&gt;
 &lt;/table&gt;
 </pre>
-<a name="N1035A"></a><a name="evalBody"></a>
+<a name="N1036F"></a><a name="evalBody"></a>
 <h3 class="h4">evalBody</h3>
 <p>Within the body of a macro the <tt>evalBody</tt> tag treats the content of
 the macro tag invocation as a <em>JX</em>Template and executes it. For example,
@@ -1833,7 +1844,7 @@
   letter = f  &lt;br/&gt;  
   letter = g  &lt;br/&gt;  
  </pre>
-<a name="N10377"></a><a name="eval"></a>
+<a name="N1038C"></a><a name="eval"></a>
 <h3 class="h4">eval</h3>
 <p>The <tt>eval</tt> tag permits dynamic evaluation of custom tags.</p>
 <pre>&lt;jx:eval select="Expression"/&gt;
@@ -1897,8 +1908,7 @@
 later using <tt>jx:eval</tt>. The <tt>select</tt> attribute of <tt>jx:eval</tt>
 specifies an expression that must evaluate to a macro invocation. For example:
 </p>
-<pre>
-&lt;jx:set var="tags" value="${java.util.HashMap()}"/&gt;
+<pre>&lt;jx:set var="tags" value="${java.util.HashMap()}"/&gt;
 
 &lt;jx:macro name="dynamic-tag"&gt;
   &lt;jx:parameter name="id"/&gt;

Modified: cocoon/site/site/2.1/userdocs/flow/sitemap.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/sitemap.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/sitemap.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/sitemap.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1221,7 +1219,7 @@
 <p>The Cocoon <a href="../../../2.1/userdocs/concepts/sitemap/../sitemap.html">Sitemap</a> provides two elements to specify
 interactions with your Flowscripts: <a href="#flow">flow</a>, and
 <a href="#call">call</a>.</p>
-<a name="N10019"></a><a name="flow"></a>
+<a name="N10019"></a><a name="flow-N10019"></a>
 <h3 class="h4">flow</h3>
 <p>The <tt>flow</tt> element defines a Flowscript interpreter for a sitemap. The
 <tt>language</tt> attribute specifies the target programming language. Currently
@@ -1239,11 +1237,11 @@
            &lt;map:script src="myApplication.js"/&gt;
         &lt;/map:flow&gt;
       </pre>
-<a name="N10037"></a><a name="call"></a>
+<a name="N10038"></a><a name="call-N10038"></a>
 <h3 class="h4">call</h3>
 <p>The <tt>call</tt> element allows you to call a top-level function in your
 Flowscript or to invoke an existing continuation.</p>
-<a name="N10040"></a><a name="function"></a>
+<a name="N10042"></a><a name="function"></a>
 <h4>function</h4>
 <p>If the <tt>function</tt> attribute is present, then the Sitemap will invoke a
 top-level function defined in your Flowscript. The <tt>function</tt> attribute
@@ -1274,7 +1272,7 @@
             sendPage("private/index.html", {param: param});
         }
       </pre>
-<a name="N1005F"></a><a name="continuation"></a>
+<a name="N10062"></a><a name="continuation"></a>
 <h4>continuation</h4>
 <p>If the <tt>continuation</tt> attribute is present, then the Sitemap will
 invoke an existing continuation of your Flowscript. The <tt>continuation</tt>

Modified: cocoon/site/site/2.1/userdocs/flow/tutor.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/tutor.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/tutor.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/tutor.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1415,7 +1413,7 @@
 pipeline matching "guess.jx". Referring back to the sitemap, we match *.jx, and
 run the file through the JXTemplateGenerator, which substitutes the keynames for
 the values sent from the
-<a href="../../../2.1/">cocoon.sendPageAndWait()</a> function.</p>
+<a href="../../../2.1/userdocs/flow/api.html#sendPageAndWait">cocoon.sendPageAndWait()</a> function.</p>
 <p>One thing to note is in the form which is sent back to Cocoon when the player
 submits the guess:</p>
 <pre>&lt;form method="post" action="${cocoon.continuation.id}.kont"&gt;
@@ -1434,7 +1432,7 @@
 with the specified ID and we re-enter the Javascript code where we left off
 previously.</p>
 <p>We are now back in the Javascript at the line after
-<a href="../../../2.1/">sendPageAndWait()</a>. We create a new
+<a href="../../../2.1/userdocs/flow/api.html#sendPageAndWait">sendPageAndWait()</a>. We create a new
 variable (an int), which we get from the POST request that was sent by the form.
 Notice in the form we had <tt>&lt;input type="text" name="guess"/&gt;</tt> and
 in the Javascript we get the request parameter by using

Modified: cocoon/site/site/2.1/userdocs/flow/using.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/using.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/using.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/using.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1235,11 +1233,11 @@
 later on.</li>
 
 <li>To invoke a top level JavaScript function in the Control Flow, you use the
-<a href="../../../2.1/"><tt>&lt;map:callfunction="function-name"/&gt;</tt></a>
+<a href="../../../2.1/userdocs/flow/sitemap.html#callFunction"><tt>&lt;map:callfunction="function-name"/&gt;</tt></a>
 construction.</li>
 
 <li>To restart the computation of a previously stopped function, you use the
-<a href="../../../2.1/"><tt>&lt;map:callcontinuation="..."/&gt;</tt></a>
+<a href="../../../2.1/userdocs/flow/sitemap.html#callContinuation"><tt>&lt;map:callcontinuation="..."/&gt;</tt></a>
 construction. This restarts the computation saved in a continuation object
 identified by the string value of the <tt>continuation</tt> attribute. This
 value could be extracted in the sitemap from the requested URL, from a POST or
@@ -1259,8 +1257,8 @@
 back to the Control Flow.</p>
 <p>Once here, the Control Flow has to decide which page needs to be sent back to
 the client browser. To do this, the script can invoke one of the
-<a href="../../../2.1/"><tt>cocoon.sendPageAndWait()</tt></a> or
-<a href="../../../2.1/"><tt>cocoon.sendPage()</tt></a> functions. These
+<a href="../../../2.1/userdocs/flow/api.html#sendPageAndWait"><tt>cocoon.sendPageAndWait()</tt></a> or
+<a href="../../../2.1/userdocs/flow/api.html#sendPage"><tt>cocoon.sendPage()</tt></a> functions. These
 functions take two parameters, the relative URL of the page to be sent back to
 the client, and a context object which can be accessed inside this page to
 extract various values and place them in the generated page.</p>

Modified: cocoon/site/site/2.1/userdocs/flow/velocity.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/velocity.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/velocity.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/velocity.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1222,10 +1220,10 @@
 <a class="external" href="http://jakarta.apache.org/velocity">Velocity</a>
 <a href="../../../2.1/userdocs/velocity-generator.html">Generator</a> provides access to the immediate properties of
 the context object passed to
-<a href="../../../2.1/"><tt>cocoon.sendPage</tt></a> and
-<a href="../../../2.1/"><tt>cocoon.sendPageAndWait</tt></a>. In
+<a href="../../../2.1/userdocs/flow/api.html#sendPage"><tt>cocoon.sendPage</tt></a> and
+<a href="../../../2.1/userdocs/flow/api.html#sendPageAndWait"><tt>cocoon.sendPageAndWait</tt></a>. In
 addition, the current
-<a href="../../../2.1/"><tt>WebContinuation</tt></a> is also
+<a href="../../../2.1/userdocs/flow/api.html#WebContinuation"><tt>WebContinuation</tt></a> is also
 available as a variable named <tt>$continuation</tt>. You would typically access
 its <tt>id</tt>:</p>
 <pre>  &lt;form action="$continuation.id"&gt;

Modified: cocoon/site/site/2.1/userdocs/flow/views.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/flow/views.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/flow/views.html (original)
+++ cocoon/site/site/2.1/userdocs/flow/views.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1219,8 +1217,8 @@
 <h2 class="h3">Flowscript-aware Generators</h2>
 <div class="section">
 <p>The second argument to
-<a href="../../../2.1/"><tt>cocoon.sendPage()</tt></a> and
-<a href="../../../2.1/"><tt>cocoon.sendPageAndWait()</tt></a> is a
+<a href="../../../2.1/userdocs/flow/api.html#sendPage"><tt>cocoon.sendPage()</tt></a> and
+<a href="../../../2.1/userdocs/flow/api.html#sendPageAndWait"><tt>cocoon.sendPageAndWait()</tt></a> is a
 context object, which can be a simple dictionary with values that need to be
 displayed by the page. More generally any Java or JavaScript object can be
 passed here, as long as the necessary <em>get</em> methods for the important

Modified: cocoon/site/site/2.1/userdocs/formlibraries.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/formlibraries.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/formlibraries.html (original)
+++ cocoon/site/site/2.1/userdocs/formlibraries.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/generators.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/generators.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/generators.html (original)
+++ cocoon/site/site/2.1/userdocs/generators.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/host-selector.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/host-selector.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/host-selector.html (original)
+++ cocoon/site/site/2.1/userdocs/host-selector.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/html-generator.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/html-generator.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/html-generator.html (original)
+++ cocoon/site/site/2.1/userdocs/html-generator.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/html-serializer.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/html-serializer.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/html-serializer.html (original)
+++ cocoon/site/site/2.1/userdocs/html-serializer.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu

Modified: cocoon/site/site/2.1/userdocs/i18nTransformer.html
URL: http://svn.apache.org/viewcvs/cocoon/site/site/2.1/userdocs/i18nTransformer.html?rev=377949&r1=377948&r2=377949&view=diff
==============================================================================
--- cocoon/site/site/2.1/userdocs/i18nTransformer.html (original)
+++ cocoon/site/site/2.1/userdocs/i18nTransformer.html Tue Feb 14 22:36:05 2006
@@ -1203,9 +1203,7 @@
 <!--+
   |alternative credits
   +-->
-<div id="credit2">
-<a href="http://apachecon.com/"><img border="0" title="ApacheCon US 2005" alt="ApacheCon US 2005 - logo" src="http://apache.org/images/ac2005us_blue_125x125.jpg" style="width: 125px;height: 125px;"></a>
-</div>
+<div id="credit2"></div>
 </div>
 <!--+
     |end Menu
@@ -1419,7 +1417,7 @@
 using a non-default dictionary, mention the id of the dictionary in an
 i18n:catalogue attribute:</p>
 <pre>&lt;i18n:text i18n:catalogue="menu"&gt;key_text&lt;/i18n:text&gt;</pre>
-<a name="N10105"></a><a name="Translation+with+param+substitution"></a>
+<a name="N10106"></a><a name="Translation+with+param+substitution"></a>
 <h3 class="h4">Translation with param substitution</h3>
 <p>To translate the text with param substitution the
 <tt>&lt;i18n:translate&gt;</tt> tag must be used. We can specify some
@@ -1466,7 +1464,7 @@
 attribute to specify one of the possible types: <tt>date | time | date-time |
 number | currency | currency-no-unit | int-currency | percent </tt>. See more on
 params <a href="#i18n_param">here</a>.</p>
-<a name="N10143"></a><a name="Attributes"></a>
+<a name="N10145"></a><a name="Attributes"></a>
 <h3 class="h4">Attributes</h3>
 <p>Additionally we can translate attributes. This is very useful for HTML-forms
 since labels of buttons are set via an attribute in HTML. To translate
@@ -1487,7 +1485,7 @@
 multiple dictionaries. To use a specific dictionary, add the id of the
 dictionary before the key, separated by a colon:</p>
 <pre>&lt;INPUT type="submit" value="form:Submit" i18n:attr="value"/&gt;</pre>
-<a name="N10159"></a><a name="Date%2C+time+and+number+formatting"></a>
+<a name="N1015C"></a><a name="Date%2C+time+and+number+formatting"></a>
 <h3 class="h4">Date, time and number formatting</h3>
 <p>To format dates according to the current locale use <tt>&lt;i18n:date
 src-pattern="dd/MM/yyyy" pattern="dd:MMM:yyyy" value="01/01/2001" /&gt;</tt>.
@@ -1566,11 +1564,11 @@
 <p>Result will be like this: <tt>You have to pay $102.5 for 2.5 pounds or 10% of
 your profit. Valid from 13-Jun-01</tt>
 </p>
-<a name="N101E7"></a><a name="Catalogues+%28Dictionaries%29"></a>
+<a name="N101EB"></a><a name="Catalogues+%28Dictionaries%29"></a>
 <h3 class="h4">Catalogues (Dictionaries)</h3>
 <p>Message catalogues contain translations to be used by the i18n transformer.
 </p>
-<a name="N101ED"></a><a name="Catalogues+format"></a>
+<a name="N101F1"></a><a name="Catalogues+format"></a>
 <h4>Catalogues format</h4>
 <p>A single message catalogue file contains translations for a particular
 language, e.g.:</p>
@@ -1583,7 +1581,7 @@
   &lt;/catalogue&gt;</pre>
 <p>Where <strong>key</strong> attribute specifies a particular message for that
 language.</p>
-<a name="N101FA"></a><a name="Usage"></a>
+<a name="N101FE"></a><a name="Usage"></a>
 <h4>Usage</h4>
 <p>Files to be translated contain i18n markup. At runtime, the i18n transformer
 will find a message catalogue for the user's locale, and will appropriately
@@ -1627,7 +1625,7 @@
 </ul>
 <p>This allows the developer to write a hierarchy of message catalogues, at each
 defining messages with increasing depth of variation.</p>
-<a name="N10258"></a><a name="Sitemap+configuration"></a>
+<a name="N1025C"></a><a name="Sitemap+configuration"></a>
 <h3 class="h4">Sitemap configuration</h3>
 <pre>&lt;map:transformer name="i18n"
      src="org.apache.cocoon.transformation.I18nTransformer"&gt;
@@ -1704,13 +1702,13 @@
 <strong>default-catalogue-id</strong> parameter.</div>
 </div>
 </div>
-<a name="N102AC"></a><a name="Samples"></a>
+<a name="N102B0"></a><a name="Samples"></a>
 <h2 class="h3">Samples</h2>
 <div class="section">
 <p>i18n samples from Cocoon demonstrate all the features of i18n transformer and
 give some ideas on user's locale determination.</p>
 </div>
-<a name="N102B2"></a><a name="Usage+Pattern+for+Dictionary+Generator+Stylesheet"></a>
+<a name="N102B6"></a><a name="Usage+Pattern+for+Dictionary+Generator+Stylesheet"></a>
 <h2 class="h3">Usage Pattern for Dictionary Generator Stylesheet</h2>
 <div class="section">
 <p>It is sometimes better to maintain a master dictionary that contains all the
@@ -1719,13 +1717,13 @@
 <tt>src/resources/dev/i18n</tt> (in version 2.1 and higher).<br>
 Below is given an example for a new language addition using a master dictionary.
 </p>
-<a name="N102BD"></a><a name="Initial+key+generation"></a>
+<a name="N102C1"></a><a name="Initial+key+generation"></a>
 <h3 class="h4">Initial key generation</h3>
 <p>To generate all the i18n keys from a source file (XML or XSP) use the
 <strong>markup2message.xsl</strong> stylesheet. Simply transform your content
 file using this stylesheet. Result will be an empty message catalogue for the
 given language.</p>
-<a name="N102C6"></a><a name="Key+generation+from+master+dictionary"></a>
+<a name="N102CA"></a><a name="Key+generation+from+master+dictionary"></a>
 <h3 class="h4">Key generation from master dictionary</h3>
 <p>Generate a dictionary with keys and placeholders for Spanish translations
 using the <strong>merge.xsl</strong> stylesheet. Optionally, for one of the
@@ -1756,11 +1754,11 @@
 </p>
 <p>This will create a file simple_dict_es.xml with entries, keys and
 placeholders.</p>
-<a name="N102E9"></a><a name="Translation"></a>
+<a name="N102ED"></a><a name="Translation"></a>
 <h3 class="h4">Translation</h3>
 <p>Replace placeholders with translation according to the keys or original
 translations, if they were kept during generation.</p>
-<a name="N102EF"></a><a name="Add+to+the+master+dictionary"></a>
+<a name="N102F3"></a><a name="Add+to+the+master+dictionary"></a>
 <h3 class="h4">Add to the master dictionary</h3>
 <p>Use the same stylesheet for this purpose with this params:</p>
 <pre>mode = merge
@@ -1777,10 +1775,10 @@
 line.)</sub>
 </p>
 </div>
-<a name="N102FE"></a><a name="Finally"></a>
+<a name="N10302"></a><a name="Finally"></a>
 <h2 class="h3">Finally</h2>
 <div class="section">
-<a name="N10302"></a><a name="To+be+done"></a>
+<a name="N10306"></a><a name="To+be+done"></a>
 <h3 class="h4">To be done</h3>
 <ul>
 
@@ -1802,7 +1800,7 @@
 </li>
 
 </ul>
-<a name="N10323"></a><a name="Contacts"></a>
+<a name="N10327"></a><a name="Contacts"></a>
 <h3 class="h4">Contacts</h3>
 <p>Feel free to contact for any comments and improvement ideas either directly
 <a href="mailto:kpiroumian.at.apache.org">Konstantin Piroumian</a> or through the