cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/flow jpath.xml jxtemplate.xml velocity.xml

[co...@apache.org]

coliver     2003/06/01 10:22:48

  Modified:    src/documentation/xdocs/userdocs/flow jpath.xml
                        jxtemplate.xml velocity.xml
  Log:
  a few more corrections to flowscript docs
  
  Revision  Changes    Path
  1.11      +3 -3      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- jpath.xml	1 Jun 2003 15:49:04 -0000	1.10
  +++ jpath.xml	1 Jun 2003 17:22:47 -0000	1.11
  @@ -39,16 +39,16 @@
        </source>
       </s2>
       <s2 title ="choose">
  -     <p>The <code>choose</code> tag performs conditional block execution by the embedded
  +     <p>The <code>choose</code> tag performs conditional block execution by its embedded
           <code>when</code> sub tags. It renders the body of the first <code>when</code> tag whose
           <code>test</code> condition evaluates to true. If none of the <code>test</code> conditions
  -        of nested <code>when</code> tags evaluate to <code>true</code>, then the body of an
  +        of its nested <code>when</code> tags evaluate to <code>true</code>, then the body of its
           <code>otherwise</code> tag is evaluated, if present:</p>
        <source>
   &lt;choose&gt;
     &lt;when test="XPathExpression"&gt;
       body
  -  &lt;/when&gt;
  +  &lt;/when&gt;+
     &lt;otherwise&gt;
       body
     &lt;/otherwise&gt;?
  
  
  
  1.10      +4 -4      cocoon-2.1/src/documentation/xdocs/userdocs/flow/jxtemplate.xml
  
  Index: jxtemplate.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/jxtemplate.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jxtemplate.xml	1 Jun 2003 15:49:04 -0000	1.9
  +++ jxtemplate.xml	1 Jun 2003 17:22:47 -0000	1.10
  @@ -13,7 +13,7 @@
     <p>
   The JXTemplate Generator is a page template processor that allows you to inject data from Java and JavaScript objects passed by a Cocoon Flowscript into a Cocoon pipeline. It provides a set of tags (similar to the <link href="http://java.sun.com/products/jsp/jstl/">JSTL</link> core tags) that allow you to iterate over Java collections (and Java or JavaScript arrays) and to test for the presence of optional or alternate bean properties, as well as embedded expressions to specify conditions and to access the properties of objects. The <em>JX</em>Template Generator gets its name from the embedded expression languages it supports, namely <link href="http://jakarta.apache.org/commons/jxpath">Apache <em>JX</em>Path</link> and <link href="http://jakarta.apache.org/commons/jexl">Apache <em>J</em>e<em>X</em>l</link>. 
     </p>
  -<p>To use the JXTemplate Generator, add a generator entry to your sitemap with the <code>src</code> attribute set to <code>org.apache.cocoon.generation.JXTemplateGenerator</code>, for example like this:</p>
  +<p>To use the JXTemplate Generator, add a generator entry to your <link href="../concepts/sitemap.html">sitemap</link> with the <code>src</code> attribute set to <code>org.apache.cocoon.generation.JXTemplateGenerator</code>, for example like this:</p>
   <source>
   &lt;map:generators&gt;
     &lt;map:generator label="content,data" 
  @@ -76,7 +76,7 @@
   </source>
   <p>or using an XPath expression:</p>
   <source>
  -    &lt;form action="#{getContinuation($continuation)/id}" >
  +    &lt;form action="#{getContinuation($continuation, 1)/id}" >
   </source>
   </s1>
   <s1 title ="Tags">
  @@ -134,10 +134,10 @@
   </source>
   </s2>
   <s2 title ="choose">
  -<p>The <code>choose</code> tag performs conditional block execution by the 
  +<p>The <code>choose</code> tag performs conditional block execution by its 
   embedded <code>when</code> sub tags. It renders the body of the first 
   <code>when</code> tag whose <code>test</code> condition evaluates to true. 
  -If none of the <code>test</code> conditions of nested <code>when</code> tags
  +If none of the <code>test</code> conditions of its nested <code>when</code> tags
   evaluate to <code>true</code>, then the body of its <code>otherwise</code> 
   tag is evaluated, if present:</p>
   <source>
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- velocity.xml	1 Jun 2003 15:49:04 -0000	1.9
  +++ velocity.xml	1 Jun 2003 17:22:47 -0000	1.10
  @@ -41,7 +41,7 @@
      </dl>
      <p>
      Cocoon installs a Velocity introspector that makes it possible for you
  -   to access JavaScript objects and arrays in your template, as well as Java objects. For example, assuming you had a Flowscript like this:</p>
  +   to access JavaScript objects and arrays in your templates, as well as Java objects. For example, assuming you had a Flowscript like this:</p>
      <source>
       sendPage("myTemplate.vm", {colors: ["red", "blue", "yellow"]});
      </source>