crossley    2002/06/17 02:44:18

  Modified:    src/documentation/xdocs Tag: cocoon_2_0_3_branch
                        overview.xml
               src/documentation/xdocs/howto/xmlform-wizard Tag:
                        cocoon_2_0_3_branch howto-xmlform-wizard.xml
               src/documentation/xdocs/plan Tag: cocoon_2_0_3_branch
                        changes-doc.xml
               src/documentation/xdocs/userdocs/concepts Tag:
                        cocoon_2_0_3_branch book.xml catalog.xml
  Added:       src/documentation/xdocs/userdocs/concepts Tag:
                        cocoon_2_0_3_branch xmlform.xml
  Log:
  Sync branch with head. Add new XMLForm overview doc.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +1 -1      xml-cocoon2/src/documentation/xdocs/overview.xml
  
  Index: overview.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/overview.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- overview.xml      3 Mar 2002 21:10:27 -0000       1.2
  +++ overview.xml      17 Jun 2002 09:44:17 -0000      1.2.2.1
  @@ -38,7 +38,7 @@
        It will greatly assist your understanding of Cocoon to investigate
        behind-the-scenes, to find out how each sample is processed. Do this
        by looking at the actual XML documents provided in the distribution at
  -     <code>webapp/docs/samples/</code> and by consulting the sitemap to see
  +     <code>src/webapp/samples/</code> and by consulting each sitemap to see
        the processing steps that are defined.
       </p>
      </s1> 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +23 -19    
xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard.xml
  
  Index: howto-xmlform-wizard.xml
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/xmlform-wizard/howto-xmlform-wizard.xml,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- howto-xmlform-wizard.xml  7 Jun 2002 19:49:00 -0000       1.4.2.1
  +++ howto-xmlform-wizard.xml  17 Jun 2002 09:44:17 -0000      1.4.2.2
  @@ -3,7 +3,7 @@
   
   <document>
     <header>
  -    <title>XMLForm Wizard&#39;s How-To</title>
  +    <title>XMLForm Wizard How-To</title>
   
       <authors>
         <person name="Heidi-Marie Brannan"
  @@ -15,8 +15,8 @@
       <s1 title="Notice">
         <p>This How-To is based on components included in the Cocoon 2.1
         distribution. If you don&#39;t have this version, you can obtain it 
from
  -      the Cocoon web site. See the <link 
href="http://xml.apache.org/cocoon/";>xml.apache.org</link>
  -      web site for details.</p>
  +      the <link href="../../index.html">Apache Cocoon</link> web site.
  +      </p>
   
         <p> Some user accessible points in the Cocoon 2.1 distribution should 
be
         considered &#34;alpha&#34;. This means that the developer team is not
  @@ -79,11 +79,6 @@
       </s1>
   
       <s1 title="Requirements">
  -      <fixme author="DS">Consider adding related jar info, even though they
  -      are included in the HEAD branch. I find it useful to begin educating
  -      users about what jars they may need when they explore new 
approahces.</fixme>
  -      <fixme author="HMB">I will add the jars when I have a definitive list 
form Ivelin</fixme>
  -
         <p>You will need the following:</p>
   
         <ul>
  @@ -91,6 +86,8 @@
   
           <li>JDK 1.2 or later</li>
   
  +             <li>commons-jxpath.jar, included in the current Cocoon 2.1 
lib/optional  directory</li>
  +
         </ul>
   
         <p>Cocoon 2.1 CVS to be installed with the command:</p>
  @@ -151,14 +148,21 @@
           to the next generation of dynamic federated content.</li>
         </ul>
   
  +      <p>
  +       See XMLForm in action with the 
  +       <link href="../../overview.html#samples">Cocoon Samples</link> ...
  +       <link href="../../../samples/xmlform/">XMLForm Demonstration</link>.
  +      </p>
  +
         <p>Consider examining the XMLForm Feedback Wizard demo in your Cocoon
  -      distribution, found at src/webapp/samples/xmlform. It includes a 
variety
  +      distribution, found at <code>src/webapp/samples/xmlform/</code>.
  +      It includes a variety
         of XMLForm widgets. Additionally, it illustrates access to other Form
         models, not only JavaBeans (as demonstrated in this How-To) but also 
DOM
         nodes.</p>
       </s1>
   
  -    <s1 title="TIPS">
  +    <s1 title="Tips">
         <p>If you have a problem running the How-To example, try the 
