shannon     2002/06/07 13:14:38

  Modified:    src/documentation/xdocs Tag: cocoon_2_0_3_branch book.xml
                        index.xml mail-lists.xml who.xml
  Log:
  sync with head
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.4   +4 -2      xml-cocoon2/src/documentation/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/book.xml,v
  retrieving revision 1.8.2.3
  retrieving revision 1.8.2.4
  diff -u -r1.8.2.3 -r1.8.2.4
  --- book.xml  24 May 2002 13:52:39 -0000      1.8.2.3
  +++ book.xml  7 Jun 2002 20:14:37 -0000       1.8.2.4
  @@ -17,9 +17,11 @@
       <menu-item label="Installing" href="installing/index.html"/>
       <menu-item label="User Guide" href="userdocs/index.html"/>
       <menu-item label="Dev Guide" href="developing/index.html"/>
  -    <menu-item label="Tutorial" href="tutorial.html"/>
  -    <menu-item label="FAQs" href="faq.html"/>
  +    <menu-item label="Tutorials" href="tutorial/index.html"/>
  +    <menu-item label="FAQs" href="faq/index.html"/>
  +    <menu-item label="How-Tos" href="howto/index.html"/>
       <menu-item label="Performance" href="performancetips.html"/>
  +    <menu-item label="Snippets" href="snippet/index.html"/>
       <menu-item label="ToC" href="doclist.html"/>
     </menu>
   
  
  
  
  1.7.2.3   +17 -11    xml-cocoon2/src/documentation/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/index.xml,v
  retrieving revision 1.7.2.2
  retrieving revision 1.7.2.3
  diff -u -r1.7.2.2 -r1.7.2.3
  --- index.xml 24 May 2002 13:52:39 -0000      1.7.2.2
  +++ index.xml 7 Jun 2002 20:14:37 -0000       1.7.2.3
  @@ -11,33 +11,39 @@
        </header>
        <body>
                <figure src="images/cocoon.gif" alt="Cocoon"/>
  -             <s1 title="What is this?">
  +             <s1 title="What is Cocoon?">
                        <p>
      Apache Cocoon is an XML publishing framework that raises the usage of
      XML and XSLT technologies for server applications to a new
      level. Designed for performance and scalability around pipelined SAX
  -   processing, Cocoon offers a flexible environment based on the separation
  -   of concerns between content, logic and style. A centralized
  -   configuration system and sophisticated caching top this all off and help
  -   you to create, deploy and maintain rock-solid XML server applications.
  +   processing, Cocoon offers a flexible environment based on a separation
  +   of concerns between content, logic, and style. To top this all off, 
  +   Cocoon's centralized configuration system and sophisticated caching help
  +   you to create, deploy, and maintain rock-solid XML server applications.
    </p>
                        <p>
  -   Cocoon interacts with most data sources, including: filesystems, RDBMS,
  +   Cocoon interacts with most data sources, including filesystems, RDBMS,
      LDAP, native XML databases, and network-based data sources. It adapts
      content delivery to the capabilities of different devices like HTML, WML,
  -   PDF, SVG, RTF just to name a few. Cocoon currently runs as a Servlet or
  -   from a powerful commandline interface. The chosen design of an abstracted
  +   PDF, SVG, and RTF, to name just a few. You can run Cocoon as a Servlet as well as
  +   through a powerful, commandline interface. The chosen design of an abstracted
      environment gives you the freedom to implement your own concrete
      environment to suit your required functionality.
    </p>
  + <fixme author="DS">
  + The last sentence remains awkward. Is it correct to write as follows:
  + The deliberate design of its abstract environment gives you the freedom to
  + implement the functionality you need within your own custom, concrete environment.
  + </fixme>
  + 
                </s1>
  -             <s1 title="Where is it?">
  +             <s1 title="Where can I find it?">
                        <p>
  -   If you want to download the latest release @released.version@ of Apache Cocoon 
