coliver 2003/05/30 09:06:06
Modified: src/documentation/xdocs/userdocs/flow jpath.xml sitemap.xml
using.xml velocity.xml views.xml
Log:
a few more links and corrections
Revision Changes Path
1.8 +2 -2 cocoon-2.1/src/documentation/xdocs/userdocs/flow/jpath.xml
Index: jpath.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/jpath.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jpath.xml 25 May 2003 19:25:06 -0000 1.7
+++ jpath.xml 30 May 2003 16:06:06 -0000 1.8
@@ -83,8 +83,8 @@
body
</for-each>
</source>
-<p>When using XPath expressions within <code>for-each</code> the current element is
the context node and can be referenced with:
-<code>.</code></p>
+<p>When using XPath expressions within <code>for-each</code> the current element is
the context node and can be referenced with XPath dot operator:
+<source>.</source></p>
<p>Example:</p>
<source>
<for-each select="cart/cartItems[position() <= $count]">
1.7 +1 -1 cocoon-2.1/src/documentation/xdocs/userdocs/flow/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/sitemap.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sitemap.xml 30 May 2003 15:48:08 -0000 1.6
+++ sitemap.xml 30 May 2003 16:06:06 -0000 1.7
@@ -12,7 +12,7 @@
<body>
<s1 title="Sitemap">
- <p>The Cocoon sitemap includes two elements to specify interactions with your
Flowscripts.</p>
+ <p>The Cocoon sitemap provides two elements to specify interactions with your
Flowscripts.</p>
<s2 title="flow">
<p>The <code>flow</code> element defines a Flowscript interpreter for a
sitemap. The <code>language</code> attribute specifies the target programming
language. Currently the only supported language is <code>"JavaScript"</code>. Its
embedded <code>script</code> elements allow you to specify the files that make up the
flow for this sitemap. Each <code>script</code> element specifies the URI of a script
that will be compiled and executed when this Sitemap is created. The <code>src</code>
attribute specifies the URI of the script.</p>
<source><![CDATA[
1.6 +4 -4 cocoon-2.1/src/documentation/xdocs/userdocs/flow/using.xml
Index: using.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/using.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- using.xml 25 May 2003 19:25:07 -0000 1.5
+++ using.xml 30 May 2003 16:06:06 -0000 1.6
@@ -67,8 +67,8 @@
<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 either the
- <link href="api.html#sendPageAndWait"><code>sendPageAndWait</code></link> or
the <link href="api.html#sendPage"><code>sendPage</code></link> functions.
+ to the client browser. To do this, the script can invoke one of the
+ <link href="api.html#sendPageAndWait"><code>sendPageAndWait</code></link> or
<link href="api.html#sendPage"><code>sendPage</code></link> 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
@@ -125,7 +125,7 @@
The business logic model which implements your application
</li>
<li>
- The page templates, which describe the content of the pages, and XSLT
+ The <link href="views.html">page templates</link>, which describe the content
of the pages, and XSLT
stylesheets which describe the look of the content.
</li>
</ul>
@@ -175,7 +175,7 @@
<link href="api.html#createSession"><code>cocoon.createSession()</code></link>
method, which creates a servlet
session and saves the global scope containing the global variables' value
in it. Next time the user invokes one of the four top-level functions,
- the values of the global variables is restored, making sharing very easy.
+ the values of the global variables are restored, making sharing very easy.
</p>
</s2>
1.6 +1 -1 cocoon-2.1/src/documentation/xdocs/userdocs/flow/velocity.xml
Index: velocity.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/velocity.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- velocity.xml 30 May 2003 15:48:08 -0000 1.5
+++ velocity.xml 30 May 2003 16:06:06 -0000 1.6
@@ -12,7 +12,7 @@
<body>
<s1 title="Velocity Generator">
<p>
-If called from a Flowscript, the Cocoon <link
href="http://jakarta.apache.org/velocity">Velocity</link> <link
href="../generators/velocity-generator.html">Generator</link> provides access to the
immediate properties of the context object passed to <code>sendPage</code> and
<code>sendPageAndWait</code>. In that case, the current <code>WebContinuation</code>
is also available as a variable named <code>$continuation</code>
+If called from a Flowscript, the Cocoon <link
href="http://jakarta.apache.org/velocity">Velocity</link> <link
href="../generators/velocity-generator.html">Generator</link> provides access to the
immediate properties of the context object passed to <code><link
href="api.html#sendPage">sendPage</link></code> and <code><link
href="api.html#sendPageAndWait">sendPageAndWait</link></code>. In that case, the
current <code><link href="api.html#WebContinuation">WebContinuation</link></code> is
also available as a variable named <code>$continuation</code>
You would
typically access its <code>id</code>:</p>
<source>
1.4 +1 -1 cocoon-2.1/src/documentation/xdocs/userdocs/flow/views.xml
Index: views.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/views.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- views.xml 25 May 2003 19:25:07 -0000 1.3
+++ views.xml 30 May 2003 16:06:06 -0000 1.4
@@ -13,7 +13,7 @@
<body>
<s1 title="Flowscript-aware Generators">
<p>
-The second argument to <code>sendPage</code> and <code>sendPageAndWait</code> is a
context object, which can be a simple dictionary with values that need to be displayed
by the View. More generally any Java or JavaScript object can be passed here, as long
as the necessary get methods for the important values are provided.
+The second argument to <code><link href="api.html#sendPage">sendPage</link></code>
and <code><link href="api.html#sendPageAndWait">sendPageAndWait</link></code> is a
context object, which can be a simple dictionary with values that need to be displayed
by the View. More generally any Java or JavaScript object can be passed here, as long
as the necessary get methods for the important values are provided.
</p>
<p>
The page specified by the URL is processed by the sitemap, using the normal sitemap
rules.