following.</p>
   
         <ul>
  @@ -166,12 +170,12 @@
           is displayed in your browser.</li>
   
           <li>Check the mail archives at <link
  -        href="http://marc.theaimsgroup.com";>MARC: Mailing list ARChives at
  +        href="http://marc.theaimsgroup.com/";>MARC: Mailing list ARChives at
           AIMS</link>. Chances are somebody else has already experienced a
           similar problem!</li>
   
           <li>Try posting a description of your problem to the <link
  -        href="http://xml.apache.org/cocoon/mail-lists.html";>Cocoon users 
email
  +        href="../../mail-lists.html">Cocoon users email
           list</link>. Remember to include the whole error message. For a 
prompt
           reply, make sure you supply all relevant information.</li>
   
  @@ -183,13 +187,13 @@
   
       <s1 title="Related resources/documents">
         <s2 title="Cocoon">
  -        <p>For all Cocoon basics see the <link
  -        href="http://xml.apache.org/cocoon";>Cocoon Web site</link>. For
  -        actions, take a look at the <link
  -        href=" 
http://xml.apache.org/cocoon/userdocs/concepts/actions.html";>actions
  -        page</link>. Actions are Avalon Components, so you may want to read
  -        Avalon&#39;s <link 
href="http://jakarta.apache.org/avalon/developing/";>white
  -        paper</link> for more information.</p>
  +        <p>For all Cocoon basics see the
  +        <link href="../../index.html">Cocoon documentation</link>. The
  +        <link href="../../userdocs/concepts/xmlform.html">XMLForm 
Handling</link> and the 
  +        <link href="../../userdocs/concepts/actions.html">actions page</link>
  +        are especially helpful. Actions are Avalon Components, so you may 
want
  +        to read the Avalon
  +        <link href="http://jakarta.apache.org/avalon/developing/";>white 
paper</link> for more information.</p>
         </s2>
   
         <s2 title="XPath">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.3   +6 -1      xml-cocoon2/src/documentation/xdocs/plan/changes-doc.xml
  
  Index: changes-doc.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/plan/changes-doc.xml,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- changes-doc.xml   7 Jun 2002 19:57:02 -0000       1.6.2.2
  +++ changes-doc.xml   17 Jun 2002 09:44:17 -0000      1.6.2.3
  @@ -18,6 +18,11 @@
   
    <release version="@version@" date="@date@">
   
  +   <action dev="DC" type="add" due-to="Andrew Savory" due-to-email="[EMAIL 
PROTECTED]">
  +   Added overview documentation for
  +   <link href="../userdocs/concepts/xmlform.html">XMLForm Handling</link>.
  +  </action>
  +
     <action dev="DS" type="add">
      New <link href="../snippet/index.html">Snippet</link> section added, along
      with first <link 
href="../snippet/snippet-internal-pipeline.html">Snippet</link> and <link 
href="../howto/howto-author-snippet.html">Snippet How-To</link>.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.2   +1 -0      
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/book.xml,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- book.xml  28 Apr 2002 20:06:15 -0000      1.3.2.1
  +++ book.xml  17 Jun 2002 09:44:17 -0000      1.3.2.2
  @@ -22,6 +22,7 @@
       <menu-item label="Persistence" href="persistence.html"/>
       <menu-item label="StoreJanitor" href="storejanitor.html"/>
       <menu-item label="XMLSearching" href="xmlsearching.html"/>
  +    <menu-item label="XMLForm" href="xmlform.html"/>
       <menu-item label="Databases" href="databases.html"/>
       <menu-item label="Modules" href="modules.html"/>
     </menu>
  
  
  
  1.2.2.3   +2 -1      
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/catalog.xml,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- catalog.xml       16 Jun 2002 07:29:31 -0000      1.2.2.2
  +++ catalog.xml       17 Jun 2002 09:44:17 -0000      1.2.2.3
  @@ -278,7 +278,8 @@
     <p>
      See catalogs in action with the 
      <link href="../../overview.html#samples">Cocoon Samples</link> ...
  -   <link href="samples/catalog-demo">catalog-demo</link>. The demonstration
  +   <link href="../../../samples/misc/catalog-demo">catalog-demo</link>.
  +   The demonstration
      intends to be self-documenting. The top-level XML instance describes its
      role, and each included external entity reports how it came into being.
      This example builds upon the example provided by the Walsh article.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +0 -0      
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/xmlform.xml
  
  Index: xmlform.xml
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/xmlform.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to