just go to the 
  +   To download the latest release @released.version@ of Apache Cocoon, go to the 
      <link href="http://xml.apache.org/cocoon/dist/";>download area.</link>
                        </p>
                        <p>
  -   If you are looking for the past generation of Cocoon (not supported anymore but 
still available) 
  +   If you are looking for a past generation of Cocoon (no longer supported but 
still available), 
      go to the <link href="http://xml.apache.org/cocoon1/";>Cocoon 1.x area</link>.    
 
                         </p>
                </s1>
  
  
  
  1.3.2.3   +1 -1      xml-cocoon2/src/documentation/xdocs/mail-lists.xml
  
  Index: mail-lists.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/mail-lists.xml,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -u -r1.3.2.2 -r1.3.2.3
  --- mail-lists.xml    19 May 2002 09:20:34 -0000      1.3.2.2
  +++ mail-lists.xml    7 Jun 2002 20:14:37 -0000       1.3.2.3
  @@ -15,7 +15,7 @@
      <p><strong>IMPORTANT: Before posting a question or problem to any mailing list,
       </strong>please first look at the following resources:</p>
      <ol>
  -    <li><link href="faq.html">FAQs</link></li>
  +    <li><link href="faq/index.html">FAQs</link></li>
       <li><link href="link/index.html">Cocoon Links</link></li>
       <li><link href="mail-archives.html">Mailing list archives</link> - 
        a veritable goldmine of Cocoon-specific information - if you know where to 
look!</li>
  
  
  
  1.2.2.2   +30 -4     xml-cocoon2/src/documentation/xdocs/who.xml
  
  Index: who.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/who.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- who.xml   27 May 2002 17:34:55 -0000      1.2.2.1
  +++ who.xml   7 Jun 2002 20:14:37 -0000       1.2.2.2
  @@ -57,21 +57,47 @@
         <li>Christian Haul ([EMAIL PROTECTED])</li>
         <li>John Morrison ([EMAIL PROTECTED])</li>
         <li>David Crossley ([EMAIL PROTECTED])</li>
  -      <li>Ovidiu Predescu ([EMAIL PROTECTED])</li>
  +      <li>Ovidiu Predescu ([EMAIL PROTECTED])</li>
         <li>Torsten Curdt ([EMAIL PROTECTED])</li>
         <li>Gianugo Rabellino ([EMAIL PROTECTED])</li>
         <li>Gerhard Froehlich ([EMAIL PROTECTED])</li>
         <li>Bernhard Huber ([EMAIL PROTECTED])</li>
         <li>Mark Butler ([EMAIL PROTECTED])</li>
         <li>Nicola Ken Barozzi ([EMAIL PROTECTED])</li>
  -      <li>Ivelin Atanasoff Ivanov ([EMAIL PROTECTED])</li>
         <li>Konstantin Piroumian ([EMAIL PROTECTED])</li>
  +      <li>Ivelin Ivanov ([EMAIL PROTECTED])</li>
  +      <li>Diana Shannon ([EMAIL PROTECTED])</li>
  +      <li>Peter Royal ([EMAIL PROTECTED])</li>
  +      <li>Stephan Michels ([EMAIL PROTECTED])</li>
  +      
       </ul>
     </s2>
  +  <s2 title="Credits">
  +    <p>This is a place where major donations to the Cocoon project are listed 
  +       and it should be used to give appropriate visibility to those inviduals, 
  +       organizations or companies that donated resources to the effort. This is
  +       one of the ways the Cocoon community pays back.
  +    </p>
  +    <ul>
  +      <li>  
  +      The Cocoon project was originally created, proposed and bootstrapped by
  +Stefano Mazzocchi ([EMAIL PROTECTED])
  +      </li>
  +      <li>
  +        The web application framework consisting of the session handling (aka 
sunShine),
  +        the authentication framework (aka sunRise) and the portal engine (aka 
sunSpot)
  +        was created and developed by the Open Source Competence Center of 
  +        <link href="http://www.s-und-n.de";>s&amp;n AG</link>, Paderborn, Germany.
  +      </li>
  +      <li>
  +        The interpreted sitemap engine and other contributions from Sylvain Wallez 
are
  +        made possible by the time donated by his company,
  +        <link href="http://www.anyware-tech.com";>Anyware Technologies</link>.
  +      </li>
  +     </ul>
  +    </s2>
    </s1>
   
   </body>
   </document>
  -
  -
   
  
  
  

----------------------------------------------------------------------
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