cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2/webapp/sub/stylesheets error2html.xsl
Date Thu, 25 Oct 2001 07:43:53 GMT
cziegeler    01/10/25 00:43:53

  Modified:    .        Tag: cocoon_20_branch announcement.xml build.xml
               documentation/xdocs Tag: cocoon_20_branch 3rdparty.xml
                        actions.xml avalon.xml book.xml caching.xml
                        catalog.xml contrib.xml datasources.xml
                        emotional-landscapes.xml esql.xml extending.xml
                        faq.xml hosting.xml httprequest.xml index.xml
                        installing.xml jars.xml license.xml livesites.xml
                        logicsheet-concepts.xml logicsheet-forms.xml
                        logicsheet.xml mail-lists.xml
                        matchers_selectors.xml mrustore.xml overview.xml
                        parent-component-manager.xml patches.xml
                        request.xml sessions.xml sitemap.xml
                        storejanitor.xml uc2.xml who.xml xsp-internals.xml
                        xsp.xml
               documentation/xdocs/userdocs Tag: cocoon_20_branch book.xml
               documentation/xdocs/userdocs/actions Tag: cocoon_20_branch
                        actions.xml book.xml
               documentation/xdocs/userdocs/generators Tag:
                        cocoon_20_branch book.xml directory-generator.xml
                        extractor-generator.xml file-generator.xml
                        generators.xml html-generator.xml
                        imagedirectory-generator.xml jsp-generator.xml
                        php-generator.xml request-generator.xml
                        script-generator.xml serverpages-generator.xml
                        status-generator.xml stream-generator.xml
                        velocity-generator.xml
               documentation/xdocs/userdocs/matchers Tag: cocoon_20_branch
                        book.xml matchers.xml
               documentation/xdocs/userdocs/selectors Tag: cocoon_20_branch
                        book.xml selectors.xml
               documentation/xdocs/userdocs/serializers Tag:
                        cocoon_20_branch book.xml html-serializer.xml
                        link-serializer.xml pcl-serializer.xml
                        pdf-serializer.xml ps-serializer.xml
                        serializers.xml svg-serializer.xml
                        svgjpeg-serializer.xml svgpng-serializer.xml
                        svgxml-serializer.xml text-serializer.xml
                        vrml-serializer.xml wap-serializer.xml
                        xml-serializer.xml
               documentation/xdocs/userdocs/transformers Tag:
                        cocoon_20_branch book.xml cinclude-transformer.xml
                        extractor-transformer.xml filter-transformer.xml
                        i18n-transformer.xml ldap-transformer.xml
                        log-transformer.xml readdomsession-transformer.xml
                        sql-transformer.xml transformers.xml
                        writedomsession-transformer.xml
                        xinclude-transformer.xml xslt-transformer.xml
                        xt-transformer.xml
               webapp/resources/entities Tag: cocoon_20_branch
                        CatalogManager.properties
               webapp/sub/stylesheets Tag: cocoon_20_branch error2html.xsl
  Removed:     documentation/xdocs Tag: cocoon_20_branch IMPORTANT
               documentation/xdocs/userdocs/generators Tag:
                        cocoon_20_branch profile-generator.xml
                        xmldb-generator.xml xmldbcollection-generator.xml
  Log:
  Removed @docname@ and @doctitle from documentation
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.5   +7 -7      xml-cocoon2/announcement.xml
  
  Index: announcement.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/announcement.xml,v
  retrieving revision 1.1.2.4
  retrieving revision 1.1.2.5
  diff -u -r1.1.2.4 -r1.1.2.5
  --- announcement.xml	2001/07/19 13:18:22	1.1.2.4
  +++ announcement.xml	2001/10/25 07:43:49	1.1.2.5
  @@ -1,19 +1,19 @@
   <?xml version="1.0"?>
   
   <announcement site="http://xml.apache.org/cocoon2">
  -  <project>@docname@ @version@</project>
  +  <project>Apache Cocoon @version@</project>
     <abstract>
  -The @docname@ team is proud to announce the @release@ release
  -of @doctitle@. This release has been tested thoroughly.
  +The Apache Cocoon team is proud to announce the @release@ release
  +of Apache Cocoon. This release has been tested thoroughly.
     </abstract>
     <body>
       <p>
  -@doctitle@ is a complete rewrite of the Cocoon XML publishing framework that
  +Apache Cocoon is a complete rewrite of the Cocoon XML publishing framework that
   is supposed to remove all those design constraints that emerged from the
  -@docname@ 1 experience.
  +Cocoon 1 experience.
       </p>
       <p>
  -The @docname@ Project has gone a long way since its creation on
  +The Apache Cocoon Project has gone a long way since its creation on
   January 1999. It started as a simple servlet for static XSL styling and became
   more and more powerful as new features were added. Unfortunately, design
   decisions made early in the project influenced its evolution. Today, some of
  @@ -22,7 +22,7 @@
   reconsidered under this new light.
       </p>
       <p>
  -While @docname@ started as a small step in the direction of a new
  +While Apache Cocoon started as a small step in the direction of a new
   web publishing idea based on better design patterns and reviewed estimations
   of management issues, the technology used was not mature enough for tools to
   emerge. Today, most web engineers consider XML as the key for an improved web
  
  
  
  1.8.2.51  +0 -2      xml-cocoon2/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/build.xml,v
  retrieving revision 1.8.2.50
  retrieving revision 1.8.2.51
  diff -u -r1.8.2.50 -r1.8.2.51
  --- build.xml	2001/10/24 09:33:50	1.8.2.50
  +++ build.xml	2001/10/25 07:43:49	1.8.2.51
  @@ -222,8 +222,6 @@
       <filter token="release" value="${release}"/>
       <filter token="year"    value="${year}"/>
       <filter token="version" value="${version}"/>
  -    <filter token="docname" value="${fullname}"/>
  -    <filter token="doctitle" value="${fullname} ${short.version}"/>
       <filter token="date"    value="${TODAY}"/>
       <filter token="log"     value="true"/>
       <filter token="verbose" value="true"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +8 -8      xml-cocoon2/documentation/xdocs/3rdparty.xml
  
  Index: 3rdparty.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/3rdparty.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- 3rdparty.xml	2001/10/05 09:31:12	1.1.2.1
  +++ 3rdparty.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -14,7 +14,7 @@
   
    <s1 title="How to Contribute">
     <p>
  -   See <connect href="contrib.xml">How to contribute to @docname@</connect>.
  +   See <connect href="contrib.xml">How to contribute to Apache Cocoon</connect>.
     </p>
   
    </s1>
  @@ -24,7 +24,7 @@
      These are not necessarily deemed to be high enough quality to be included in the
      core distribution, but they have been tested under <connect href="contrib.xml">
      several key environments</connect>, they are provided under the same license
  -   as @docname@, and they are included in the @docname@ distribution under the
  +   as Apache Cocoon, and they are included in the Cocoon distribution under the
      <code>contrib/</code> directory.
     </p>
   
  @@ -37,21 +37,21 @@
   
    <s1 title="Patch Queue">
     <p><connect href="patches.xml">Submissions of modifications</connect>
  -   to @docname@ which are awaiting review. Anyone can
  +   to Cocoon which are awaiting review. Anyone can
      comment on them on the cocoon-dev mailing list - code reviewers are needed!
  -   <strong>Use these at your own risk</strong> - although @docname@ has no guarantee
  +   <strong>Use these at your own risk</strong> - although Cocoon has no guarantee
      either, these patches have not been reviewed, let alone accepted.
     </p>
    </s1>
   
    <s1 title="Other Extensions">
  -  <p>The other extensions listed here are <strong>not endorsed</strong> by the @docname@
  +  <p>The other extensions listed here are <strong>not endorsed</strong> by the Cocoon
      project either - they are provided as a convenience only. They may or may not work,
      they may or may not be open source, etc.
     </p>
   
     <p>To have a link added to this table, see <connect href="contrib.xml">How to contribute
  -   to @docname@</connect>.</p>
  +   to Cocoon</connect>.</p>
   
     <table>
      <tr>
  @@ -66,9 +66,9 @@
       <td><link href="http://www.geocities.com/SiliconValley/Monitor/7464/emacs/xslt-process/">
        XSLT-process</link></td>
       <td>Development Environment</td>
  -    <td>A minor mode for (X)Emacs that allows you to invoke an XSLT processor, or @docname@ on a buffer,
  +    <td>A minor mode for (X)Emacs that allows you to invoke an XSLT processor, or Cocoon on a buffer,
        thus yielding a fast turnaround time.</td>
  -    <td>Supports Xalan, @docname@, Saxon</td>
  +    <td>Supports Xalan, Apache Cocoon, Saxon</td>
       <td>?</td>
       <td><link href="mailto:ovidiu@cup.hp.com">Ovidiu Predescu</link></td>
      </tr>
  
  
  
  1.1.2.2   +5 -5      xml-cocoon2/documentation/xdocs/actions.xml
  
  Index: actions.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/actions.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- actions.xml	2001/10/05 09:31:12	1.1.2.1
  +++ actions.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document> 
     <header> 
  -	 <title>Creating and Using Actions in @doctitle@</title>
  +	 <title>Creating and Using Actions</title>
   	 <version>0.3</version> 
   	 <type>Overview document</type> 
   	 <authors>
  @@ -17,10 +17,10 @@
      <s1 title="The Actions"> 
      <s2 title="What is an Action?"> 
       <p>
  -     @docname@ has a rich set of tools for publishing web documents, and while
  +     Apache Cocoon has a rich set of tools for publishing web documents, and while
        XSP and Generators provide alot of functionality, they still mix content
        and logic to a certain degree.  The Action was created to fill that gap.
  -     Because the @docname@ Sitemap provides a mechanism to select the pipeline
  +     Because the Cocoon Sitemap provides a mechanism to select the pipeline
        at run time, we surmised that sometimes we need to adjust the pipeline
        based on runtime parameters, or even the contents of the Request parameter.
        Without the use of Actions this would make the sitemap almost
  @@ -40,7 +40,7 @@
       <s2 title="When to use an Action instead of XSP">
        <p>
          Sometimes it is going to be quicker for you to create and handle
  -       logic in XSP, because @docname@ recognizes if there have been any
  +       logic in XSP, because Cocoon recognizes if there have been any
          changes.  However, many times it is more desirable to have a separation
          between the logic and the display.  For instance, we will use a
          multipage form.  In XSP the logic to handle the results for one
  @@ -106,7 +106,7 @@
        <p>
         There is nothing like a little sample code to get your feet wet.
         We are performing something very simple here, but you can get
  -      more complex examples from the @docname@ code-base.
  +      more complex examples from the Cocoon code-base.
        </p>
        <source>
   <![CDATA[
  
  
  
  1.1.2.2   +9 -10     xml-cocoon2/documentation/xdocs/avalon.xml
  
  Index: avalon.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/avalon.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- avalon.xml	2001/10/05 09:31:12	1.1.2.1
  +++ avalon.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,8 +3,7 @@
   
   <document>
     <header>
  -	 <title>Avalon</title>
  -	 <subtitle>for @doctitle@</subtitle>
  +	 <title>Avalon for Apache Cocoon</title>
   	 <version>0.2</version>
   	 <type>Technical document</type>
   	 <authors>
  @@ -13,20 +12,20 @@
   		<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   	 </authors>
   	 <abstract>This document tries to give the basic knowledge of Avalon that is
  -		necessary to understand @docname@.</abstract>
  +		necessary to understand Apache Cocoon.</abstract>
     </header>
     <body>
   	 <s1 title="Goal">
   		<p>This document tries to give the basic knowledge of Avalon that is
  -		  necessary to understand @docname@.</p>
  +		  necessary to understand Cocoon.</p>
   		<p>People that are trying to understand Avalon in depth, will probably
  -		  not be much helped by this document. But if you want to understand @docname@,
  +		  not be much helped by this document. But if you want to understand Cocoon,
   		  you have to have a basic grasp of Avalon. </p>
   		<p>The document also contains the basic configuration steps for
  -               configuring Avalon components within @docname@.</p>
  +               configuring Avalon components within Cocoon.</p>
   		<p>Much of this document is copied and pasted from original Avalon
   		  documentation. However, I hope that the fact that all things relevant for
  -		  @docname@ are put together in one place, will help you to understand @docname@
  +		  Cocoon are put together in one place, will help you to understand Cocoon
   		  faster.</p>
   		<p>For people wishing to learn Avalon in-depth,
   		  <link href="http://jakarta.apache.org/avalon/developing/index.html">this is your starting
  @@ -45,7 +44,7 @@
   		</ul>
   	 </s1>
   	 <s1 title="The classes and interfaces"> 
  -		<p>These classes and interfaces are extensively used by @docname@:</p>
  +		<p>These classes and interfaces are extensively used by Cocoon:</p>
   		<s2 title="ComponentManager">
   		  <p><code>org.apache.avalon.framework.component.ComponentManager</code></p>
   		  <p>A <code>ComponentManager</code> selects <code>Component</code>s
  @@ -77,7 +76,7 @@
   			 <code>Composer</code>. The <code>Composer</code> must know what type of
   			 <code>Component</code> it is accessing, so it will re-cast the
   			 <code>Component</code> into the type it needs. </p>
  -		  <p><code>Component</code>s in @docname@ are e.g. those defined in
  +		  <p><code>Component</code>s in Cocoon are e.g. those defined in
   			 <code>cocoon.xconf</code>.</p>
   		</s2>
   		<s2 title="Configuration">
  @@ -107,7 +106,7 @@
   			<p>Avalon now incorporates a couple of modifiers for a Component
   			definition that allows you to control the number of Components
   			in a pool, and how quickly it grows.  This is especially helpful
  -			in @docname@ where the defaults don't always work well.</p>
  +			in Cocoon where the defaults don't always work well.</p>
   			<p>The magic attributes are "pool-min", "pool-max", and "pool-grow".
   			The defaults are:</p>
   			<ol>
  
  
  
  1.5.2.3   +3 -3      xml-cocoon2/documentation/xdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/book.xml,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- book.xml	2001/10/23 07:00:26	1.5.2.2
  +++ book.xml	2001/10/25 07:43:49	1.5.2.3
  @@ -1,7 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<book software="@doctitle@" 
  -      title="@doctitle@ Documentation" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Documentation" 
         copyright="@year@ The Apache Software Foundation"
         xmlns:xlink="http://www.w3.org/1999/xlink">
   
  @@ -67,7 +67,7 @@
   
     <menu label="Hosting">
       <menu-item label="Live Sites" href="livesites.html"/>
  -    <menu-item label="@docname@ Hosting" href="hosting.html"/>
  +    <menu-item label="Cocoon Hosting" href="hosting.html"/>
     </menu>
   
     <menu label="Project">
  
  
  
  1.1.2.2   +7 -8      xml-cocoon2/documentation/xdocs/caching.xml
  
  Index: caching.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/caching.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- caching.xml	2001/10/05 09:31:12	1.1.2.1
  +++ caching.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -4,21 +4,20 @@
   <document>
     <header>
   	 <title>Caching</title>
  -	 <subtitle>in @doctitle@</subtitle>
   	 <version>0.9</version>
   	 <type>Technical document</type>
   	 <authors><person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   	 </authors>
  -	 <abstract>This document explains the basic caching algorithm of @docname@.</abstract>
  +	 <abstract>This document explains the basic caching algorithm of Apache Cocoon.</abstract>
     </header>
     <body>
   	 <s1 title="Goal">
  -		<p>This document explains the basic caching algorithm of @docname@.</p>
  +		<p>This document explains the basic caching algorithm of Apache Cocoon.</p>
   	 </s1>
   	 <s1 title="Overview">
  -		<p>The caching algorithm of @docname@ has a very flexible and powerful design.
  +		<p>The caching algorithm of Cocoon has a very flexible and powerful design.
                  The algorithms and components used are not hardcoded into the core of 
  -               @docname@. They can be configured using Avalon components.</p>
  +               Cocoon. They can be configured using Avalon components.</p>
               <p>This document describes the components available for caching,
                  how they can be configured and how to implement your own cacheable components.
               </p>
  @@ -175,9 +174,9 @@
   		</s2>
   	 </s1>
   	 <s1 title="Configuration">
  -		<p>The caching of @docname@ can be completely configured by different Avalon
  +		<p>The caching of Cocoon can be completely configured by different Avalon
                  components. This chapter describes which roles must/can be changed
  -               to tune up your @docname@ system.</p>
  +               to tune up your Cocoon system.</p>
   		<s2 title="The Stream and the Event Pipeline">
   			<p>The stream and the event pipeline are represented by two Avalon 
                        components which can be configured in the cocoon.xconf:</p>
  @@ -230,7 +229,7 @@
    	 </s1>
   	 <s1 title="Java APIs">
   		<p>For more information on the java apis refer directly to the
  -               javadocs of @docname@.</p>
  +               javadocs of Cocoon.</p>
               <p>The most important packages are:</p>
   		<ol>
   			<li><code>org.apache.cocoon.caching</code>: This package declares all interfaces for caching.</li>
  
  
  
  1.2.2.2   +21 -21    xml-cocoon2/documentation/xdocs/catalog.xml
  
  Index: catalog.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/catalog.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- catalog.xml	2001/10/05 09:31:12	1.2.2.1
  +++ catalog.xml	2001/10/25 07:43:49	1.2.2.2
  @@ -15,7 +15,7 @@
    <body>
    <s1 title="Introduction">
     <p>
  -   @docname@ has the capability to utilise an entity resolution mechanism. 
  +   Apache Cocoon has the capability to utilise an entity resolution mechanism. 
      External entities (e.g. Document Type Definitions (DTDs), character entity
      sets, XML sub-documents) are resources that are declared by an XML instance
      document - they exist as separate objects. An entity catalog assists with
  @@ -54,7 +54,7 @@
   
     <p>
      With the powerful catalog support there are no such problems. This document
  -   provides the following sections to explain @docname@ capability for
  +   provides the following sections to explain Cocoon capability for
      resolving entities ...
     </p>
   
  @@ -87,7 +87,7 @@
      </li>
      <li>
       <link href="#imp">Implementation notes</link>
  -     - describes how support for catalogs is added to @docname@
  +     - describes how support for catalogs is added to Cocoon
      </li>
      <li>
       <link href="#dev">Development notes</link>
  @@ -114,12 +114,12 @@
      XML frameworks to be capable of utilising entity resolvers.
      "<link href="http://www.arbortext.com/Think_Tank/XML_Resources/Issue_Three/issue_three.html">If You Can Name It, You Can Claim It!</link>"
      by Norman Walsh. Please read that document, then return here to apply
  -   entity catalogs to @docname@.
  +   entity catalogs to Cocoon.
     </p>
   
     <p>
      (Note: That article (and Java classes) evolved to become the Sun
  -   <code>resolver.zip</code> Java package that has been added to @docname@
  +   <code>resolver.zip</code> Java package that has been added to Cocoon
      - a more recent version of the article is available with the Sun download
      (see below). The API javadocs from your build have further information.
      However, you do not need to know the gory details to understand catalogs
  @@ -145,14 +145,14 @@
   ]]></source>
   
     <p>
  -   Now consider what will happen when @docname@ tries to process this XML
  +   Now consider what will happen when Cocoon tries to process this XML
      instance. Whether you have set validation=yes or not, the parser will
      still want to resolve all of the entities that are required by the XML
      instance (i.e. the DTD and any other entities that the DTD might declare).
      So it will happily trundle across the network to get them. It will do this
      every time that the document is processed. This is obviously a needless
      overhead. Worse still, what happens if that host is down or the network is
  -   congested. Additionally, if your @docname@ is an off-line server then it is
  +   congested. Additionally, if your Cocoon is an off-line server then it is
      always broken because it cannot retrieve the network-based resources.
     </p>
    </s1>
  @@ -266,7 +266,7 @@
       When the parser needs to load a declared entity, then it first consults
       the Catalog Resolver to get a possible mapping to an alternate system
       identifier. If there is no mapping for an identifier in the catalogs
  -    (or in any sub-ordinate catalogs), then @docname@ will carry on to
  +    (or in any sub-ordinate catalogs), then Cocoon will carry on to
       retrieve the resource using the original declared system identifier.
      </p>
     </s2>
  @@ -277,14 +277,14 @@
   
     <p>
      See catalogs in action with the 
  -   <link href="overview.html#samples">@docname@ Samples</link> ...
  +   <link href="overview.html#samples">Cocoon Samples</link> ...
      <link href="samples/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.
      (Tip: To see the error message that would result from not using a catalog,
      simply rename the default <code>catalog</code> file before starting
  -   @docname@.)
  +   Cocoon.)
     </p>
   
   <note>TODO: ensure that the link to samples works OK in the various documentation situations (i.e. static site, local docs build)</note>
  @@ -387,15 +387,15 @@
    <s1 title="Default configuration">
     <p>
      A default catalog and some base entities (e.g. ISO*.pen character
  -   entity sets) are included in the @docname@ distribution at 
  +   entity sets) are included in the Cocoon distribution at 
      <code>webapps/cocoon/resources/entities/</code>
  -   - the default catalog is automatically loaded when @docname@ starts.
  +   - the default catalog is automatically loaded when Cocoon starts.
     </p>
   
     <p>
      If you suspect problems, then you can raise the level of the
      <code>verbosity</code> property (to 2 or 3) and watch the messages going
  -   to standard output when @docname@ starts and operates. You would also do
  +   to standard output when Cocoon starts and operates. You would also do
      this to detect any misconfiguration of your own catalogs.
     </p>
    </s1>
  @@ -439,7 +439,7 @@
      </p>
   
      <p>
  -    If you see an error message going to STDOUT when @docname@ starts 
  +    If you see an error message going to STDOUT when Cocoon starts 
       (<code>Cannot find CatalogManager.properties</code>) then this means that
       the properties file is not available to the Java classpath. Note that this
       does not mean that entity resolution is disabled, rather that no local
  @@ -467,7 +467,7 @@
     <s2 title="Example local configuration for Simplified DocBook">
     <p>
      We use the Simplified DocBook XML DTD for some of our documentation.
  -   Here are the few steps that we followed to configure @docname@ to be able
  +   Here are the few steps that we followed to configure Cocoon to be able
      to process our XML instances.
     </p>
   
  @@ -501,7 +501,7 @@
   ]]></source>
   
     <p>
  -   We could similarly configure @docname@ for the full DocBook XML DTD and
  +   We could similarly configure Cocoon for the full DocBook XML DTD and
      related entities. In fact, the DocBook distribution already contains a
      catalog file. We need only append the pathname to our <code>catalogs</code>
      property.
  @@ -522,7 +522,7 @@
      The SAX <code>Parser</code> interface provides an <code>entityResolver</code>
      hook to allow an application to resolve the external entities. The Sun
      Microsystems Java code "<code>com.sun.resolver</code>" provides a
  -   <strong>Catalog Resolver</strong>. This is incorporated into @docname@ via
  +   <strong>Catalog Resolver</strong>. This is incorporated into Cocoon via
      <code>org.apache.cocoon.components.resolver</code> 
     </p>
   
  @@ -545,7 +545,7 @@
     </p>
   
     <ul>
  -   <li>5) ? What other default entities need to be shipped with the @docname@
  +   <li>5) ? What other default entities need to be shipped with the Cocoon
       distribution? We already have some character entity sets (ISO*.pen).
       Probably also need the documentation DTDs.
      </li>
  @@ -554,7 +554,7 @@
     </ul>
   
     <p>
  -   Some core @docname@ FIXME notes can be now be addressed by catalog ...
  +   Some core Cocoon FIXME notes can be now be addressed by catalog ...
     </p>
   
     <ul>
  @@ -588,7 +588,7 @@
       <link href="http://www.oasis-open.org/cover/">proper XML tools</link>
       for the preparation and validation of your XML instance documents.
      </li>
  -   <li>The default catalog that is shipped with the @docname@ distribution is
  +   <li>The default catalog that is shipped with the Cocoon distribution is
       deliberately basic. You will need to supplement it with your own catalog
       devised to suit your particular needs.
      </li>
  @@ -598,7 +598,7 @@
    <anchor id="summ"/>
    <s1 title="Summary">
     <p>
  -   Most XML documents that we would want to serve with @docname@ are already
  +   Most XML documents that we would want to serve with Cocoon are already
      in existence in another information system. The XML document instances have
      a declaration of their DTD Document Type Definition as an external file.
      This external DTD also includes entity sets such as ISOnum, ISOlat1, etc.
  
  
  
  1.1.2.3   +27 -27    xml-cocoon2/documentation/xdocs/contrib.xml
  
  Index: contrib.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/contrib.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- contrib.xml	2001/10/23 08:08:30	1.1.2.2
  +++ contrib.xml	2001/10/25 07:43:49	1.1.2.3
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -  <title>Contribution to @doctitle@</title>
  +  <title>Contribution to Apache Cocoon</title>
     <authors>
      <person name="Robin Green" email="greenrd@hotmail.com"/>
      <person name="Stefano Mazzocchi" email="stefano@apache.org"/> 
  @@ -15,7 +15,7 @@
    <s1 title="Introduction">
   
     <p>
  -   The @docname@ Project is an <link href="http://www.opensource.org/">Open Source</link>
  +   The Apache Cocoon Project is an <link href="http://www.opensource.org/">Open Source</link>
      volunteer project under the auspices of the
      <link href="http://www.apache.org/">Apache Software Foundation (ASF)</link>,
      and, in harmony with the Apache webserver itself, it is released under
  @@ -28,7 +28,7 @@
     </p>
     <p>
      To begin with, we suggest you to subscribe to the
  -   <link href="mail-lists.html">@docname@ mailing lists</link>
  +   <link href="mail-lists.html">Cocoon mailing lists</link>
      (follow the link for information on how to subscribe and to access the mail
      list archives), to checkout the 
      <link href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/">latest and
  @@ -44,7 +44,7 @@
      we have work for you!
     </p>
     <p>
  -   For financial support in particular, the @docname@ Project and the ASF in general
  +   For financial support in particular, the Cocoon Project and the ASF in general
      is closely collaborating with the <link href="http://www.sourcexchange.com">Collab.net
      SourceXchange</link> program that will provide a legal, solid and
      well-established resource for money collecting to fund software production
  @@ -65,46 +65,46 @@
     <ul>
      <li>Answering questions on the <code>cocoon-users</code> mailing list - there is often a problem of
       having too many questioners and not enough experts to respond to all the questions.</li>
  -   <li>Testing @docname@ (especially its less-frequently-used features) on various configurations
  +   <li>Testing Cocoon (especially its less-frequently-used features) on various configurations
       and reporting back.</li>
      <li>Debugging - producing reproduceable test cases and/or finding causes of bugs. Some known bugs are informally listed on
       <link href="todo.html">To Do</link>, and some are recorded in Bugzilla
       (see <link href="#procedure">explanation below</link>).</li>
  -   <li>Specifying/analysing/designing new features for @docname@ - and beyond. (If you wish to get involved
  +   <li>Specifying/analysing/designing new features for Cocoon - and beyond. (If you wish to get involved
       with this, please join <code>cocoon-dev@xml.apache.org</code>
  -    (you may also want to join <code>xsp-dev@xml.apache.org</code>), install and try out @doctitle@
  +    (you may also want to join <code>xsp-dev@xml.apache.org</code>), install and try out Cocoon
       and read some of the <link href="mail-lists.html">mail archives</link>.
       You should have a strong "fluency" in XML technologies, Java and a basic understanding of
  -    the @doctitle@ architecture - don't just say "it should have XYZ" without reading anything first -
  +    the Cocoon architecture - don't just say "it should have XYZ" without reading anything first -
       because chances are, someone's already thought of that feature!)</li>
      <li>Packaging easy-to-install packages (such as RPMs) for the myriad of possible configurations out
  -    there. (The @docname@ project does not maintain anything but the basic <code>.zip</code> and
  +    there. (The Cocoon project does not maintain anything but the basic <code>.zip</code> and
       <code>.tar.gz</code> packages, but anyone is welcome to build their own specific packages and
       announce them on <code>cocoon-users</code>)</li>
  -   <li>... and there is just one other thing - don't forget to tell everyone who asks, how great @docname@ is! ;-)
  -    The more people that know about and start to use @docname@, the larger the pool of
  +   <li>... and there is just one other thing - don't forget to tell everyone who asks, how great Cocoon is! ;-)
  +    The more people that know about and start to use Cocoon, the larger the pool of
       potential contributors there will be
  -    - so, please, help us by placing the @docname@ logo somewhere in your
  -    site to indicate that you are using and supporting the @docname@ Project.
  +    - so, please, help us by placing the Cocoon logo somewhere in your
  +    site to indicate that you are using and supporting the Cocoon Project.
      </li>
     </ul>
    
     <p>
  -   Thank you very much. <img src="images/cocoon2-small.jpg" alt="Powered by @docname@"/>
  +   Thank you very much. <img src="images/cocoon2-small.jpg" alt="Powered by Cocoon"/>
     </p>
    </s1>
   
    <s1 title="Contributions of Code and Documentation">
  -  <p>We are starting to use an informal system for accepting contributions to @docname@.
  +  <p>We are starting to use an informal system for accepting contributions to Cocoon.
      The process varies depending on whether the contribution is a modification (i.e. patch)
      or a fairly standalone item, and whether you have commit access (committers have been
      granted access by a vote of confidence, so they are assumed to be trustworthy enough
      to make changes directly in CVS. If you submit many good patches, you may be 
      nominated as a committer yourself!)</p>
   
  -  <p>If your contribution requires changing more than a few lines of @docname@ (code or
  +  <p>If your contribution requires changing more than a few lines of Cocoon (code or
      documentation), then it counts as a <strong>patch</strong>. If you have a patch and
  -   would like to see it incorporated into the @docname@ distribution, take note of the Licensing
  +   would like to see it incorporated into the Cocoon distribution, take note of the Licensing
      Requirements listed below, and then read the section 
      <link href="#procedure">Procedure for Raising Development Issues</link>
     </p>
  @@ -130,10 +130,10 @@
       specified below. See also Licensing Requirements below.]</li>
      <li>Inclusion into the main distribution. [Committers must be confident that it should work properly in 
       most/all environments, it must be documented as appropriate, and it must be considered sufficiently
  -    useful and general to go into @docname@. See also  Licensing Requirements below].</li>
  +    useful and general to go into Cocoon. See also  Licensing Requirements below].</li>
     </ol>
     
  -  <s2 title="Testing Requirements for @docname@ Contrib and Distribution">
  +  <s2 title="Testing Requirements for Cocoon Contrib and Distribution">
      <p>All new code should be tested under the following servlet engines:</p>
      <ul>
       <li>Apache Tomcat 3.2.2</li>
  @@ -146,7 +146,7 @@
       <li>A UNIX-type operating system</li>
       <li>A JDK version 1.2.x</li>
      </ul>
  -   <p>And obviously, it should be tested against the current CVS snapshot of @docname@!</p>
  +   <p>And obviously, it should be tested against the current CVS snapshot of Cocoon!</p>
   
      <p>This testing is designed to iron out the most common kinds of incompatibility
       problems (Servlet >2.2 requirements; platform-dependent assumptions; JDK >1.2 code).
  @@ -156,7 +156,7 @@
       than thorough testing!</p>
    </s2>
   
  - <s2 title="Documentation Requirements for @docname@ Distribution">
  + <s2 title="Documentation Requirements for Cocoon Distribution">
     <p>All new features (processor, logicsheets, config options etc.) should be documented
      appropriately (in XML or in <code>cocoon.xconf</code> in the case of config options).</p>
   
  @@ -167,7 +167,7 @@
     </p>
    </s2>
   
  - <s2 title="Licensing Requirements for the @docname@ Distribution">
  + <s2 title="Licensing Requirements for the Cocoon Distribution">
     <p>To avoid legal problems, the Apache Project Management Committee (PMC) have agreed on
      a policy for under what licensing code can be accepted into Apache projects:</p>
     <ul>
  @@ -182,7 +182,7 @@
      we do not have the resources nor the inclination to obtain signed statements from all
      contributors!</p>
   
  -  <p><strong>Note:</strong> Since the <code>contrib/</code> directory of @docname@ CVS contains
  +  <p><strong>Note:</strong> Since the <code>contrib/</code> directory of Cocoon CVS contains
      third-party. completely optional extensions, one of the above requirements is relaxed.
      Code in the contrib directory does not have to have its copyright assigned to the ASF
      - but it must still be released under the Apache license.</p>
  @@ -191,7 +191,7 @@
   
    <anchor id="cvshowto"/>
    <s1 title="CVS Usage Precis">
  -  <p>An overview of how to use CVS to participate in @docname@ development.
  +  <p>An overview of how to use CVS to participate in Cocoon development.
      Do not be afraid - you cannot accidently destroy the actual code repository,
      because you are working with a local copy as an anonymous user. Therefore,
      you do not have the system permissions to change anything. You can only 
  @@ -232,7 +232,7 @@
   
     <p>
      You now have the HEAD branch of the current development cvs repository
  -   for @doctitle@ on your local system. Go ahead and build and deploy as
  +   for Cocoon on your local system. Go ahead and build and deploy as
      usual. Make some changes, re-build, and see the effect.
     </p>
    </s2>
  @@ -319,7 +319,7 @@
      when they have found a bug and when not. However, less experienced users
      should first discuss it on the user or developer mailing list (as
      appropriate). Impatient people always enter everything into Bugzilla
  -   without caring if it is a bug of @docname@ or their own
  +   without caring if it is a bug of Cocoon or their own
      installation/configuration mistake - please do not do this.
     </p>
   
  @@ -370,7 +370,7 @@
       (one that is tried and true is
       <link href="http://www.jclark.com/sp/">SP/nsgmls</link>).
       This procedure will detect errors without having to go through the whole
  -    <code>build docs</code> process to find them. Do not expect @docname@
  +    <code>build docs</code> process to find them. Do not expect Cocoon
       or the build system to detect the validation errors for you - they can
       do it, but that is not their purpose. (Anyway, nsgmls validation error
       messages are more informative.)
  
  
  
  1.1.2.2   +9 -9      xml-cocoon2/documentation/xdocs/datasources.xml
  
  Index: datasources.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/datasources.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- datasources.xml	2001/10/05 09:31:12	1.1.2.1
  +++ datasources.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document> 
     <header> 
  -	 <title>Using Databases in @doctitle@</title>
  +	 <title>Using Databases in Apache Cocoon</title>
   	 <version>0.3</version> 
   	 <type>Overview document</type> 
   	 <authors><person name="Berin Loritsch" email="bloritsch@apache.org"/> 
  @@ -12,7 +12,7 @@
     <body> 
      <s1 title="How do I choose my database?"> 
       <p>
  -     @docname@ is flexible in the way it allows you to make connections to
  +     Apache Cocoon is flexible in the way it allows you to make connections to
        a database.  There are basically two ways: by redefining all the connection
        parameters in each page you use a database, or using a pooled connection.
        The first method is slow and doesn't scale well.  The second method is more
  @@ -21,7 +21,7 @@
       <s2 title="Installing the Driver">
        <p>
          Independent of how you choose to get and maintain your JDBC connections,
  -       you have to load the driver so @docname@ can use it (unless you are using
  +       you have to load the driver so Cocoon can use it (unless you are using
          a J2EE container--more on that later).  This is an init parameter in
          your web.xml file.  The following snippet will show you how:
        </p>
  @@ -46,13 +46,13 @@
       </s2>
       <s2 title="Defining a Data Source">
        <p>
  -      @docname@ allows you to specify a pooled data source that you can use
  -      for throughout the @docname@ system.  There are two different types of
  +      Cocoon allows you to specify a pooled data source that you can use
  +      for throughout the Cocoon system.  There are two different types of
         data sources: JDBC and J2EE.  The difference is in who controls the
  -      connection.  The JDBC data source lets @docname@ handle all the pooling
  -      logic.  The J2EE data source tells @docname@ how to pull the DataSource
  +      connection.  The JDBC data source lets Cocoon handle all the pooling
  +      logic.  The J2EE data source tells Cocoon how to pull the DataSource
         object from a J2EE container (thats Java 2 Enterprise Edition)--the
  -      major caveat is that @docname@ must be installed as part of a Enterprise
  +      major caveat is that Cocoon must be installed as part of a Enterprise
         Application.
        </p>
        <p>
  @@ -123,7 +123,7 @@
        <s3 title="The J2EE Connection Property">
         <p>
           The J2EE connection has only one property and it is absolutely
  -	required.  @docname@ uses JNDI to look up the DataSource with the
  +	required.  Cocoon uses JNDI to look up the DataSource with the
   	name you specified in "dbname".
         </p>
        </s3>
  
  
  
  1.1.2.2   +30 -30    xml-cocoon2/documentation/xdocs/emotional-landscapes.xml
  
  Index: emotional-landscapes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/emotional-landscapes.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- emotional-landscapes.xml	2001/10/05 09:31:12	1.1.2.1
  +++ emotional-landscapes.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -4,8 +4,8 @@
   <document>
   
     <header>
  -    <title>@doctitle@ Emotional Landscapes</title>
  -    <subtitle>why you can't afford to miss @docname@</subtitle>
  +    <title>Apache Cocoon Emotional Landscapes</title>
  +    <subtitle>why you can't afford to miss Apache Cocoon</subtitle>
       <authors>
         <person name="Stefano Mazzocchi" email="stefano@apache.org"/>
       </authors>
  @@ -40,7 +40,7 @@
   </p>
   
   <p>
  -I'll explain you what the @docname@ project is about and what we are
  +I'll explain you what the Cocoon project is about and what we are
   doing to solve the problems that we encountered in our web engineering
   experiences, but from an executive perspective, yes, because we all had
   the problems of managing a web site, dealing with our colleagues, rushing
  @@ -330,7 +330,7 @@
   </p>
   
   <p>
  -@docname@ 1.0 did exactly this.
  +Apache Cocoon 1.0 did exactly this.
   </p>
   
       </s1>
  @@ -340,9 +340,9 @@
   <p>
   If XML is a lingua franca, it means that XML software can work on almost
   anything without caring about what it is. So, if a cell phone requests
  -the page, @docname@ just has to change transformation rules and send the
  +the page, Cocoon just has to change transformation rules and send the
   WAP page to the phone. Or, if you want a nice PDF to printout your
  -monthly report, you change the transformation rules and @docname@ creates
  +monthly report, you change the transformation rules and Cocoon creates
   the PDF for you, or the VRML, or the VoiceML, or your own proprietary
   B2B markup.
   </p>
  @@ -357,14 +357,14 @@
       <s1 title="Separation of Concerns (SoC)">
   
   <p>
  -@docname@ was not the first product to perform server side XML
  +Cocoon was not the first product to perform server side XML
   transformations, nor will be the last one (in a few years, these
   solutions will be the rule rather than the exception). What is the
  -"plus" that the @docname@ project adds?
  +"plus" that the Cocoon project adds?
   </p>
   
   <p>
  -I believe the most important @docname@ feature is SoC-based design.
  +I believe the most important Cocoon feature is SoC-based design.
   </p>
   
   <p>
  @@ -380,15 +380,15 @@
   </p>
   
   <p>
  -For a web publishing system, the @docname@ project uses what we call the
  +For a web publishing system, the Cocoon project uses what we call the
   "pyramid of contacts" which outlines four major concern areas and five
   contracts between them. Here is the picture:
   </p>
   
  -<figure src="images/pyramid-model.gif" alt="The @doctitle@ Pyramid Model of Contracts"/>
  +<figure src="images/pyramid-model.gif" alt="The Cocoon Pyramid Model of Contracts"/>
   
   <p>
  -@docname@ is "engineered" to provide you a way to isolate these four
  +Cocoon is "engineered" to provide you a way to isolate these four
   concern areas using just those 5 contracts, removing the contract
   between style and logic that has been bugging web site development since
   the beginning of the web.
  @@ -398,7 +398,7 @@
   Why? because programmers and graphic people have very different skills
   and work habits... so, instead of creating GUIs to hide the things that
   can be harmful (like graphic to programmers or logic to designers),
  -@docname@ allows you to separate the things into different files, allowing
  +Cocoon allows you to separate the things into different files, allowing
   you to "seal" your working groups into separate virtual rooms connected
   with the other rooms only by those "pipes" (the contracts), that you
   give them from the management area.
  @@ -458,17 +458,17 @@
   </p>
   
   <p>
  -With the @docname@ architecture all this is a couple of line changes away.
  +With the Cocoon architecture all this is a couple of line changes away.
   </p>
   
       </s1>
   
  -    <s1 title="The @docname@ innovations">
  +    <s1 title="The Cocoon innovations">
   
   <p>
   The technologies defined in the XML model are the base of everything,
   but many technologies and solutions were designed specifically for the
  -@docname@ project:
  +Cocoon project:
   </p>
   
   <ul>
  @@ -492,8 +492,8 @@
   This means that you can implement the tags using your favorite language,
   without having to force your programmers to use a specific programming
   language. At the time of writing, only the Java programming language is
  -implemented (being @docname@ written in Java), but it's easy to picture
  -development of other language hooks for XSP once @docname@ receives more
  +implemented (being Cocoon written in Java), but it's easy to picture
  +development of other language hooks for XSP once Cocoon receives more
   attention.
   </p>
   
  @@ -593,7 +593,7 @@
       <s1 title="The Resource View concept">
   
         <p>
  -	The third big innovation of the @docname@ project is the notion of
  +	The third big innovation of the Cocoon project is the notion of
   	"resource views". It's kind of an abstract concept so I'd like
   	to start with an example to explain the problem.
         </p>
  @@ -653,7 +653,7 @@
   </p>
   
   <p>
  -The problem is that all other publishing systems except @docname@ "hide"
  +The problem is that all other publishing systems except Cocoon "hide"
   this information inside the system, there is no standard way to "ask"
   for the original RDF-ized semantic content of the requested resource.
   </p>
  @@ -663,7 +663,7 @@
   </p>
   
   <p>
  -In @docname@ you can define "views" for each resource or group of
  +In Cocoon you can define "views" for each resource or group of
   resources: you can ask for the "content" view, or for the "schema" view
   (that returns you the structure of the document and the information to
   validate it), the "link" view that returns you the pages that are
  @@ -676,17 +676,17 @@
   </p>
   
   <p>
  -@docname@ itself uses the view for its batch mode: it performs as a crawler
  +Cocoon itself uses the view for its batch mode: it performs as a crawler
   and saves a snapshot of the site on disk, useful for creating offline
   documentation or CD-ROM snapshots of dynamic web sites.
   </p>
   
       </s1>
   
  -    <s1 title="@docname@ present">
  +    <s1 title="Cocoon present">
   
   <p>
  -The @docname@ project is currently discussing new features such as "content
  +The Cocoon project is currently discussing new features such as "content
   aggregation" that would simplify the creation of portal-like sites where
   content is aggregated from different sources into the same page.
   </p>
  @@ -696,10 +696,10 @@
   </p>
   
       </s1>
  -    <s1 title="@docname@ future">
  +    <s1 title="Cocoon future">
   
   <p>
  -In the future, @docname@ will provide local semantic searching capabilities
  +In the future, Cocoon will provide local semantic searching capabilities
   allowing you to gain immediate advantage of the time invested in
   creating highly semantic content for your site.
   </p>
  @@ -708,7 +708,7 @@
   I believe this is the only way to convince people to invest time and
   resources into creating a better content model for their local
   information. We still don't have any idea on how this will happen or how
  -it will work, but I believe the @docname@ project has a major role in the
  +it will work, but I believe the Cocoon project has a major role in the
   promotion of the next web generation and semantic searching is a big
   part of it.
   </p>
  @@ -718,7 +718,7 @@
   </p>
   
   <p>
  -A further future goal is to allow @docname@ to exchange semantic indexing
  +A further future goal is to allow Cocoon to exchange semantic indexing
   information in a Peer2Peer way to create a decentralized semantic search
   engine... (even if there are big protocol scalability problems to
   solve). Consider this high steam vaporware, but I believe that it will
  @@ -734,7 +734,7 @@
   <p>
   If you reached this far by reading all sections, I was successful in
   getting your attention and I think you are able to both understand the
  -importance of the @docname@ Project and distinguish most of the marketing
  +importance of the Cocoon Project and distinguish most of the marketing
   hype that surrounds XML and friends.
   </p>
   
  @@ -745,7 +745,7 @@
   </p>
   
   <p>
  -@docname@ uses XML as a core piece of its framework, but improves the model
  +Cocoon uses XML as a core piece of its framework, but improves the model
   to give you the tools you need and is designed to be flexible enough to
   follow your needs as well as paradigm shifts that will happen in the
   future.
  
  
  
  1.1.2.3   +2 -2      xml-cocoon2/documentation/xdocs/esql.xml
  
  Index: esql.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/esql.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- esql.xml	2001/10/23 07:50:30	1.1.2.2
  +++ esql.xml	2001/10/25 07:43:49	1.1.2.3
  @@ -11,7 +11,7 @@
   
       <p>The ESQL logicsheet is an 
   XSP logicsheet that performs sql queries and serializes their 
  -results as XML. This allows you to work with data from a wide variety of different sources when using @docname@.
  +results as XML. This allows you to work with data from a wide variety of different sources when using Apache Cocoon.
   </p>
   
       <p>It has a number of important advantages over the old (deprecated) SQL logicsheet and SQL processor.
  @@ -101,7 +101,7 @@
              <th>Description</th>
             </tr>
             <tr><td>esql:row-results//esql:get-columns</td>
  -          <td>results in a set of elements whose names are the names of the columns. the elements each have one text child, whose value is the value of the column interpreted as a string. No special formatting is allowed here. If you want to mess around with the names of the elements or the value of the text field, use the type-specific get methods and write out the result fragment yourself. For @doctitle@ only, this outputs structured types as well. Here sql-list or sql-set contains several sql-list-item or sql-set-item element that again contain the actual data.</td>
  +          <td>results in a set of elements whose names are the names of the columns. the elements each have one text child, whose value is the value of the column interpreted as a string. No special formatting is allowed here. If you want to mess around with the names of the elements or the value of the text field, use the type-specific get methods and write out the result fragment yourself. For Cocoon 2 only, this outputs structured types as well. Here sql-list or sql-set contains several sql-list-item or sql-set-item element that again contain the actual data.</td>
             </tr>
             <tr><td>esql:row-results//esql:get-string</td>
             <td>returns the value of the given column as a string</td>
  
  
  
  1.1.2.2   +4 -4      xml-cocoon2/documentation/xdocs/extending.xml
  
  Index: extending.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/extending.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- extending.xml	2001/10/05 09:31:12	1.1.2.1
  +++ extending.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
   	<header>
  -		<title>Extending @doctitle@</title>
  +		<title>Extending Apache Cocoon</title>
   		<version>0.1</version>
   		<type>Technical document</type>
   		<authors>
  @@ -12,7 +12,7 @@
   	</header>
   	<body>
   		<s1 title="Introduction">
  -			<p>If you want to extend the functionality of @docname@, it may be unclear
  +			<p>If you want to extend the functionality of Apache Cocoon, it may be unclear
   		  how to achieve your goal. This page tries to indicate when to write what, and
   		  to give an overview of what already exists (so you don't duplicate other's
   		  efforts).</p>
  @@ -59,7 +59,7 @@
   			 This one is responsible for making your XSP pages work.</li>
   				<li>
   					<code>StatusGenerator</code> - Generates an XML representation of
  -			 the current status of @docname@. This can be considered "for administration use",
  +			 the current status of Cocoon. This can be considered "for administration use",
   			 i.e. your application probably won't deal with this one.</li>
   			</ul>
   			<p>All these classes are in the <code>org.apache.cocoon.generation</code>
  @@ -166,7 +166,7 @@
   		</s1>
   		<s1 title="About Action">
   			<p>[FIXME: We have to wait until we can see what is going to happen here. Also, I wonder if this belongs here or should deserve a separate page.]</p>
  -			<p>The Action part will be used for making @docname@ able to react on form input. This will make @docname@ no longer a simple basis for web publishing, but will make it apt for web interaction as well.</p>
  +			<p>The Action part will be used for making Cocoon able to react on form input. This will make Cocoon no longer a simple basis for web publishing, but will make it apt for web interaction as well.</p>
   		</s1>
   		<s1 title="About XSP">
   			<anchor id="xsp"/>
  
  
  
  1.1.2.2   +29 -29    xml-cocoon2/documentation/xdocs/faq.xml
  
  Index: faq.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/faq.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- faq.xml	2001/10/05 09:31:12	1.1.2.1
  +++ faq.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -29,11 +29,11 @@
   </faq>
   <faq>
     <question>
  -    Why does @docname@ take so long to start?
  +    Why does Cocoon take so long to start?
     </question>
     <answer>
       <p>
  -      @docname@ compiles sitemaps into java classes to increase runtime performance,
  +      Cocoon compiles sitemaps into java classes to increase runtime performance,
         this is done only at startup and only if the sitemap file is modified, for 
         all the other requests the compiled sitemap is executed. See question #7 
         for information on how to pre-compile the sitemap and the XSP's.
  @@ -60,7 +60,7 @@
     </question>
     <answer>
       <p>
  -      @docname@ requires a JAXP 1.1 compliant parser. Recent servlet engines
  +      Cocoon requires a JAXP 1.1 compliant parser. Recent servlet engines
         (like Tomcat 3.2.1) use older xml parsers. You have to replace the xml
         parser with a newer one (e.g. the Xerces 1.3.0).
       </p>
  @@ -78,15 +78,15 @@
     </question>
     <answer>
       <p>
  -      Contact the @docname@ Users mail list (cocoon-users@xml.apache.org).
  +      Contact the Cocoon Users mail list (cocoon-users@xml.apache.org).
         Please, do not contact developers directly for help since the user list are
         normally much more responsive and users normally have more experience in
         solving installation problems than developers do.
       </p>
       <p>
  -      @docname@ has a log file that is stored in the context where you placed
  -      @docname@.  It is located in '{cocoon}/WEB-INF/logs/cocoon/log' where
  -      {cocoon} is the context where @docname@ is installed.  Many times, the
  +      Cocoon has a log file that is stored in the context where you placed
  +      Cocoon.  It is located in '{cocoon}/WEB-INF/logs/cocoon/log' where
  +      {cocoon} is the context where Cocoon is installed.  Many times, the
         information contained in that file will help others help you.
       </p>
     </answer>
  @@ -160,7 +160,7 @@
   </faq>
   <faq>
    <question>
  -   @docname@ won't start and I get a &quot;java.lang.NoSuchMethodError: org.apache.log.LogKit: method
  +   Cocoon won't start and I get a &quot;java.lang.NoSuchMethodError: org.apache.log.LogKit: method
      createLogger(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/apache/log/Logger;
      not found&quot; in my Servlet Container's log.
    </question>
  @@ -170,21 +170,21 @@
        distribution.
      </p>
      <p>
  -     Even better, if you build @docname@ with "build -Dinclude.webapp.libs webapp" then
  -     @docname@ will create a complete WAR file for you with all necessary libraries.
  +     Even better, if you build Cocoon with "build -Dinclude.webapp.libs webapp" then
  +     Cocoon will create a complete WAR file for you with all necessary libraries.
      </p>
    </answer>
   </faq>
   <faq>
    <question>
  -   @docname@ still won't start, this time I get 
  +   Cocoon still won't start, this time I get 
   javax.xml.transform.TransformerConfigurationException: Namespace not supported by SAXParser
  -   in the @docname@ log file.
  +   in the Cocoon log file.
    </question>
    <answer>
      <p>
        This is a classloader issue with Tomcat and some other Servlet Engines.  Basically
  -     it means that the Xerces library included with @docname@ is not being found.  The solution
  +     it means that the Xerces library included with Cocoon is not being found.  The solution
        is to place the Xerces library first in the classpath.
      </p>
    </answer>
  @@ -318,7 +318,7 @@
    <question>I want to use the XXX matcher/serializer/selecter/etc but there's no
      examples :(</question>
    <answer>
  -   <p>If you've checked the sample webapps which come with @docname@, and you've
  +   <p>If you've checked the sample webapps which come with Cocoon, and you've
        looked in the documentation (which does exist!) check both the user and
        dev archives.  If it hasn't been resolved before <strong>first</strong>
        email the user group and, after a <strong>reasonable</strong> (ie 1 or 2
  @@ -372,11 +372,11 @@
    </answer>
   </faq>
   <faq>
  -  <question>When I add an action to a pipeline @docname@ returns an
  +  <question>When I add an action to a pipeline Cocoon returns an
     error.</question>
     <answer>
     <p>Before the action was added to the pipeline it worked fine. After
  -  the change @docname@ seems not to find the file specified in the
  +  the change Cocoon seems not to find the file specified in the
     variable that is returned by the matcher.</p>
   <source>
   <![CDATA[
  @@ -398,22 +398,22 @@
     </answer>
   </faq>
   <faq>
  - <question>How could I have my @docname@app in an URI other than
  + <question>How could I have my Cocoon app in an URI other than
      &lt;you-server&gt;/cocoon/&lt;my-app&gt;?
    </question>
    <answer>
  -   <note> This entry refers only to an Apache + Tomcat + @docname@ configuration,
  -     and was tested under: Windows NT 4.0 + Apache 1.3.14 + Tomcat 3.2 + @docname@
  +   <note> This entry refers only to an Apache + Tomcat + Cocoon configuration,
  +     and was tested under: Windows NT 4.0 + Apache 1.3.14 + Tomcat 3.2 + Cocoon
        2.0b1.
      </note>
      <p>Test whether Tomcat passes everything under the /cocoon context to
  -     @docname@. This may be tested by pointing your browser at
  +     Cocoon. This may be tested by pointing your browser at
        &lt;your-server&gt;:8080/cocoon/xsp/simple, if a text page named
        "A simple XSP page", everything's fine.
      </p>
      <p>Now, suppose:</p>
      <ol>
  -     <li>you have a @docname@ application named "foo" which works fine when
  +     <li>you have a Cocoon application named "foo" which works fine when
          called with &lt;your-server&gt;:8080/cocoon/foo
        </li>
        <li>you want the "foo" app to be called from
  @@ -465,12 +465,12 @@
    </answer>
   </faq>
   <faq>
  - <question>How could I have my @docname@ app in a directory other than
  + <question>How could I have my Cocoon app in a directory other than
      $TOMCAT_HOME/webapps/cocoon/&lt;my-app&gt;?
    </question>
    <answer>
  -   <note>This entry refers only to an Apache + Tomcat + @docname@ configuration,
  -     and was tested under: Windows NT 4.0 + Apache 1.3.14 + Tomcat 3.2 + @docname@
  +   <note>This entry refers only to an Apache + Tomcat + Cocoon configuration,
  +     and was tested under: Windows NT 4.0 + Apache 1.3.14 + Tomcat 3.2 + Cocoon
        2.0b1.
      </note>
      <p>Let's suppose the following:</p>
  @@ -494,7 +494,7 @@
   </map:pipeline>
      ]]>
      </source>
  -   <p>The "file:" type of source forces @docname@ to search the sub-sitemap under
  +   <p>The "file:" type of source forces Cocoon to search the sub-sitemap under
        the specified directory (which happens to be "c:\foo", since this is a
        Windows system).
      </p>
  @@ -506,7 +506,7 @@
   </faq>
   <faq>
     <question>
  -    How do i integrate Apache Server and @docname@?
  +    How do i integrate Apache Server and Cocoon?
     </question>
     <answer>
       <p>
  @@ -571,7 +571,7 @@
       </source>
       <note>
       This did not work in my case (Slackware Linux with Apache1.3, 
  -    tomcat3.2.2, @docname@). Again, these RewriteRules may vary somewhat 
  +    tomcat3.2.2, Cocoon). Again, these RewriteRules may vary somewhat 
       depending on the local settings. You may have to experiment a bit.
       </note>
       <p>
  @@ -598,7 +598,7 @@
   </faq>
   <faq>
     <question>
  -    How can I run @docname@ without X11. Why is a Display needed? 
  +    How can I run Cocoon without X11. Why is a Display needed? 
     </question>
     <answer>
       <p>
  @@ -619,7 +619,7 @@
   </faq>
   <faq>
     <question>
  -  How do i debug @docname@ using JDK1.3+?
  +  How do i debug Cocoon using JDK1.3+?
     </question>
     <answer>
       <p>
  
  
  
  1.1.2.2   +9 -9      xml-cocoon2/documentation/xdocs/hosting.xml
  
  Index: hosting.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/hosting.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- hosting.xml	2001/10/05 09:31:12	1.1.2.1
  +++ hosting.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -  <title>@docname@ Hosting</title>
  +  <title>Cocoon Hosting</title>
     <authors>
      <person name="Robin Green" email="greenrd@hotmail.com"/>
     </authors>
  @@ -11,28 +11,28 @@
   
    <body>
   
  - <s1 title="@docname@ Hosting">
  + <s1 title="Cocoon Hosting">
     <p>
  -   Here is a list of sites that provide @docname@ web hosting, and which versions are
  +   Here is a list of sites that provide Apache Cocoon web hosting, and which versions are
      provided (if known). Version information may not be up-to-date on this list, so
      always check with the site itself to make sure.
     </p>
   
     <p>
  -   To add your site to this list - you must have @docname@ up and running and be
  +   To add your site to this list - you must have Cocoon up and running and be
      accepting application forms! - send an email to cocoon-users@xml.apache.org.
     </p>
   
     <ul>
  -   <li><link href="http://www.aoindustries.com/">AO Industries</link> - @docname@ 1.8.</li>
  +   <li><link href="http://www.aoindustries.com/">AO Industries</link> - Cocoon 1.8.</li>
      <li><link href="http://webartists.net/webhosting.html">Webartists</link> (German)</li>
  -   <li><link href="http://www.capital-internet.net/">Capital Internet</link> - @docname@ 1.8</li>
  +   <li><link href="http://www.capital-internet.net/">Capital Internet</link> - Cocoon 1.8</li>
      <li><strong>[FREE]</strong> -
       <link href="http://dev.startcom.org/">MediaHost Free Developer Accounts</link> - 
  -     @docname@ 1.8</li>
  +     Cocoon 1.8</li>
      <li><link href="http://www.mmaweb.net/">Motivational Marketing Associates, Inc</link> -
  -     @docname@ 1.7.4</li>
  -   <li><link href="http://www.spilkalideriv.kiev.ua/">www.spilkalideriv.kiev.ua</link> - @docname@ 1.8</li>
  +     Cocoon 1.7.4</li>
  +   <li><link href="http://www.spilkalideriv.kiev.ua/">www.spilkalideriv.kiev.ua</link> - Cocoon 1.8</li>
     </ul>
   
    </s1>
  
  
  
  1.1.2.2   +14 -15    xml-cocoon2/documentation/xdocs/httprequest.xml
  
  Index: httprequest.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/httprequest.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- httprequest.xml	2001/10/05 09:31:12	1.1.2.1
  +++ httprequest.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,22 +3,21 @@
   
   <document> 
     <header> 
  -	 <title>@doctitle@</title>
  -	 <subtitle>What happens if a http request arrives</subtitle> 
  +	 <title>Request Processing</title>
   	 <version>0.1</version> 
   	 <type>Technical Document</type> 
   	 <authors><person name="Tom Klaasen" email="tom.klaasen@the-ecorp.com"/> 
   	 </authors> 
  -	 <abstract>This document tries to explain @docname@ (based on the version
  +	 <abstract>This document tries to explain Cocoon (based on the version
   		@version@) technically. We do this by describing what happens if somebody types in
  -		the URL of a simple @docname@ page.</abstract>
  +		the URL of a simple Cocoon page.</abstract>
     </header>
     <body>
   	 <s1 title="Introduction">
   		<s2 title="Goal">
  -		  <p>This document tries to explain @docname@ (based on the version @version@)
  +		  <p>This document tries to explain Apache Cocoon (based on the version @version@)
   			 technically. We do this by describing what happens if somebody types in the URL
  -			 of a simple @docname@ page.</p> 
  +			 of a simple Cocoon page.</p> 
   		</s2> 
   		<s2 title="Intended public"> 
   		  <p>The reader should have a knowledge of:</p> 
  @@ -32,14 +31,14 @@
   	 </s1> 
   	 <s1 title="The configuration assumptions"> 
   		<p>The sequence of events described in this document, depends on some
  -		  assumptions with regard to the configuration of @docname@. That's what's described
  +		  assumptions with regard to the configuration of Cocoon. That's what's described
   		  here.</p>
   		<s2 title="sitemap.xmap">
  -		  <p>The task of the sitemap is to define the pipelines that @docname@ will
  +		  <p>The task of the sitemap is to define the pipelines that Cocoon will
   			 apply to URI's called in one's browser.</p>
   		  <p>This is the minimal sitemap that is necessary. The lines here are
   			 included in the standard sitemap.xmap that comes with the distribution of
  -			 @docname@ @version@.</p>
  +			 Cocoon @version@.</p>
   		  <p>The sitemap is defined in <code>${cocoon}/sitemap.xmap</code>.</p> 
   		  <source><![CDATA[ 
   <?xml version="1.0"?>
  @@ -99,7 +98,7 @@
   		  <p><code>cocoon.xconf</code> is the file that defines the
   			 <link href="avalon.html">Avalon</link> Components.</p>
   		  <p>For our study, we need the standard <code>cocoon.xconf</code> file
  -			 of @docname@ @version@.</p>
  +			 of Cocoon @version@.</p>
   		  <p>It can be found in <code>${cocoon}/cocoon.xconf</code>.</p> 
   		  <source><![CDATA[
   <?xml version="1.0"?>
  @@ -203,13 +202,13 @@
   		  <s3 title="Overview"> 
   			 <p>The steps that happen on initialization, are:</p> 
   			 <s4 title="Find the classpath"> 
  -				<p>@docname@ needs to know the classpath for compilation of the files
  +				<p>Cocoon needs to know the classpath for compilation of the files
   				  it generates itself. This is where the classpath is stored.</p> 
   			 </s4> 
   			 <s4 title="Find the init file"> 
   				<p>The init file (normally <code>cocoon.xconf</code>, as defined in
   				  <code>${cocoon}/WEB-INF/web.xml</code>) contains the necessary information for
  -				  @docname@ to decide which classes to use for which roles (refer to
  +				  Cocoon to decide which classes to use for which roles (refer to
   				  <link href="avalon.html">Avalon</link>).</p>
   				<p>This is a feature that is added for increased configurability.
   				  If you were developing a one time solution, the information in this file would
  @@ -225,11 +224,11 @@
   				<p>The handling of <code>cocoon.xconf</code> goes as follows:</p> 
   				<ol> 
   				  <li>Get the parser: This is something necessary for
  -					 bootstrapping: cocoon.xconf contains the parser to be used by @docname@, but
  -					 cocoon.xconf is an xml file that has to be parsed itself. That's why @docname@
  +					 bootstrapping: cocoon.xconf contains the parser to be used by Cocoon, but
  +					 cocoon.xconf is an xml file that has to be parsed itself. That's why Cocoon
   					 gets a default parser out of the System properties (this refers to the
   					 environment variable <code>$org.apache.cocoon.components.parser.Parser</code>
  -					 of the OS). If no parser is defined in the environment, @docname@ will use
  +					 of the OS). If no parser is defined in the environment, Cocoon will use
   					 <code>org.apache.cocoon.components.parser.JaxpParser</code> (a hard-coded
   					 default).</li> 
   				  <li>Get the components: Cocoon uses roles (refer to
  
  
  
  1.1.2.2   +37 -37    xml-cocoon2/documentation/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/index.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- index.xml	2001/10/05 09:31:12	1.1.2.1
  +++ index.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -  <title>@doctitle@</title>
  +  <title>Apache Cocoon</title>
     <subtitle>XML Publishing Framework</subtitle>
     <authors>
      <person name="Stefano Mazzocchi" email="stefano@apache.org"/>
  @@ -14,16 +14,16 @@
    <s1 title="What is it?">
   
     <p>
  -   @doctitle@ is a complete rewrite of the @docname@ XML publishing framework that
  +   Apache Cocoon is a complete rewrite of the Apache Cocoon XML publishing framework that
      is supposed to remove all those design constraint that emerged from the
  -   @docname@ 1 experience.
  +   Cocoon 1 experience.
     </p>
   
     <p>
      This documentation is alpha, like anything else, so don't expect
      that much. If you are not a developer and you are not willing to test
      new stuff that may not work as expected, we suggest you to refer to the latest
  -   @docname@ 1 release which is very stable.
  +   Cocoon 1 release which is very stable.
     </p>
   
     <p>
  @@ -32,14 +32,14 @@
    </s1>
   
    <s1 title="A new look">
  -  <p>The @docname@ Project will evidence its new course with a new logo that was
  +  <p>The Cocoon Project will evidence its new course with a new logo that was
     designed by Cocoon's creator Stefano Mazzocchi. Here it is:</p>
   
  -  <figure src="images/cocoon2.gif" alt="The new @docname@ Logo"/>
  +  <figure src="images/cocoon2.gif" alt="The new Cocoon Logo"/>
    </s1>
   
    <s1 title="Introduction">
  -  <p>The @docname@ Project has gone a long way since its creation on
  +  <p>The Cocoon Project has gone a long way since its creation on
     January 1999. It started as a simple servlet for static XSL styling and became
     more and more powerful as new features were added. Unfortunately, design
     decisions made early in the project influenced its evolution. Today, some of
  @@ -47,7 +47,7 @@
     solidified. For this reason, those design decisions need to be reconsidered
     under this new light.</p>
   
  -  <p>While @docname@ started as a small step in the direction of a new
  +  <p>While Cocoon started as a small step in the direction of a new
     web publishing idea based on better design patterns and reviewed estimations
     of management issues, the technology used was not mature enough for tools to
     emerge. Today, most web engineers consider XML as the key for an improved web
  @@ -61,22 +61,22 @@
   
    <s1 title="Passive APIs vs. Active APIs">
     <p>Web serving environments must be fast and scalable to be
  -  useful. @docname@ 1 was born as a &quot;proof of concept&quot; rather than
  +  useful. Cocoon 1 was born as a &quot;proof of concept&quot; rather than
     production software and had significant design restrictions, based mainly on
     the availability of freely redistributable tools. Other issues were lack of
     detailed knowledge on the APIs available as well as underestimation of the
     project success, being created as a way to learn XSL rather than a full
     publishing system capable of taking care of all XML web publishing needs.</p>
   
  -  <p>For the above reasons, @docname@ 1 was based on the DOM level 1
  +  <p>For the above reasons, Cocoon 1 was based on the DOM level 1
     API which is a <em>passive</em> API and was intended mainly for client side
     operation. This is mainly due to the fact that most DOM
     implementations require the document to reside in memory. While this is
     practical for small documents and thus good for the &quot;proof of
  -  concept&quot; stage, it is now considered a main design constraint for @docname@
  +  concept&quot; stage, it is now considered a main design constraint for Cocoon
     scalability.</p>
   
  -  <p>Since the goal of @docname@ 2 is the ability to process
  +  <p>Since the goal of Cocoon 2 is the ability to process
     simultaneously multiple 100Mb documents in JVM with a few Mbs of heap size,
     careful memory use and tuning of internal components is a key issue. To reach
     this goal, an improved API model was needed. This is now identified in the SAX
  @@ -103,7 +103,7 @@
       <dt>Lowered memory consumption</dt>
       <dd>
         Since most of the
  -      server processing required in @docname@ is incremental, an incremental model
  +      server processing required in Cocoon is incremental, an incremental model
         allows XML production events to be transformed directly into output events
         and character written on streams, thus avoiding the need to store them in
         memory.
  @@ -136,19 +136,19 @@
       </dd>
     </dl>
   
  -  <p>The above points alone would be enough for the @doctitle@
  +  <p>The above points alone would be enough for the Cocoon
     paradigm shift, even if this event based model impacts not only the general
     architecture of the publishing system but also its internal processing
     components such as XSLT processing and PDF formatting. These components will
     require substantial work and maybe design reconsideration to be able to follow
  -  a pure event-based model. The @docname@ Project will work closely with the other
  +  a pure event-based model. The Cocoon Project will work closely with the other
     component projects to be able to influence their operation in this direction.</p>
   </s1>
   
   <s1 title="Reactors Reconsidered">
     <p>Another design choice that should be revised is the reactor
     pattern that was introduced to allow components to be connected in more
  -  flexible way. In fact, by contrast to the fixed pipe model used up to @docname@
  +  flexible way. In fact, by contrast to the fixed pipe model used up to Cocoon
     1.3.1, the reactor approach allows components to be dynamically connected,
     depending on reaction instructions introduced inside the documents.</p>
   
  @@ -186,15 +186,15 @@
     (that based their improved site structure on internal contracts).</p>
   
     <p>The simplification and engineering of web site management is
  -  considered one of the most important @doctitle@ goals. This is done mainly by
  +  considered one of the most important Cocoon goals. This is done mainly by
     technologically imposing a reduced number of contracts and placing them in a
     hierarchical shape, suitable for replacing current high-structure web site
     management models.</p>
   
  -  <p>The model that @doctitle@ adopts is the &quot;pyramid model of
  +  <p>The model that Cocoon adopts is the &quot;pyramid model of
     web contracts&quot; which is outlined in the picture below</p>
   
  -  <figure src="images/pyramid-model.gif" alt="The @doctitle@ Pyramid Model of Contracts"/>
  +  <figure src="images/pyramid-model.gif" alt="The Cocoon Pyramid Model of Contracts"/>
   
     <p>and is composed by four different working contexts (the rectangles)</p>
   
  @@ -232,7 +232,7 @@
       <li>content - style</li>
     </ul>
   
  -  <p>Note that there is no <em>logic - style</em> contract. @doctitle@ aims to
  +  <p>Note that there is no <em>logic - style</em> contract. Cocoon aims to
     provide both software and guidelines to allow you to remove such a
     contract.</p>
   </s1>
  @@ -243,18 +243,18 @@
     point. For example, if the W3C-recommended method to link stylesheets to XML
     documents is used, the content and style contexts overlap and it's impossible
     to change the styling behavior of the document without changing it. The same
  -  is true for the processing instructions used by the @docname@ 1 reactor to drive
  +  is true for the processing instructions used by the Cocoon 1 reactor to drive
     the page processing: each stage specifies the next stage to determine the result,
     thus increasing management and debugging complexity. Another overlapping in
     context contracts is the need for URL-encoded parameters to drive the page output.
     These overlaps break the pyramid model and increase the management costs.</p>
   
  -  <p>In @doctitle@, the reactor pattern will be abandoned in favor of
  +  <p>In Cocoon, the reactor pattern will be abandoned in favor of
     a pipeline mapping technique. This is based on the fact that the number of
     different contracts is limited even for big sites and grows with a rate
     that is normally much less than its size.</p>
   
  -  <p>Also, for performance reasons, @doctitle@ will try to compile
  +  <p>Also, for performance reasons, Cocoon will try to compile
     everything that is possibly compilable (pages/XSP into generators, stylesheets
     into transformers, etc...) so, in this new model, the <em>processing chain</em>
     that generates the page contains (in a direct executable form) all the
  @@ -262,19 +262,19 @@
     response.</p>
   
     <p>This means that instead of using event-driven request-time DTD interpretation
  -  (done in all @docname@ 1 processors), these will be either compiled into transformers
  +  (done in all Cocoon 1 processors), these will be either compiled into transformers
     directly (XSLT stylesheet compilation) or compiled into generators using
     logicsheets and XSP which will remove totally the need for request-time
     interpretation solutions like DCP that will be removed.</p>
   
  -  <note>Some of these features are already present in latest @docname@ 1.x
  -   releases but the @docname@ 2 architecture will make them central to its new
  +  <note>Some of these features are already present in latest Cocoon 1.x
  +   releases but the Cocoon 2 architecture will make them central to its new
      core.</note>
   </s1>
   
   <s1 title="Sitemap">
  -  <p>In @docname@ 2 terminology, a <em>sitemap</em> is the collection of pipeline
  -  matching informations that allow the @docname@ engine to associate the requested
  +  <p>In Cocoon 2 terminology, a <em>sitemap</em> is the collection of pipeline
  +  matching informations that allow the Cocoon engine to associate the requested
     URI to the proper response-producing pipeline.</p>
   
     <p>The sitemap physically represents the central repository for web site
  @@ -286,27 +286,27 @@
   </s1>
   
   <s1 title="Pre-compilation, Pre-generation and Caching">
  -  <p>The cache system in @docname@ 1 will be ported with very little
  +  <p>The cache system in Cocoon 1 will be ported with very little
     design changes since it's very flexible and was not polluted by early design
     constraints since it appeared in later versions. The issue regarding static
     file caching that, no matter what, will always be slower than direct web server
  -  caching, means that @docname@ 2 will be as <em>proxy friendly</em> as possible.</p>
  +  caching, means that Cocoon 2 will be as <em>proxy friendly</em> as possible.</p>
   
     <p>To be able to put most of the static part of the job back on the web
  -  server (where it belongs), @docname@ 2 will greatly improve its command line
  +  server (where it belongs), Cocoon 2 will greatly improve its command line
     operation, allowing the creation of <em>site makefiles</em> that will
     automatically scan the web site and the source documents and will provide a
     way to <em>regenerate</em> the static part of a web site (images and tables
     included!) based on the same XML model used in the dynamic operation version.</p>
   
  -  <p>@docname@ 2 will, in fact, be the integration between @docname@ 1 and Stylebook.</p>
  +  <p>Cocoon 2 will, in fact, be the integration between Cocoon 1 and Stylebook.</p>
   
     <p>It will be up to the web server administrator to use static
     regeneration capabilities on a time basis, manually or triggered by some
  -  particular event (e.g. database update signal) since @docname@ 2 will only provide
  +  particular event (e.g. database update signal) since Cocoon 2 will only provide
     servlet and command line capabilities. The nice integration is based on the
     fact that there will be no behavioral difference if the files are dynamically
  -  generated in @docname@ 2 via the servlet operation and cached internally or
  +  generated in Cocoon 2 via the servlet operation and cached internally or
     pre-generated and served directly by the web server, as long as URI contracts
     are kept the same by the system administrator (via URL-rewriting or aliasing)</p>
   
  @@ -316,7 +316,7 @@
   </s1>
   
   <s1 title="Development Status">
  -  <p>@docname@ 2 development has reached "beta quality"
  +  <p>Cocoon 2 development has reached "beta quality"
     You might take a look at it on the <em>xml-cocoon2</em>
     CVS module. If you are not a CVS expert, this means
     typing:</p>
  @@ -330,10 +330,10 @@
     </source>
     <p><sub>(Windows users: Do not enter the '\' symbol, continue typing on the same line.)</sub></p>
     <p>For more information on CVS access, refer to the CVS docs on this web site.</p>
  -  <note>To get the current version of @docname@ 2 you have to checkout the
  +  <note>To get the current version of Cocoon 2 you have to checkout the
           branch called cocoon_20_branch. The HEAD of the cvs repository is used
           for the developer team to store and test new ideas which will be
  -        perhaps included in later releases of @docname@ 2.</note>
  +        perhaps included in later releases of Cocoon 2.</note>
   </s1>
   
    </body>
  
  
  
  1.1.2.2   +53 -53    xml-cocoon2/documentation/xdocs/installing.xml
  
  Index: installing.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/installing.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- installing.xml	2001/10/05 09:31:12	1.1.2.1
  +++ installing.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -   <title>Installing @doctitle@</title>
  +   <title>Installing Apache Cocoon</title>
      <authors>
        <person name="Stefano Mazzocchi" email="stefano@apache.org"/>
        <person name="Giacomo Pati" email="Giacomo.Pati@pwr.ch"/>
  @@ -17,12 +17,12 @@
   
    <s1 title="System Requirements">
     <p>
  -   @doctitle@ requires the following systems to be already installed in your system:
  +   Apache Cocoon requires the following systems to be already installed in your system:
     </p>
   
     <p><strong>Java Virtual Machine</strong>
       A Java 1.2 or later compatible virtual machine must be present for both
  -    command line and servlet type usage of @docname@. Note that all servlet engines
  +    command line and servlet type usage of Apache Cocoon. Note that all servlet engines
       require a JVM to run so if you are already using servlets you already have
       one installed.
      </p>
  @@ -41,16 +41,16 @@
    </s1>
   
   
  -    <s1 title="Getting Apache @doctitle@">
  +    <s1 title="Getting Apache Cocoon">
         <p>
  -       You have two choices for getting @doctitle@: you can either download
  +       You have two choices for getting Cocoon: you can either download
          a stable relese or you can get the latest in development version
          directly from the cvs repository.
         </p>      
         <s2 title="Download a distribution">
          <p>
           You can simply download the latest official release from the
  -        <link href="http://xml.apache.org/dist/cocoon2">@docname@ distribution</link>
  +        <link href="http://xml.apache.org/dist/cocoon2">Cocoon distribution</link>
           directory.
          </p>
         </s2>
  @@ -79,7 +79,7 @@
               window;</li>
             <li>Wait until you see "*****CVS exited normally with code 0*****" in the
               log window;</li>
  -          <li>The @docname@ source is now on your harddrive.</li>
  +          <li>The Cocoon source is now on your harddrive.</li>
           </ol>
         </s2>
         <s2 title="Step-by-step cvs instructions for Unix">
  @@ -89,15 +89,15 @@
             <li>When asked for the password: answer "anoncvs".</li>
             <li>Enter "cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic -z3 checkout -r cocoon_20_branch xml-cocoon2". This will create a directory called "xml-cocoon2" where the Cocoon2 source will be stored.</li>
             <li>Wait until cvs has finished.</li>
  -          <li>The @docname@ source is now on your harddrive.</li>
  +          <li>The Cocoon source is now on your harddrive.</li>
           </ol>
  -        <p>In case you want to update your @docname@ source tree to the
  +        <p>In case you want to update your Cocoon source tree to the
             current version, change to the "xml-cocoon2" directory and
             call "cvs -z3 update -d -P".</p>
         </s2>
       </s1>
   
  - <s1 title="Building @doctitle@">
  + <s1 title="Building Cocoon">
   
       <s2 title="Set JAVA_HOME environment variable">
   
  @@ -113,7 +113,7 @@
   
       </s2>
   
  -    <s2 title="Create the @docname@ WAR package">
  +    <s2 title="Create the Cocoon WAR package">
   
         <p>To do this you simply have to type:</p>
   
  @@ -129,7 +129,7 @@
   
       <s2 title="Making the sql examples work out of the box">
        <p>
  -      The sample web application delivered with @docname@ contains some
  +      The sample web application delivered with Cocoon contains some
         examples which require a sql database. To make them work out of
         the box, the hsqldb is included. However, this database needs
         the installation path to work correctly. Using tomcat (see notes
  @@ -151,7 +151,7 @@
       </s2>
       <s2 title="Adding additional components">
        <p>
  -      Some of the components delivered with @docname@ required additional libraries,
  +      Some of the components delivered with Cocoon required additional libraries,
         e.g. the Php generator or the FOP serializer (for more information about
         these components, refer to their documentation).
        </p>
  @@ -159,7 +159,7 @@
         Most of these libraries are already included in the distribution, but some
         have to be downloaded manually. The build task checks whether you have
         the required libraries or not and includes the optional components only
  -      if you have the libraries available when you build @docname@.
  +      if you have the libraries available when you build Cocoon.
        </p>
        <p>
         A library/package is available to the build process when it is located
  @@ -202,12 +202,12 @@
      </tr>
     </table>
        <p><strong>Note:</strong> If you added a library/package, you
  -      need to rebuild @docname@ as described in 'Create the @docname@ WAR package'.
  +      need to rebuild Cocoon as described in 'Create the Cocoon WAR package'.
        </p>
       </s2>
    </s1>
   
  - <s1 title="Installing @docname@">
  + <s1 title="Installing Cocoon">
   
       <p>In most servlet engines, this is just a matter of copying
       the war file in a specific directory and the engine will take
  @@ -216,7 +216,7 @@
       <s2 title="Installing on Tomcat 3.X">
   
         <p>Tomcat currently uses a different version of the XML parser
  -      than @docname@. To get @docname@ to work, you need to perform the
  +      than Cocoon. To get Cocoon to work, you need to perform the
         following steps:</p>
   
         <ol>
  @@ -246,7 +246,7 @@
   
           <li>
             <strong>Copy cocoon/lib/xerces-XXX.jar file to tomcat\lib</strong>
  -          @docname@ will now be able to see and use the correct XML libraries.
  +          Cocoon will now be able to see and use the correct XML libraries.
           </li>
   
           <li>
  @@ -259,12 +259,12 @@
           </li>
   
           <li>
  -          <strong>Start using @docname@</strong>
  +          <strong>Start using Cocoon</strong>
             Access the URI
             <link href="http://localhost:8080/cocoon/">http://localhost:8080/cocoon/</link>
  -          with your favorite browser and start to enjoy the world of @docname@.
  -          Note that the first time you access @docname@, it will take a few
  -          seconds to start, since @docname@ needs to compile parts of itself.
  +          with your favorite browser and start to enjoy the world of Cocoon.
  +          Note that the first time you access Cocoon, it will take a few
  +          seconds to start, since Cocoon needs to compile parts of itself.
           </li>
   
         </ol>
  @@ -273,10 +273,10 @@
   
       <s2 title="Installing on Tomcat 4.X">
   
  -      <p>Note that Tomcat-4.0 beta1 will not work with @doctitle@. You
  +      <p>Note that Tomcat-4.0 beta1 will not work with Cocoon. You
             must use Tomcat-4.0 beta3 or beta7, or a nightly build from
           <link href="http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/">http://jakarta.apache.org/builds/jakarta-tomcat-4.0/nightly/</link>.
  -	Tomcat-4.0 beta7 works with @doctitle@ out of the box.
  +	Tomcat-4.0 beta7 works with Cocoon out of the box.
         </p>
   
         <p>Recent builds of Tomcat 4 have largely solved the xml library problem
  @@ -286,9 +286,9 @@
         (Having said that, I do :-)</p>
   
   
  -      <p>Tomcat 4.0 versions prior to beta7 do not expose the servlet.jar file to @docname@ by default,
  -      so if you use any Tomcat 4.0 versions released earlier than beta7, <strong>before you build the @docname@ webapp</strong> you will need to
  -      add the following to the @docname@ servlet definition in the web.xml file:</p>
  +      <p>Tomcat 4.0 versions prior to beta7 do not expose the servlet.jar file to Cocoon by default,
  +      so if you use any Tomcat 4.0 versions released earlier than beta7, <strong>before you build the Cocoon webapp</strong> you will need to
  +      add the following to the Cocoon servlet definition in the web.xml file:</p>
   
         <source>
     &lt;init-param&gt;
  @@ -302,11 +302,11 @@
   
           <li>
             <strong>Modify cocoon/webapp/WEB-INF/web.xml</strong>
  -          Add the code shown above to the @docname@ web.xml file
  +          Add the code shown above to the Cocoon web.xml file
           </li>
   
           <li>
  -          <strong>Build the @docname@ webapp</strong>
  +          <strong>Build the Cocoon webapp</strong>
             Build the webapp as described above. This will now include
             the corrected web.xml file.
           </li>
  @@ -321,12 +321,12 @@
           </li>
   
           <li>
  -          <strong>Start using @docname@</strong>
  +          <strong>Start using Cocoon</strong>
             Access the URI
             <link href="http://localhost:8080/cocoon/">http://localhost:8080/cocoon/</link>
  -          with your favorite browser and start to enjoy the world of @docname@.
  -          Note that the first time you access @docname@, it will take a few
  -          seconds to start, since @docname@ needs to compile parts of itself.
  +          with your favorite browser and start to enjoy the world of Cocoon.
  +          Note that the first time you access Cocoon, it will take a few
  +          seconds to start, since Cocoon needs to compile parts of itself.
           </li>
   
         </ol>
  @@ -335,7 +335,7 @@
   
       <s2 title="Installing on BEA Weblogic 6.0">
   
  -      <p>This installs @docname@ using the cocoon.war file.  
  +      <p>This installs Cocoon using the cocoon.war file.  
            This was successfully installed under Windows 2000.
            Unix users will need to adjust appropriately. If you haven't done so already, 
            build a domain and a server. In this discussion, the name of the domain 
  @@ -361,10 +361,10 @@
           </li>
   
           <li>
  -            Congratulations! (hopefully) you should see the @docname@ welcome page.
  +            Congratulations! (hopefully) you should see the Cocoon welcome page.
           </li>
         </ol>
  -      <note>If you have problems with starting up @docname@, you can modify the CLASSPATH in the .cmd files and
  +      <note>If you have problems with starting up Cocoon, you can modify the CLASSPATH in the .cmd files and
               ensure that xerces-XXX.jar is picked up before any other jars.
               <br/>
               <code>set CLASSPATH=.;c:\bea\jdk130\jre\lib\xerces-XXX.jar;.\lib\weblogic_sp.jar;.\lib\weblogic.jar</code>
  @@ -374,7 +374,7 @@
   
       <s2 title="Installing on ServletExec 3.1 (In Process with IIS)">
   
  -      <p>This installs @docname@ in a "war" configuration.  This was successfully
  +      <p>This installs Cocoon in a "war" configuration.  This was successfully
            installed under Windows NT 4.0 and IIS 4.  I don't believe that SE is
            available for unix.</p>
   
  @@ -384,20 +384,20 @@
           <li>Install IIS as usual</li>
           <li>Install ServletExec (default paths will be used throughout), but
               don't start it.</li>
  -        <li>Build @docname@'s war file (include lib's)</li>
  +        <li>Build Cocoon's war file (include lib's)</li>
           <li>Copy <em>cocoon.war</em> into 
               <em>C:\Program Files\New Atlanta\ServletExec ISAPI\webapps\default</em>,
               creating the directory default if required.</li>
           <li>Start IIS.</li>
  -        <li>Open the @docname@ welcome page (http://localhost/cocoon/)</li>
  +        <li>Open the Cocoon welcome page (http://localhost/cocoon/)</li>
           <li>
  -            Congratulations! (hopefully) you should see the @docname@ welcome page.
  +            Congratulations! (hopefully) you should see the Cocoon welcome page.
           </li>
         </ol>
       </s2>
       <s2 title="Installing on JBoss 2.2.2 with Tomcat 3.2.2">
  -     <p>This section describes the deployment of the @docname@ sample WAR with
  -     the JBoss 2.2.2/Tomcat-3.2.2 package. It assumes that you built @docname@ as described above. All steps have been tested with a fresh JBoss 2.2.2 installation on Linux and Windows ME(sic).</p>
  +     <p>This section describes the deployment of the Cocoon sample WAR with
  +     the JBoss 2.2.2/Tomcat-3.2.2 package. It assumes that you built Cocoon as described above. All steps have been tested with a fresh JBoss 2.2.2 installation on Linux and Windows ME(sic).</p>
      <note>The JBoss/Tomcat bundle is available from the <link href="http://sourceforge.net/projects/jboss/">JBoss project page</link></note>
        <p>The JBoss/Tomcat package has the following directory
        structure</p>
  @@ -407,8 +407,8 @@
        </source>
        <p>Subsequently, </p>
            <ul><li><code>jboss</code> denotes the <code>JBoss-2.2.2_Tomcat-3.2.2/jboss</code> directory</li>
  -	 <li><code>tomcat</code> is short for <code>JBoss-2.2.2_Tomcat-3.2.2/tomcat</code></li><li>and <code>cocoon</code> is the base directory of your @docname@ distribution or CVS checkout.</li></ul>
  -     <p>In order to get @docname@ running you have to install Xerces as default XML parser for JBoss.</p>
  +	 <li><code>tomcat</code> is short for <code>JBoss-2.2.2_Tomcat-3.2.2/tomcat</code></li><li>and <code>cocoon</code> is the base directory of your Cocoon distribution or CVS checkout.</li></ul>
  +     <p>In order to get Cocoon running you have to install Xerces as default XML parser for JBoss.</p>
        <ul>
          <li>Stop the server if it is running.</li>
          <li>Remove the following files from the <code>jboss/lib</code> directory
  @@ -445,18 +445,18 @@
          <li>Start JBoss with <code>run_with_tomcat.sh</code> or <code>run_with_tomcat.bat</code></li>
          <li>Copy <code>cocoon/build/cocoon/cocoon.war</code> to <code>jboss/deploy</code></li>
          <li>Check the server log to make sure that <code>J2EE application: [...]/cocoon.war is deployed.</code></li>
  -       <li>Open the @docname@ welcome page (http://localhost:8080/cocoon/)</li>
  +       <li>Open the Cocoon welcome page (http://localhost:8080/cocoon/)</li>
          <li>
  -           Congratulations! (hopefully) you should see the @docname@ welcome page.
  +           Congratulations! (hopefully) you should see the Cocoon welcome page.
          </li>
        </ul>
  -     <note>As both JBoss and @docname@ ship with a Hypersonic database installed, these two conflict and you won't be able to use @docname@ database (SQL) samples. Then again, you probably use JBoss for EJB persistence anyway, so this shouldn't bother you too much ;-)
  +     <note>As both JBoss and Cocoon ship with a Hypersonic database installed, these two conflict and you won't be able to use Cocoon database (SQL) samples. Then again, you probably use JBoss for EJB persistence anyway, so this shouldn't bother you too much ;-)
        </note>
       </s2>
       <s2 title="Installing on Resin 2.0.x">
        <p>
  -        This section describes the deployment of the @docname@ sample WAR with Resin 2.0.x. 
  -        It assumes that you built @docname@ as described above. All steps have been tested 
  +        This section describes the deployment of the Cocoon sample WAR with Resin 2.0.x. 
  +        It assumes that you built Cocoon as described above. All steps have been tested 
           with a fresh Resin 2.0.0 and 2.0.1 installations (the package is available from 
           <link href="http://www.caucho.com/download/">Resin's download page</link>)
        </p>
  @@ -466,7 +466,7 @@
   [path]/resin-2.0.x/lib
   [path]/resin-2.0.x/webapps
   [path]...</source>
  -     <p>In order to get @docname@ running you have to install Xerces as default XML parser for Resin.</p>
  +     <p>In order to get Cocoon running you have to install Xerces as default XML parser for Resin.</p>
        <ul>
          <li>Stop the server if it is running.</li><li>Remove the following files from the <code>resin-2.0.x/lib</code> directory:
            <ul>
  @@ -480,10 +480,10 @@
          <li>Copy the <code>xml-cocoon2/build/cocoon/cocoon.war</code> WAR file to <code>resin-2.0.x/webapps</code> directory
          </li>
          <li>Start Resin as usual</li>
  -       <li>Open the @docname@ welcome page (http://localhost:8080/cocoon/)</li>
  -       <li>Congratulations! (hopefully) you should see the @docname@ welcome page.</li>
  +       <li>Open the Cocoon welcome page (http://localhost:8080/cocoon/)</li>
  +       <li>Congratulations! (hopefully) you should see the Cocoon welcome page.</li>
        </ul>
  -     <p><strong>Note:</strong> If you want to place @docname@ webapp in a
  +     <p><strong>Note:</strong> If you want to place Cocoon webapp in a
          directory different than <code>resin-2.0.x/webapps</code>, you need
          to edit <code>resin-2.0.x/conf/resin.conf</code> file and add a line
          somewhere in <code><![CDATA[<host>]]></code> tag:
  
  
  
  1.1.2.2   +8 -8      xml-cocoon2/documentation/xdocs/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/jars.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- jars.xml	2001/10/05 09:31:12	1.1.2.1
  +++ jars.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -  <title>@doctitle@ JARs</title>
  +  <title>Cocoon JARs</title>
     <authors>
      <person name="John Morrison" email="john.morrison@uk.experian.com"/>
     </authors>
  @@ -19,9 +19,9 @@
      <tr>
        <th>Jar name</th>
        <th>Description</th>
  -     <th>Required by Core @docname@</th>
  -     <th>Required by @docname@ Component</th>
  -     <th>Required by @docname@ Sample</th>
  +     <th>Required by Core Cocoon</th>
  +     <th>Required by Cocoon Component</th>
  +     <th>Required by Cocoon Sample</th>
        <th>Comment</th>
      </tr>
      <tr>
  @@ -56,7 +56,7 @@
        <td>No</td>
        <td/>
        <td/>
  -     <td>Is this used outside of the @docname@ samples?</td>
  +     <td>Is this used outside of the Cocoon samples?</td>
      </tr>
      <tr>
        <td><link href="http://xml.apache.org/batik/">batik-libs</link></td>
  @@ -83,8 +83,8 @@
          &apos;adopted&apos;.</td>
      </tr>
      <tr>
  -     <td><link href="http://xml.apache.org/cocoon2/">@docname@</link></td>
  -     <td>@docname@ is a 100% pure Java publishing framework that relies on
  +     <td><link href="http://xml.apache.org/cocoon2/">Cocoon</link></td>
  +     <td>Cocoon is a 100% pure Java publishing framework that relies on
          new W3C technologies (such as XML, XSL, SVG, etc..) to provide web
          content.</td>
        <td>Yes!</td>
  @@ -178,7 +178,7 @@
        <td>Yes</td>
        <td/>
        <td/>
  -     <td>@docname@ logging.</td>
  +     <td>Cocoon logging.</td>
      </tr>
      <tr>
        <td><link href="http://www.weft.co.uk/library/maybeupload/">maybeupload</link></td>
  
  
  
  1.1.2.2   +3 -3      xml-cocoon2/documentation/xdocs/license.xml
  
  Index: license.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/license.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- license.xml	2001/10/05 09:31:12	1.1.2.1
  +++ license.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,14 +3,14 @@
   
   <document>
    <header>
  -  <title>@docname@ Public License</title>
  +  <title>Apache Cocoon Public License</title>
     <authors>
      <person name="Stefano Mazzocchi" email="stefano@apache.org"/>
     </authors>
    </header>
   
   <body>
  -<s1 title="@docname@ Public License">
  +<s1 title="Apache Cocoon Public License">
   <source><![CDATA[
    ============================================================================
                      The Apache Software License, Version 1.1
  @@ -34,7 +34,7 @@
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
    
  - 4. The names "@docname@" and  "Apache Software Foundation"  must  not be
  + 4. The names "Apache Cocoon" and  "Apache Software Foundation"  must  not be
       used to  endorse or promote  products derived from  this software without
       prior written permission. For written permission, please contact
       apache@apache.org.
  
  
  
  1.1.2.2   +5 -5      xml-cocoon2/documentation/xdocs/livesites.xml
  
  Index: livesites.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/livesites.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- livesites.xml	2001/10/05 09:31:12	1.1.2.1
  +++ livesites.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
    <header>
  -  <title>Live Sites powered by @docname@</title>
  +  <title>Live Sites powered by Apache Cocoon</title>
     <authors>
      <person name="Donald Ball" email="balld@webslingerZ.com"/>
      <person name="Stefano Mazzocchi" email="stefano@apache.org"/>
  @@ -12,9 +12,9 @@
    </header>
    
    <body>
  -  <s1 title="Live Sites powered by @docname@ 1.X">
  +  <s1 title="Live Sites powered by Apache Cocoon 1.X">
      <p>
  -    Here is a list of web sites that are proudly powered by @docname@ 1.X
  +    Here is a list of web sites that are proudly powered by Cocoon 1.X
       (in chronological order):
      </p>
      
  @@ -66,9 +66,9 @@
      </ul>
     </s1>
   
  -  <s1 title="Live Sites powered by @docname@ 2.X">
  +  <s1 title="Live Sites powered by Apache Cocoon 2.X">
      <p>
  -    Here is a list of web sites that are proudly powered by @docname@ 2.X
  +    Here is a list of web sites that are proudly powered by Cocoon 2.X
       (in chronological order):
      </p>
      
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/logicsheet-concepts.xml
  
  Index: logicsheet-concepts.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/logicsheet-concepts.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- logicsheet-concepts.xml	2001/10/05 09:31:12	1.1.2.1
  +++ logicsheet-concepts.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -326,7 +326,7 @@
       </p>
   
       <p>
  -      Thus, for example, when @docname@ is used as a servlet, XSP pages
  +      Thus, for example, when Cocoon is used as a servlet, XSP pages
         need access to the underlying servlet engine objects: request,
         response, session, servlet config, etc.
       </p>
  @@ -451,7 +451,7 @@
         Logicsheet preprocessor is still unimplemented.
         Preprocessing may be performed as well in XSLT by using
         <em>extension functions</em>.  Logicsheet preprocessing is meant to be
  -      used in those cases where the XSLT processor being used by @docname@
  +      used in those cases where the XSLT processor being used by Cocoon
         does not support XSLT extensions. (As of this writing, only
         <link href="http://xml.apache.org/xalan/">Xalan</link>
         is known to support XSLT extensions).
  
  
  
  1.1.2.2   +1 -1      xml-cocoon2/documentation/xdocs/logicsheet-forms.xml
  
  Index: logicsheet-forms.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/logicsheet-forms.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- logicsheet-forms.xml	2001/10/05 09:31:12	1.1.2.1
  +++ logicsheet-forms.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -13,7 +13,7 @@
     <body> 
      <s1 title="Introduction">
      <p>
  -   For most web applications input is essential. @docname@ provides a
  +   For most web applications input is essential. Apache Cocoon provides a
      variety of modules to support basic interaction like simple syntax
      checking of input data or writing input data to databases.
      </p>
  
  
  
  1.1.2.2   +15 -15    xml-cocoon2/documentation/xdocs/logicsheet.xml
  
  Index: logicsheet.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/logicsheet.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- logicsheet.xml	2001/10/05 09:31:12	1.1.2.1
  +++ logicsheet.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -13,9 +13,9 @@
   
   <s1 title="Introduction">
     <p>This document is intended as an introduction and brief tutorial to using and
  -  creating @docname@ XSP logicsheets. It is assumed that the reader has a working
  +  creating Apache Cocoon XSP logicsheets. It is assumed that the reader has a working
     knowledge of XML and XSLT, and has worked through at least the basic XSP examples
  -  supplied with @docname@.  Although this is not intended as a tutorial for XSP 
  +  supplied with Cocoon.  Although this is not intended as a tutorial for XSP 
     specifically, much of the material may be helpful in gaining a fuller understanding
     of XSP.</p>
   </s1>
  @@ -25,14 +25,14 @@
     will use these terms interchangeably.  The term "taglib" comes from JSP, which 
     inspired XSP.  An XSP logicsheet is a "tag library" in the sense that it defines
     a set of custom XML tags which can be used within an XSP program to insert whole
  -  blocks of code into the file.  @docname@ comes with several pre-defined "taglibs",
  +  blocks of code into the file.  Cocoon comes with several pre-defined "taglibs",
     such as the request taglib.  Using the request taglib, you can insert the following
     tag into your XSP code to obtain the HTTP request parameter named "fruit" (e.g., if
     your URL looks something like "http://myserver.org/index.xml?fruit=apple", the value
     of "fruit" is "apple"):</p>
     <source><![CDATA[<request:get-parameter name="fruit"/>]]></source>
   
  -  <p>We will discuss how to use @docname@'s pre-defined taglibs in a later section.  The
  +  <p>We will discuss how to use Cocoon's pre-defined taglibs in a later section.  The
     important thing to understand is that all taglibs are defined by a logicsheet.  A
     logicsheet, as we will see, is a special kind of XSL stylesheet, whose output is an
     XSP file.</p>
  @@ -40,7 +40,7 @@
   
   <s1 title="Hello World!">
     <p>We'll start with some simple <code>Hello, World!</code> examples, starting with
  -  a simple HTML file, and extending it using @docname@ technologies until we have a
  +  a simple HTML file, and extending it using Cocoon technologies until we have a
     working (if trivial) example of XSP using a custom logicsheet.</p>
   
   <s2 title="Simple HTML Example">
  @@ -249,7 +249,7 @@
     First, as in the previous examples, you can tell XSP explicitly what
     logicsheets to apply, using the &lt;?xml-logicsheet?> processing instruction
     along with the usual &lt;?cocoon-process?> instruction that tells 
  -  @docname@ to use XSP:</p>
  +  Cocoon to use XSP:</p>
   <source><![CDATA[
   <?cocoon-process type="xsp"?>
   <?xml-logicsheet href="logicsheet.greeting.xsl"?>]]>
  @@ -257,14 +257,14 @@
   
     <p>There is another way to apply a logicsheet, which doesn't require a
     processing instruction for each file that uses the logicsheet.  The
  -  second way to use a logicsheet depends on whether you are using @docname@ 1
  -  or @docname@ 2.  For @docname@ 2, take a look at the 
  -  <link href="http://xml.apache.org/cocoon/cocoon2/">@docname@ Site</link>.
  -  For @docname@, a logicsheet's namespace may be declared in the 
  +  second way to use a logicsheet depends on whether you are using Cocoon 1
  +  or Cocoon 2.  For Cocoon 2, take a look at the 
  +  <link href="http://xml.apache.org/cocoon/cocoon2/">Cocoon Site</link>.
  +  For Cocoon, a logicsheet's namespace may be declared in the 
     cocoon.properties file.  These declarations take the form</p>
   <source>processor.xsp.logicsheet.namespace-name.language = URL to file</source>
   
  -  <p>@docname@'s pre-defined logicsheets are already declared in this file.  For
  +  <p>Cocoon's pre-defined logicsheets are already declared in this file.  For
     instance, the declaration of the request taglib is the following:</p>
   <source>
   processor.xsp.logicsheet.request.java  
  @@ -300,7 +300,7 @@
     <p>There are some very important differences between using the &lt;?xml-logicsheet?> 
     processing instruction vs. the cocoon.properties entry to apply a logicsheet.
     Using cocoon.properties, any time the logicsheet changes, it is necessary to 
  -  restart @docname@.  If you instead use the processing instruction, @docname@ will detect
  +  restart Cocoon.  If you instead use the processing instruction, Cocoon will detect
     modifications to your logicsheet, and recompile your XSP programs accordingly.
     Also, if you need to explicitly control the order in which your logicsheets are
     applied, you need to use the processing instruction.  Logicsheets will be applied
  @@ -342,7 +342,7 @@
       XML/XSL complications.  It also lets you see exactly the results of XSLT transformation
       using your logicsheet.</dd>
       <dt>Steal Code</dt>
  -    <dd>The authors of the logicsheets distributed with @docname@ have already solved
  +    <dd>The authors of the logicsheets distributed with Cocoon have already solved
       numerous problems that you may encounter.  Read their code (it is in the source
       tree) and borrow from it liberally.  Reading this code is also a good way to
       gain insight into logicsheet design.</dd>
  @@ -355,7 +355,7 @@
       source file, and there is the possibility that other logicsheets may also be acting
       on the same file (either before or after our logicsheet), there are a few templates
       which are more or less required in any logicsheet.  The templates below were all
  -    pulled from the taglib logicsheets distributed with @docname@.</p>
  +    pulled from the taglib logicsheets distributed with Cocoon.</p>
       <p>The first of these is simply a template to copy anything you don't directly act
       upon yourself.  You probably have a template similar to this in most of your
       stylesheets already.</p>
  @@ -415,7 +415,7 @@
     <s2 title="Logicsheets Using Logicsheets">
       <p>Since software tends to build on other software, you will probably find
       yourself wanting to write logicsheets which make use of other logicsheets,
  -    particularly the logicsheets provided with @docname@.  This is very possible.
  +    particularly the logicsheets provided with Cocoon.  This is very possible.
       When using one logicsheet inside another, the most important thing to remember
       is that you must declare the namespace for the second logicsheet not only in
       the first logicsheet, but also in any XSP program that uses the first logicsheet,
  
  
  
  1.2.2.2   +14 -14    xml-cocoon2/documentation/xdocs/mail-lists.xml
  
  Index: mail-lists.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/mail-lists.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- mail-lists.xml	2001/10/05 09:31:12	1.2.2.1
  +++ mail-lists.xml	2001/10/25 07:43:49	1.2.2.2
  @@ -19,16 +19,16 @@
       <li><link href="http://dmoz.org/Computers/Data_Formats/Markup_Languages/XML/">ODP XML links</link>
        - a wealth of general XML information.</li>
       <li><connect href="mail-archives.xml">Mailing list archives</connect> - 
  -     a veritable goldmine of @docname@-specific information - if you know where to look!</li>
  +     a veritable goldmine of Cocoon-specific information - if you know where to look!</li>
      </ol>
     </s1>
   
  -  <s1 title="@docname@ Users">
  +  <s1 title="Cocoon Users">
      <p><link href="mailto:cocoon-users-subscribe@xml.apache.org">Subscribe</link>
         <link href="mailto:cocoon-users-unsubscribe@xml.apache.org">Unsubscribe</link>
      </p>
   
  -   <p>The general @docname@ list, for problems, bug reports, asking for advice on how
  +   <p>The general Cocoon list, for problems, bug reports, asking for advice on how
       best to implement a site, comparisons with other XML frameworks, etc.
       But don't forget to look in the FAQ first, please!</p>
   
  @@ -47,7 +47,7 @@
   
      <p><strong>IMPORTANT:</strong> If you are posting about a problem you are having
       (as most people do), it will aid in finding a speedy resolution if you provide
  -    full configuration details (especially the <strong>@docname@ version number</strong>,
  +    full configuration details (especially the <strong>Cocoon version number</strong>,
       but also your operating system, JDK version, and servlet engine), and full details
       of any errors encountered (including full error messages and stack traces).</p>
   
  @@ -65,18 +65,18 @@
       delay before your post is reviewed and accepted. This is to prevent spam.</note>
     </s1>
   
  -  <s1 title="@docname@ Dev">
  +  <s1 title="Cocoon Dev">
      <p><link href="mailto:cocoon-dev-subscribe@xml.apache.org">Subscribe</link>
         <link href="mailto:cocoon-dev-unsubscribe@xml.apache.org">Unsubscribe</link>
      </p>
   
      <p>This list is for developers <strong>working on</strong> or wanting to work on
  -    @docname@ itself (not developers merely working <strong>with</strong> @docname@),
  -    for code patches to @docname@ to be posted (please use <code>diff -u</code> format),
  -    and for general @docname@ questions.</p>
  +    Cocoon itself (not developers merely working <strong>with</strong> Cocoon),
  +    for code patches to Cocoon to be posted (please use <code>diff -u</code> format),
  +    and for general Cocoon questions.</p>
   
  -   <p>Note this is <strong>NOT</strong> for general @docname@ questions like "Why
  -    isn't @docname@ working on my machine?" - 
  +   <p>Note this is <strong>NOT</strong> for general Cocoon questions like "Why
  +    isn't Cocoon working on my machine?" - 
       please ask those sorts of questions on cocoon-users (after reading the
       FAQ first, of course).</p>
   
  @@ -84,7 +84,7 @@
       delay before your post is reviewed and accepted. This is to prevent spam.</note>
     </s1>
   
  -  <s1 title="@docname@ Cvs">
  +  <s1 title="Cocoon Cvs">
      <p><link href="mailto:cocoon-cvs-subscribe@xml.apache.org">Subscribe</link>
         <link href="mailto:cocoon-cvs-unsubscribe@xml.apache.org">Unsubscribe</link>
      </p>
  @@ -106,14 +106,14 @@
   
      <p>This list began life on November 2000, and was created to discuss the
       standardisation and implementation of the dynamic content language XSP,
  -    which is used not only in @docname@ but in other software such as AxKit.
  +    which is used not only in Cocoon but in other software such as AxKit.
       You are recommended to have a strong working knowledge of XSP before joining
       this list.</p>
   
      <p>Note this is <strong>NOT</strong> for general XSP questions like
       "Why doesn't my XSP page work?" - please ask those sorts of questions on
       the relevant list for your XSP software (e.g. cocoon-users if you're using
  -    @docname@) - after checking the FAQ first of course!
  +    Cocoon) - after checking the FAQ first of course!
      </p>
     </s1>
   
  @@ -123,7 +123,7 @@
       ODP XML links</link> for related websites.)</p>
      <ul>
       <li><link href="http://www.mulberrytech.com/xsl/">Mulberrytech XSL list</link> -
  -      more appropriate than @docname@ Users for general XSL questions.</li>
  +      more appropriate than Cocoon Users for general XSL questions.</li>
       <li><link href="http://xml.apache.org/mail.html">XML Apache Projects</link> -
         list of mailing lists for all the projects on xml.apache.org.</li>
       <li>Some servlet engines have their own mailing lists for servlet-engine
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/matchers_selectors.xml
  
  Index: matchers_selectors.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/matchers_selectors.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- matchers_selectors.xml	2001/10/05 09:31:12	1.1.2.1
  +++ matchers_selectors.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -18,12 +18,12 @@
     of the request processing. One particular matcher you're probably
     familiar with, is the WildcardURIMatcher. That is the one that
     determines the (sub-)pipeline in the welcome example. But there are
  -  many more matchers supplied with @docname@, one matches the requested
  +  many more matchers supplied with Apache Cocoon, one matches the requested
     URI on regular expressions, others match the client's hostname,
     existence of parameters and so on.
     </p>
     <p>
  -  There is also a number of selectors supplied with @docname@. Selectors
  +  There is also a number of selectors supplied with Cocoon. Selectors
     test a generally simple boolean expression and allow to select on
     roughly the same things as matchers would. There is a selector on
     the client's hostname, on the client's browser etc.
  
  
  
  1.1.2.2   +3 -3      xml-cocoon2/documentation/xdocs/mrustore.xml
  
  Index: mrustore.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/mrustore.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- mrustore.xml	2001/10/05 09:31:12	1.1.2.1
  +++ mrustore.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,16 +3,16 @@
   
   <document>
     <header>
  -    <title>MRUMemoryStore in @doctitle@</title>
  +    <title>MRUMemoryStore in Apache Cocoon</title>
       <version></version>
       <type>Technical document</type>
       <authors><person name="Gerhard Froehlich" email="g-froehlich@gmx.de"/>
       </authors>
  -    <abstract>This document explains how the MRUMemoryStore under @docname@ executes.</abstract>
  +    <abstract>This document explains how the MRUMemoryStore under Cocoon executes.</abstract>
     </header>
     <body>
     <s1 title="Goal">
  -    <p>This document explains how the MRUMemoryStore under @docname@ executes.</p>
  +    <p>This document explains how the MRUMemoryStore under Apache Cocoon executes.</p>
     </s1>
     <s1 title="Overview">
       <p>The MRUMemoryStore was developed to provide a standard algorithm to
  
  
  
  1.1.2.2   +10 -10    xml-cocoon2/documentation/xdocs/overview.xml
  
  Index: overview.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/overview.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- overview.xml	2001/10/05 09:31:12	1.1.2.1
  +++ overview.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,18 +3,18 @@
   
   <document> 
     <header> 
  -	 <title>Overview of @doctitle@</title>
  +	 <title>Overview of Apache Cocoon</title>
   	 <version>0.2</version> 
   	 <type>Overview document</type> 
   	 <authors><person name="Tom Klaasen" email="tom.klaasen@the-ecorp.com"/> 
   	 </authors> 
     </header> 
     <body> 
  -	 <s1 title="What is @docname@"> 
  -		<p>@docname@ is an XML publishing framework. It allows you to define XML
  +	 <s1 title="What is Apache Cocoon"> 
  +		<p>Cocoon is an XML publishing framework. It allows you to define XML
   		  documents and transformations to be applied on it, to eventually generate a
   		  presentation format of your choice (HTML, PDF, SVG, ...).</p> 
  -		<p>@docname@ also gives you the possibility to apply logic to your XML files
  +		<p>Cocoon also gives you the possibility to apply logic to your XML files
   		  (so that the XML pipeline can be dynamic).</p> 
   	 </s1> 
   
  @@ -22,14 +22,14 @@
      <s1 title="Examples and demonstration applications"> 
       <p>
        There are a whole suite of sample applications to demonstrate the power
  -     of @docname@. These samples are available from the "welcome" page after
  +     of Cocoon. These samples are available from the "welcome" page after
        you have downloaded, built, and installed the distribution.
        Each example portrays a different aspect of the vast capabilities of
  -     @docname@.
  +     Cocoon.
       </p>
   
       <p>
  -     It will greatly assist your understanding of @docname@ to investigate
  +     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
  @@ -39,13 +39,13 @@
   
      <s1 title="Overview of XML document processing"> 
       <p>This section gives a general overview of how an XML document is
  -     handled by @docname@. See also the document
  -     <link href="uc2.html">Understanding @docname@</link> for explanation of
  +     handled by Cocoon. See also the document
  +     <link href="uc2.html">Understanding Cocoon</link> for explanation of
        the separation of content, style, logic and management functions.
       </p> 
   
   		<s2 title="Pipeline"> 
  -		  <p>@docname@ relies on the pipeline model: an XML document is pushed
  +		  <p>Cocoon relies on the pipeline model: an XML document is pushed
   			 through a pipeline, that exists in several transformation steps of your
   			 document. Every pipeline begins with a generator, continues with zero or more
   			 transformers, and ends with a serializer. This can be compared to the
  
  
  
  1.1.2.2   +2 -3      xml-cocoon2/documentation/xdocs/parent-component-manager.xml
  
  Index: parent-component-manager.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/parent-component-manager.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- parent-component-manager.xml	2001/10/05 09:31:12	1.1.2.1
  +++ parent-component-manager.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -4,17 +4,16 @@
       <document>
           <header>
               <title>Parent Component Manager</title>
  -            <subtitle>in @doctitle@</subtitle>
               <version>0.9</version>
               <type>Technical document</type>
               <authors>
                   <person name="Leo Sutic" email="leo.sutic@inspireinfrastructure.com"/>
               </authors>
  -            <abstract>This document describes how to use a parent component manager in @docname@.</abstract>
  +            <abstract>This document describes how to use a parent component manager in Cocoon.</abstract>
           </header>
           <body>
               <s1 title="Parent Component Manager">
  -                <p>When using Cocoon2 it is sometimes neccessary to obtain
  +                <p>When using Apache Cocoon it is sometimes neccessary to obtain
                       components from other sources than the <code>user.roles</code> file,
                       or preferable to have a common component manager for several web applications.</p>
                   
  
  
  
  1.1.2.2   +1 -1      xml-cocoon2/documentation/xdocs/patches.xml
  
  Index: patches.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/patches.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- patches.xml	2001/10/05 09:31:12	1.1.2.1
  +++ patches.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -17,7 +17,7 @@
      This is an <strong>informal</strong> list - in chronological order -
      of some of the noteworthy patches that have been posted
      to the <link href="mailto:cocoon-dev@xml.apache.org">cocoon-dev</link> mailing list.
  -   These patches are not (yet) part of the @docname@ project, but need reviewing for possible
  +   These patches are not (yet) part of the Apache Cocoon project, but need reviewing for possible
      inclusion. This system was instituted because, due to the large volume of mail and
      the lack of time of the committers, some patches tended to get forgotten about. This
      queue does not guarantee that any patch will be reviewed within a reasonable time frame,
  
  
  
  1.1.2.2   +1 -1      xml-cocoon2/documentation/xdocs/request.xml
  
  Index: request.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/request.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- request.xml	2001/10/05 09:31:12	1.1.2.1
  +++ request.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -78,7 +78,7 @@
   </xsp:page>
   ]]></source> 
   
  -<p>If your server is www.mydomain.com and you save this XML in your @docname@
  +<p>If your server is www.mydomain.com and you save this XML in your Cocoon
   document tree as /cocoon/request.xml, then you can see the effect of the 
   <em>request</em> elements by opening your browser with the URL
   <code>http://www.mydomain.com/cocoon/request.xml?fruit=apple</code></p>
  
  
  
  1.1.2.2   +13 -13    xml-cocoon2/documentation/xdocs/sessions.xml
  
  Index: sessions.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/sessions.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- sessions.xml	2001/10/05 09:31:12	1.1.2.1
  +++ sessions.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -4,7 +4,7 @@
   <document>
   
     <header>
  -    <title>Session tracking with @docname@</title>
  +    <title>Session tracking with Cocoon</title>
       <subtitle>Introduction, Installation and Example</subtitle>
       <version>0.1</version>
       <type>Technical Document</type>
  @@ -12,16 +12,16 @@
         <person name="J&ouml;rg Prante" email="joerg@7val.com"/>
       </authors>
       <abstract>
  -    This document explains what @docname@ provides to support session tracking.
  +    This document explains what Apache Cocoon provides to support session tracking.
       Session tracking is an important feature for web server frameworks
       because HTTP and related protocols are stateless,
  -    but sometimes we need stateful information about visitors of a @docname@ site.
  +    but sometimes we need stateful information about visitors of a Cocoon site.
       For a more precise analysis of a web site, the tracking of visitors
       should work independent of the visitor's browser and of the visitor's decision
  -    whether we enabled cookies or not. Last not least, @docname@ should not
  +    whether we enabled cookies or not. Last not least, Cocoon should not
       be dependant of the method the servlet engine prefers to generate session IDs.
       In this document, it is described step by step what has to be done to enable
  -    @docname@ for session management.
  +    Cocoon for session management.
       </abstract>
     </header>
   
  @@ -33,7 +33,7 @@
            because HTTP is a stateless protocol. There are many solutions known
            to obtain stateful information. Client-side storage of state information
            like the usage of cookies will not be discussed here, since this depends
  -         heavily on the client's browser. Since @docname@ is a server-side framework,
  +         heavily on the client's browser. Since Cocoon is a server-side framework,
            storing visitor information at the server side will give full access
            to the list of all visitors, to what they have done, and what they are
            doing.
  @@ -45,7 +45,7 @@
            system resources before wasting it.
            </p>
            <p>
  -         If you decided to set up session tracking, @docname@ offers you:
  +         If you decided to set up session tracking, Cocoon offers you:
            </p>
             <ul>
               <li>creation of new session IDs</li>
  @@ -59,7 +59,7 @@
           <s2 title="The session:encode-url template">
   
           <p>
  -        To enable @docname@ for URI-based session IDs, an XSP template with the name
  +        To enable Cocoon for URI-based session IDs, an XSP template with the name
           <code>session:encode-url</code> will do this for you. It uses the
           <code>encodeURL</code> method from the Servlet API which encodes
           an URL in a way that a session ID is being attached. Consult your
  @@ -104,7 +104,7 @@
            The best place of a web site where new sessions should be created is the entry point
            where all or most of the visitors step in. After creating the session, or
            retrieving an old session, the visitor is redirected to a start page.
  -         In @docname@, you must edit your sitemap in order to
  +         In Cocoon, you must edit your sitemap in order to
            specify this interesting point of session creation.
            The <code>map-redirect-to</code>
            has an extra attribute <code>session</code>, which can be set to <code>true</code>
  @@ -114,15 +114,15 @@
            </p>
   
            <p>
  -         How can @docname@ recognize URIs with appended session IDs? The answer is:
  -         @docname@ can match a wildcard against your sessionized pages and keeps happy.
  +         How can Cocoon recognize URIs with appended session IDs? The answer is:
  +         Cocoon can match a wildcard against your sessionized pages and keeps happy.
            So please do not forget to append an asterisk '*' to your patterns in the pipelines.
            </p>
   
            <p>
            This fragment from <code>sitemap.xsl</code> shows how you can add a
            <code>map:redirect-to</code> to
  -         your @docname@ framework with session handling at the root URL for your
  +         your Cocoon framework with session handling at the root URL for your
            web application:
            </p>
   
  @@ -195,7 +195,7 @@
         <p>
         If you have been successful with installing the session feature and
         the example file, the following HTML output will be generated by
  -      @docname@ from the above <code>sessionpage.xsp</code> example, which shows
  +      Cocoon from the above <code>sessionpage.xsp</code> example, which shows
         how the rewritten link looks like. Please don't ask
         why the session ID in the generated link is different from yours.
         </p>
  
  
  
  1.2.2.2   +5 -5      xml-cocoon2/documentation/xdocs/sitemap.xml
  
  Index: sitemap.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/sitemap.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- sitemap.xml	2001/10/05 09:31:12	1.2.2.1
  +++ sitemap.xml	2001/10/25 07:43:49	1.2.2.2
  @@ -17,7 +17,7 @@
      <s2 title="Introduction">
       <p>
        This document is used as a working draft for 
  -     @docname@ architects to understand the issues associated with 
  +     Apache Cocoon architects to understand the issues associated with 
        sitemaps and XML publishing in general. It must be considered as a working 
        draft and may be updated at any time.
       </p>
  @@ -27,7 +27,7 @@
        Mazzocchi (stefano@apache.org) and Pierpaolo Fumagalli (pier@apache.org)
        but grew as a collaborative effort to provide a solid foundation of
        design patterns and usability guidelines to create a solid foundation
  -     of sitemap programmability and usability to the @docname@ Publishing 
  +     of sitemap programmability and usability to the Cocoon Publishing 
        Framework.
       </p>
    
  @@ -63,7 +63,7 @@
        <li>sitemaps must scale along with the site and should not impose growth
         limitation to the site as a whole nor limit its administration with size
         increase.</li>
  -     <li>sitemaps should contain all the information required to @docname@ to
  +     <li>sitemaps should contain all the information required to Cocoon to
         generate all the requests it receives.</li>
        <li>sitemaps should contain information for both dynamic operation as
         well as offline generation.</li>
  @@ -71,14 +71,14 @@
         need.</li>
        <li>basic web-serving functionalities (redirection, error pages,
         resource authorisation) should be provided.</li>
  -     <li>sitemaps should not limit @docname@'s intrinsic modular extensibility.</li>
  +     <li>sitemaps should not limit Cocoon's intrinsic modular extensibility.</li>
        <li>resources must be matched with all possible state variables, not
         only with URI (http parameters, environment variables, server
         parameters, time, etc...).</li>
        <li>sitemaps should embed the notion of "semantic resources" to be
         future-compatible with semantic crawling and indexing.</li>
        <li>sitemaps should be flexible enough to allow a complete web site to
  -      be built with @docname@.</li>
  +      be built with Cocoon.</li>
       </ol>
      </s2>
   
  
  
  
  1.1.2.2   +5 -5      xml-cocoon2/documentation/xdocs/storejanitor.xml
  
  Index: storejanitor.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/storejanitor.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- storejanitor.xml	2001/10/05 09:31:12	1.1.2.1
  +++ storejanitor.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,17 +3,17 @@
   
   <document>
     <header>
  -    <title>StoreJanitor in @doctitle@</title>
  -    <version></version>
  +    <title>StoreJanitor in Apache Cocoon</title>
  +    <version>0.1</version>
       <type>Technical document</type>
       <authors><person name="Gerhard Froehlich" email="g-froehlich@gmx.de"/>
       </authors>
  -    <abstract>This document describes the usage of the StoreJanitor under @docname@.</abstract>
  +    <abstract>This document describes the usage of the StoreJanitor under Cocoon.</abstract>
     </header>
     <body>
  -  <s1 title="Goal"><p>This document describes the usage of the StoreJanitor under @docname@.</p></s1>
  +  <s1 title="Goal"><p>This document describes the usage of the StoreJanitor under Apache Cocoon.</p></s1>
     <s1 title="Overview">
  -  <p>In the current design of @doctitle@ there can be different stores for the different pipelines.
  +  <p>In the current design of Apache Cocoon there can be different stores for the different pipelines.
     For example you can choose a weaker store for the event pipelines (weaker=caches 
     not many objects) and a "big" store for the stream pipelines. If you know which ones are more 
     "cacheable", you can fine-tune your stores. This decision was made, because of the two pipeline objects. 
  
  
  
  1.1.2.2   +23 -24    xml-cocoon2/documentation/xdocs/uc2.xml
  
  Index: uc2.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/uc2.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- uc2.xml	2001/10/05 09:31:12	1.1.2.1
  +++ uc2.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -3,8 +3,7 @@
   
   <document> 
    <header>
  -  <title>Understanding @Name@</title>
  -  <subtitle>Understanding @Name@ Architecture</subtitle>
  +  <title>Understanding Apache Cocoon</title>
     <authors>
      <person name="Pankaj Kumar" email="pankaj_kumar@hp.com"/>
      <person name="Davanum Srinivas" email="dims@yahoo.com"/>
  @@ -31,7 +30,7 @@
          </li>
          <li>
            <link href="#what-problems">
  -           What problem does @docname@ solve?
  +           What problem does Cocoon solve?
            </link>
          </li>
          <li>
  @@ -78,23 +77,23 @@
       </ul> 
       <p>What You need not know:</p> 
       <ul> 
  -         <li>@docname@ 1</li>
  +         <li>Cocoon 1</li>
       </ul> 
     </s1>
     <anchor id="a-little-history"/>
     <s1 title="A Little History">
  -    <s2 title="@docname@1">
  +    <s2 title="Cocoon 1">
         <ul> 
  -            <li>@docname@ project was founded in Jan. 1999 by Stefano Mazzocchi as an open source project under Apache Software Foundation.</li>
  +            <li>Cocoon project was founded in Jan. 1999 by Stefano Mazzocchi as an open source project under Apache Software Foundation.</li>
               <li>Started as a simple servlet for XSL styling of XML content.</li>
               <li>Was based on DOM level 1 API. This choice turned out to be quite limiting for speed/memory efficiency.</li>
               <li>Used reactor pattern to connect components. This allowed the reaction instructions to be placed inside the documents.  Though appealing, it caused difficulties in managing highly dynamic web-sites.</li>
               <li>Allowed context overlap to happen by having processing instructions in documents/stylesheets.</li>
         </ul> 
       </s2>
  -    <s2 title="@doctitle@">
  +    <s2 title="Apache Cocoon">
         <ul> 
  -            <li>A separate codebase to incorporate @docname@1 learnings.</li>
  +            <li>A separate codebase to incorporate Cocoon 1 learnings.</li>
               <li>Designed for execution speed/memory efficiency and scalability to process very large documents by switching processing model from DOM to SAX.</li>
               <li>Centralizes the management functions by allowing processing pipeline specification in a sitemap (an XML file), replacing the embedded processing instruction model.</li>
               <li>Better support for pre-compilation, pre-generation and caching for better performance.</li>
  @@ -102,7 +101,7 @@
       </s2>
     </s1>
     <anchor id="what-problems"/>
  -  <s1 title="What problem does @doctitle@ solve?">
  +  <s1 title="What problem does Cocoon solve?">
       <p>Basic problem to be solved:</p>
       <s2 title="Separation of content, style, logic and management functions in an XML content based web site (and web services).">
         <figure src="images/pyramid-model.gif" alt="The @Name@ Pyramid Model of Contracts"/>
  @@ -130,7 +129,7 @@
     <anchor id="c2-architecture"/>
     <s1 title="Architecture.">
       <figure src="images/architecture.gif" alt="Architecture"/>
  -    <s2 title="Core @docname@">
  +    <s2 title="Core Cocoon">
         <ul>
           <li>Avalon framework for logging, configuration, threading, context etc.</li>
           <li>Caching mechanism</li>
  @@ -140,7 +139,7 @@
           <li>...</li>
         </ul>
       </s2>
  -    <s2 title="@docname@ Components">
  +    <s2 title="Cocoon Components">
         <ul>
           <li>Specific generators</li>
           <li>Specific transformers</li>
  @@ -243,7 +242,7 @@
         </s3>
         <s3 title="Logicsheet as tag library">
         <ul>
  -        <li>The logicsheet is packaged as a reusable tag library and registered with @docname@ in cocoon.xconf file.</li>
  +        <li>The logicsheet is packaged as a reusable tag library and registered with Cocoon in cocoon.xconf file.</li>
           <li>Tag library has a namespace declaration, declared in the original logicsheet and matched in <code>&lt;xsp:page&gt;</code> xmlns:... attribute.</li>
           <li>Effective separation of content, logic and management</li>
         </ul>
  @@ -274,7 +273,7 @@
   ...
   </map:sitemap>
   ]]></source>
  -      <p>Sitemap contains configuration information for a @docname@ engine:</p>
  +      <p>Sitemap contains configuration information for a Cocoon engine:</p>
           <ul>
              <li>list of matchers</li>
              <li>list of generators</li>
  @@ -296,7 +295,7 @@
              <li>wildcard matcher</li>
              <li>regexp matcher</li>
           </ul>
  -      <p>More matchers can be added without modifying @docname@.</p>
  +      <p>More matchers can be added without modifying Cocoon.</p>
         <p>Matchers help in specifying a specific pipeline processing for a group of URIs.</p>
         <p>Sitemap entries for different types of matchers</p>
   <source><![CDATA[
  @@ -327,7 +326,7 @@
              <li>Request generator</li>
              <li>...</li>
           </ul>
  -      <p>More generators can be added without modifying @docname@.</p>
  +      <p>More generators can be added without modifying Cocoon.</p>
         <p>Sitemap entries for different types of generators</p>
   <source><![CDATA[
   <map:generators default="file">
  @@ -369,7 +368,7 @@
              <li>...</li>
           </ul>
         <p>Log Transformer is a good debugging tool.</p>
  -      <p>More transformers can be added without modifying @docname@.</p>
  +      <p>More transformers can be added without modifying Cocoon.</p>
         <p>Sitemap entries for different types of transformers</p>
   <source><![CDATA[
   <map:transformers default="xslt">
  @@ -402,7 +401,7 @@
              <li>XML Serializer</li>
              <li>...</li>
           </ul>
  -      <p>More serializers can be added without modifying @docname@.</p>
  +      <p>More serializers can be added without modifying Cocoon.</p>
         <p>Sitemap entries for different types of serializers</p>
   <source><![CDATA[
   <map:serializers default="html">
  @@ -441,7 +440,7 @@
         <p>Primary mechanism to add program logic (code) to XSPs.</p>
         <p>These need to be registered in configuration file cocoon.xconf.</p>
         <p>Logicsheets are used by the generator to transform XML structure before generating program.</p>
  -      <p>@docname@ comes with a no. of built-in logic sheets:</p>
  +      <p>Cocoon comes with a no. of built-in logic sheets:</p>
           <ul>
              <li>request.xsl</li>
              <li>response.xsl</li>
  @@ -489,17 +488,17 @@
     </s1>
     <anchor id="cocoon-configuration"/>
     <s1 title="@Name@ Configuration.">
  -    <p>@docname@ is highly configurable. Main configuration files, assuming @docname@ deployment as a servlet in a servlet container, are (directory locations assume Tomcat servlet container):</p>
  +    <p>Cocoon is highly configurable. Main configuration files, assuming Cocoon deployment as a servlet in a servlet container, are (directory locations assume Tomcat servlet container):</p>
       <ul>
          <li><code>sitemap.xmap</code>: the sitemap file. By default, located in <code>$TOMCAT_HOME/webapps/cocoon</code> directory.</li>
          <li><code>cocoon.xconf</code>: configuration file having logicsheet registrations. Specifies, sitemap.xmap location and other such parameters. By default, located in <code>$TOMCAT_HOME/webapps/cocoon</code> directory.</li>
          <li><code>web.xml</code>: servlet deployment descriptor. Specifies location of cocoon.xconf, log file location and other such parameters. Located in <code>$TOMCAT_HOME/webapps/cocoon/WEB-INF</code> directory.</li>
  -       <li><code>cocoon.roles</code>: mapping file for Core @docname@ components name and implementation classes. For example, if you want to use a parser other than the default one, you need to modify this file.</li>
  +       <li><code>cocoon.roles</code>: mapping file for Core Cocoon components name and implementation classes. For example, if you want to use a parser other than the default one, you need to modify this file.</li>
       </ul>
     </s1>
     <anchor id="work-area"/>
     <s1 title="@Name@ Work Area">
  -    <p>@docname@ produces execution log entries for debugging/auditing.</p>
  +    <p>Cocoon produces execution log entries for debugging/auditing.</p>
       <ul>
          <li>The amount of data to be logged can be controlled by
          log-level parameter in web.xml file. The default is DEBUG
  @@ -508,7 +507,7 @@
          <code>$TOMCAT_HOME/webapps/cocoon/WEB-INF/logs/cocoon.log</code>.</li>
       </ul>
   
  -    <p>@docname@ keeps the generated .java files in a directory tree
  +    <p>Cocoon keeps the generated .java files in a directory tree
       starting at (by default):<br/>
       <code>$TOMCAT_HOME/webapps/work/localhost_8080%2Fcocoon/org/apache/cocoon/www</code>.</p>
   
  @@ -519,7 +518,7 @@
     <anchor id="use-with-tomcat"/>
     <s1 title="Use with Tomcat">
       <p>Download Tomcat from Apache site.</p>
  -    <p>Download @docname@ sources from Apache CVS. [Command assume UNIX Bourne shell]</p>
  +    <p>Download Cocoon sources from Apache CVS. [Command assume UNIX Bourne shell]</p>
   <source><![CDATA[
   export CVSROOT=:pserver:anoncvs@cvs.apache.org:/home/cvspublic 
   cvs login 
  @@ -528,7 +527,7 @@
   ]]></source>
       <p>Build sources as per instruction in Install file.</p>
       <p>Move the <code>cocoon.war</code> file to <code>$TOMCAT_HOME/webapps</code> directory.</p>
  -    <p>Start the servlet engine. Type-in the URL <code>http://localhost:8080/cocoon</code> in your browser. You should see the @docname@ welcome message.</p>
  +    <p>Start the servlet engine. Type-in the URL <code>http://localhost:8080/cocoon</code> in your browser. You should see the Cocoon welcome message.</p>
       <p>Consult Install file if you face problems.</p>
     </s1>
   </body>
  
  
  
  1.1.2.2   +1 -1      xml-cocoon2/documentation/xdocs/who.xml
  
  Index: who.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/who.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- who.xml	2001/10/05 09:31:12	1.1.2.1
  +++ who.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -13,7 +13,7 @@
   
    <s1 title="Who we are">
     <p>
  -    The @docname@ Project operates on a meritocracy: the more you do, the more 
  +    The Apache Cocoon Project operates on a meritocracy: the more you do, the more 
       responsibility you will obtain. This page lists all of the people who have 
       gone the extra mile and are Committers. If you would like to get involved, 
       the first step is to join the mailing lists. 
  
  
  
  1.2.2.2   +20 -20    xml-cocoon2/documentation/xdocs/xsp-internals.xml
  
  Index: xsp-internals.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/xsp-internals.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- xsp-internals.xml	2001/10/05 09:31:12	1.2.2.1
  +++ xsp-internals.xml	2001/10/25 07:43:49	1.2.2.2
  @@ -13,7 +13,7 @@
    <body>
      <s1 title="Index">
        <p>
  -       This document presents @docname@'s dynamic markup language
  +       This document presents Apache Cocoon's dynamic markup language
          framework and its use in implementing XSP:
        </p>
   
  @@ -25,7 +25,7 @@
          </li>
          <li>
            <link href="#cocoon-generators">
  -           XSP and @docname@ Generators
  +           XSP and Cocoon Generators
            </link>
          </li>
          <li>
  @@ -127,9 +127,9 @@
    </s1>
   
    <anchor id="cocoon-generators"/>
  - <s1 title="XSP and @docname@ Generators">
  + <s1 title="XSP and Cocoon Generators">
     <p>
  -    As a rule, XSP pages are translated into @docname@
  +    As a rule, XSP pages are translated into Cocoon
       <link href="javadocs/org/apache/cocoon/generators/Generator.html">
         <code>Generator</code>'s.
       </link>
  @@ -141,7 +141,7 @@
         <link href="javadocs/org/apache/cocoon/generators/ServerPagesGenerator.html">
           <code>ServerPagesGenerator</code>,
         </link>
  -      a proxy that uses @docname@'s
  +      a proxy that uses Cocoon's
         <link href="#program-generator"><code>ProgramGenerator</code></link>
         component to load pages and subsequently delegates actual SAX event
         generation to them.
  @@ -149,10 +149,10 @@
     
       <note>
         The terms <code>Generator</code> and <code>ProgramGenerator</code> are
  -      somewhat confusing. Here, <code>Generator</code> refers to a @docname@
  +      somewhat confusing. Here, <code>Generator</code> refers to a Cocoon
         <code>org.apache.cocoon.generators.Generator</code> instance responsible
  -      for the initial feeding of @docname@'s SAX pipeline.
  -      <code>ProgramGenerator</code>, on the other hand, refers to a @docname@
  +      for the initial feeding of Cocoon's SAX pipeline.
  +      <code>ProgramGenerator</code>, on the other hand, refers to a Cocoon
         component responsible for building and executing programs derived from XML
         documents containing dynamic markup:
         <link href="javadocs/org/apache/cocoon/components/language/generator/ProgramGenerator.html">
  @@ -294,9 +294,9 @@
        <code>ServerPagesGenerator</code> to assert whether dynamic content should
        not be regenerated for a given request. The default implementation
        unconditionally returns <code>true</code>, but can be overridden by XSP
  -     pages based on their interpretation of the @docname@ <code>request</code>
  +     pages based on their interpretation of the Cocoon <code>request</code>
        object.  This is an <em>experimental</em> feature that will become
  -     meaningful only when a SAX-event caching mechanism is added to @docname@.
  +     meaningful only when a SAX-event caching mechanism is added to Cocoon.
      </p>
    
      <p>
  @@ -311,7 +311,7 @@
    <anchor id="programming-language"/>
    <s1 title="The Programming Language Processor">
      <p>
  -     A @docname@'s
  +     A Cocoon's
        <link href="javadocs/org/apache/cocoon/components/language/programming/ProgrammingLanguage.html">
          <code>ProgrammingLanguage</code>
        </link>
  @@ -801,9 +801,9 @@
      </s2>
   
      <anchor id="class-loader"/>
  -   <s2 title="The @docname@ Class Loader">
  +   <s2 title="The Cocoon Class Loader">
        <p>
  -       To circumvent standard Java class loaders limitation, @docname@ provides a
  +       To circumvent standard Java class loaders limitation, Cocoon provides a
          simple customized class loader
          <link href="javadocs/org/apache/cocoon/components/classloader/RepositoryClassLoader.html">
          (<code>RepositoryClassLoader</code>)
  @@ -921,7 +921,7 @@
   
      <note>
        Despite being supported by BSF, Rhino Javascript is separately
  -     supported by @docname@ as a compiled language in order to take
  +     supported by Cocoon as a compiled language in order to take
        advantage of automatic class reloading and persistent class file
        storage.
      </note>
  @@ -940,7 +940,7 @@
    <anchor id="markup-language"/>
    <s1 title="The Markup Language Processor">
      <p>
  -     A @docname@'s
  +     A Cocoon's
        <link
        href="javadocs/org/apache/cocoon/components/language/markup/MarkupLanguage.html">
          <code>MarkupLanguage</code>
  @@ -1030,7 +1030,7 @@
        The current code generation strategy is DOM-based. In principle,
        this is adequate because document preprocessing may need random
        access to document nodes. Code generation is being reconsidered,
  -     however, to overcome this and make it possible to reuse @docname@'s
  +     however, to overcome this and make it possible to reuse Cocoon's
        SAX-based filtering pipeline.
      </note>
   
  @@ -1399,11 +1399,11 @@
        <p>
          XSP for Java currently provides only 2 builtin logicsheets:
          <code>request</code> and <code>response</code>, associated
  -       with their corresponding @docname@ counterparts.
  +       with their corresponding Cocoon counterparts.
        </p>
   
        <note>
  -       A mechanism is needed for @docname@ to pass additional objects
  +       A mechanism is needed for Cocoon to pass additional objects
          to XSP pages. In particular, for the servlet execution
          environment, access to servlet objects is a must.
        </note>
  @@ -1413,7 +1413,7 @@
    <anchor id="dom-xsp"/>
    <s1 title="The DOM-XSP Markup Language">
      <p>
  -     The new, SAX-based XSP version for @doctitle@ is not backwards
  +     The new, SAX-based XSP version for Cocoon is not backwards
        compatible with its DOM-based former self.
      </p>
   
  @@ -1575,7 +1575,7 @@
    <s1 title="Named Components">
      <p>
        In order to support pluggable markup and programming languages,
  -     a new abstraction was added to @docname@'s <code>arch</code>
  +     a new abstraction was added to Cocoon's <code>arch</code>
        core interfaces:
        <link href="javadocs/org/apache/arch/named/NamedComponent.html">
          <code>NamedComponent</code>.
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/xsp.xml
  
  Index: xsp.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/xsp.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- xsp.xml	2001/10/05 09:31:12	1.1.2.1
  +++ xsp.xml	2001/10/25 07:43:49	1.1.2.2
  @@ -15,13 +15,13 @@
                     not together), I give you a list of pointers in the sequence you should read
                     them.</p> 
                   <ol>
  -                  <li>Get @doctitle@ <link href="installing.html">up and running</link>. Surf
  +                  <li>Get Cocoon <link href="installing.html">up and running</link>. Surf
                   to <code>[webhost]/cocoon/slides/slides?section=4</code> and following. This
                   gives you a first insight in the XSP ground idea.</li>
                   <li>Read the XSP Logicsheets page. This tells you how to use and make
                     your own XSP logicsheets and XSP pages.</li>
                   <li>If you're still hungry for more, read the XSP Internals page. This
  -                  describes how XSP's are handled internally by @docname@.</li>
  +                  describes how XSP's are handled internally by Cocoon.</li>
                   </ol>
            </s1> 
     </body>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/book.xml,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- book.xml	2001/10/16 14:33:01	1.2.2.2
  +++ book.xml	2001/10/25 07:43:50	1.2.2.3
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ User Documentation" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon User Documentation" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +4 -4      xml-cocoon2/documentation/xdocs/userdocs/actions/actions.xml
  
  Index: actions.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/actions/actions.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- actions.xml	2001/10/16 14:42:18	1.1.2.1
  +++ actions.xml	2001/10/25 07:43:50	1.1.2.2
  @@ -4,24 +4,24 @@
   <document>
   	<header>
   		<title>Actions</title>
  -		<subtitle>in @doctitle@</subtitle>
  +		<subtitle>in Cocoon</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes all available actions of @doctitle@.</abstract>
  +		 <abstract>This document describes all available actions of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Goal">
  -			<p>This document lists all available actions of @doctitle@ and
  +			<p>This document lists all available actions of Apache Cocoon and
                        describes their purpose.</p>
   		 </s1>
   		 <s1 title="Overview">
   			<p>Forthcoming...
         	      </p>
   		 </s1>
  -		 <s1 title="The Actions in @doctitle@">
  +		 <s1 title="The Actions in Apache Cocoon">
   			<p>Forthcoming...
         	      </p>
   <!--			<ul>
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/actions/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/actions/book.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- book.xml	2001/10/16 14:42:18	1.1.2.1
  +++ book.xml	2001/10/25 07:43:50	1.1.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Matchers" 
  +<book software="Apache Cocoon" 
  +      title="Apache CocoonMatchers" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.3.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/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	2001/10/05 09:31:15	1.3.2.1
  +++ book.xml	2001/10/25 07:43:51	1.3.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Generators" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Generators" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/directory-generator.xml
  
  Index: directory-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/directory-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- directory-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ directory-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Directory Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the directory generator of @docname@.</abstract>
  +		 <abstract>This document describes the directory generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Directory Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/extractor-generator.xml
  
  Index: extractor-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/extractor-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- extractor-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ extractor-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Fragment Extractor Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the fragment extractor generator of @docname@</abstract>
  +		 <abstract>This document describes the fragment extractor generator of Cocoon</abstract>
   	</header>
   	<body>
   		<s1 title="Fragment Extractor Generator">
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/file-generator.xml
  
  Index: file-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/file-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- file-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ file-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -3,13 +3,13 @@
   
   <document>
   	<header>
  -		<title>File Generator in @doctitle@</title>
  +		<title>File Generator</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the file generator of @docname@.</abstract>
  +		 <abstract>This document describes the file generator of Cocoon.</abstract>
   	</header>
   	<body>
   		 <s1 title="File Generator">
  
  
  
  1.3.2.2   +4 -4      xml-cocoon2/documentation/xdocs/userdocs/generators/generators.xml
  
  Index: generators.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/generators.xml,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- generators.xml	2001/10/05 09:31:15	1.3.2.1
  +++ generators.xml	2001/10/25 07:43:51	1.3.2.2
  @@ -3,17 +3,17 @@
   
   <document>
   	<header>
  -		<title>Generators in @doctitle@</title>
  +		<title>Generators in Cocoon</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes all available generators of @docname@.</abstract>
  +		 <abstract>This document describes all available generators of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Goal">
  -			<p>This document lists all available generators of @doctitle@ and
  +			<p>This document lists all available generators of Apache Cocoon and
                        describes their purpose.</p>
   		 </s1>
   		 <s1 title="Overview">
  @@ -23,7 +23,7 @@
                        see <link href="../../sitemap.html">the sitemap</link>.
         	      </p>
   		 </s1>
  -		 <s1 title="The Generators in @doctitle@">
  +		 <s1 title="The Generators in Apache Cocoon">
   			<ul>
   				<li><link href="file-generator.html">File Generator</link> (The default generator)</li>
   				<li><link href="html-generator.html">HTML Generator</link> (optional)</li>
  
  
  
  1.1.2.2   +3 -3      xml-cocoon2/documentation/xdocs/userdocs/generators/html-generator.xml
  
  Index: html-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/html-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- html-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ html-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -3,13 +3,13 @@
   
   <document>
   	<header>
  -		<title>HTML Generator in @doctitle@</title>
  +		<title>HTML Generator</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the html generator of @docname@.</abstract>
  +		 <abstract>This document describes the html generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="HTML Generator">
  @@ -17,7 +17,7 @@
   	               It acts similar to the file generator with the difference that it reads
                        html documents and converts them using jtidy to xhtml.</p>
   			<p>This generator is optional and requires the jtidy package
  -                     in the lib directory when building @docname@. However,
  +                     in the lib directory when building Cocoon. However,
                        the distribution includes this package already.</p>
   			<ul>
   				<li>Name : html</li>
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml
  
  Index: imagedirectory-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/imagedirectory-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- imagedirectory-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ imagedirectory-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Image Directory Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the image directory generator of @docname@.</abstract>
  +		 <abstract>This document describes the image directory generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Image Directory Generator">
  
  
  
  1.3.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/jsp-generator.xml
  
  Index: jsp-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/jsp-generator.xml,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- jsp-generator.xml	2001/10/05 09:31:15	1.3.2.1
  +++ jsp-generator.xml	2001/10/25 07:43:51	1.3.2.2
  @@ -3,13 +3,13 @@
   
   <document>
   	<header>
  -		<title>JSP Generator in @doctitle@</title>
  +		<title>JSP Generator</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the jsp generator of @docname@.</abstract>
  +		 <abstract>This document describes the jsp generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="JSP Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/php-generator.xml
  
  Index: php-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/php-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- php-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ php-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Php Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the php generator of @docname@.</abstract>
  +		 <abstract>This document describes the php generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Php Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/request-generator.xml
  
  Index: request-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/request-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- request-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ request-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
       <header>
           <title>Request Generator</title>
  -        <subtitle>in @doctitle@</subtitle>
           <version>0.9</version>
           <type>Technical document</type>
           <authors>
               <person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
            </authors>
  -         <abstract>This document describes the request generator of @docname@.</abstract>
  +         <abstract>This document describes the request generator of Cocoon.</abstract>
       </header>
       <body>
           <s1 title="Request Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/script-generator.xml
  
  Index: script-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/script-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- script-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ script-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Script Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the script generator of @docname@.</abstract>
  +		 <abstract>This document describes the script generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Script Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/serverpages-generator.xml
  
  Index: serverpages-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/serverpages-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- serverpages-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ serverpages-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Server Pages Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the server pages generator of @docname@.</abstract>
  +		 <abstract>This document describes the server pages generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Server Pages Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/status-generator.xml
  
  Index: status-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/status-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- status-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ status-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Status Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the status generator of @docname@.</abstract>
  +		 <abstract>This document describes the status generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Status Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/stream-generator.xml
  
  Index: stream-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/stream-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- stream-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ stream-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,14 +4,13 @@
   <document>
   	<header>
   		<title>Stream Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
               	<person name="Kinga Dziembowska" email="kingadziembowska@msn.com"/>
   			<person name="Davanum Srinivas" email="dims@yahoo.com"/>
   		 </authors>
  -		 <abstract>This document describes the stream generator of @docname@.</abstract>
  +		 <abstract>This document describes the stream generator of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Stream Generator">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/generators/velocity-generator.xml
  
  Index: velocity-generator.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/velocity-generator.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- velocity-generator.xml	2001/10/05 09:31:15	1.1.2.1
  +++ velocity-generator.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Velocity Generator</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the file velocity of @docname@.</abstract>
  +		 <abstract>This document describes the file velocity of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Velocity Generator">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/matchers/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/matchers/book.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- book.xml	2001/10/16 14:42:18	1.1.2.1
  +++ book.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Matchers" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Matchers" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  1.1.2.4   +13 -13    xml-cocoon2/documentation/xdocs/userdocs/matchers/matchers.xml
  
  Index: matchers.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/matchers/matchers.xml,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- matchers.xml	2001/10/19 11:13:48	1.1.2.3
  +++ matchers.xml	2001/10/25 07:43:51	1.1.2.4
  @@ -4,37 +4,37 @@
   <document>
   	<header>
   		<title>Matchers</title>
  -		<subtitle>in @doctitle@</subtitle>
  +		<subtitle>in Cocoon</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   			<person name="Gianugo Rabellino" email="gianugo@rabellino.it"/>
   		 </authors>
  -		 <abstract>This document describes all available matchers of @docname@.</abstract>
  +		 <abstract>This document describes all available matchers of Cocoon.</abstract>
   	</header>
   	<body>
   		 <s1 title="Goal">
   			<p>
  -      This document lists all available matchers of @docname@ and
  +      This document lists all available matchers of Apache Cocoon and
         describes their purpose.
         </p>
   		 </s1>
   		 <s1 title="Overview">
   			<p>
  -      Matchers are a core component of @docname@. These powerful sitemap
  -      components allow @docname@ to associate a pure
  +      Matchers are a core component of Cocoon. These powerful sitemap
  +      components allow Cocoon to associate a pure
         "virtual" URI space to a given set of instructions that describe
         how to generate, transform and present the requested resource(s) to
         the client.
         </p>
         <p>
  -      @docname@ is driven by the client request. A request typically
  +      Cocoon is driven by the client request. A request typically
         contains a URI, some parameters, cookies, and much more. The 
  -      request, along with the @docname@ environment, is the entry 
  +      request, along with the Cocoon environment, is the entry 
         point to decide what will be the sitemap instructions to be 
         used. The mechanism to decide what will be the instruction 
  -      driving the @docname@ process for a given request
  +      driving the Cocoon process for a given request
         is based on matching a request element against a pattern given
         as a matcher's parameter. If the match operation is successful
         processing starts.
  @@ -73,7 +73,7 @@
   		 </s1>
        <s1 title="Order">
          <p>
  -       It's important to understand that @docname@ is based on a "first match"
  +       It's important to understand that Cocoon is based on a "first match"
          approach. The request is matched against the different "map:match"
          entries in the order in which they are specified in the sitemap: as soon
          as a match is successful the pipeline is chosen and started. This means
  @@ -100,7 +100,7 @@
        </s1>
        <s1 title="Wildcard and regular expressions">
          <p>
  -       Most of @docname@ matchers are built using two different techniques:
  +       Most of Cocoon matchers are built using two different techniques:
          regular expressions and wildcards.
          Regular expressions (or regexps) are a well known and powerful 
          system for pattern matching: learning to master them it's outside 
  @@ -109,8 +109,8 @@
          </p>
          <p>
          While being so powerful, regexps can just be overkill for most of 
  -       typical @docname@ use cases where only simple matching operations
  -       have to be performed. This is why @docname@ offers a simplified
  +       typical Cocoon use cases where only simple matching operations
  +       have to be performed. This is why Cocoon offers a simplified
          pattern matching system based on a small set of very simple rules:
          </p>
          <ul>
  @@ -141,7 +141,7 @@
           </li>
          </ul>
        </s1>
  -		 <s1 title="The Matchers in @docname@">
  +		 <s1 title="The Matchers in Cocoon">
          <ul>
   				 <li><strong>WildCard URI matcher</strong>(The default matcher): matches the URI against a wildcard pattern</li>
   				 <li><strong>Regexp URI matcher:</strong> 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/selectors/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/selectors/book.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- book.xml	2001/10/16 14:42:18	1.1.2.1
  +++ book.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Selectors" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Selectors" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  1.1.2.3   +6 -7      xml-cocoon2/documentation/xdocs/userdocs/selectors/selectors.xml
  
  Index: selectors.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/selectors/selectors.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- selectors.xml	2001/10/19 11:13:48	1.1.2.2
  +++ selectors.xml	2001/10/25 07:43:51	1.1.2.3
  @@ -4,25 +4,24 @@
   <document>
   	<header>
   		<title>Selectors</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   			<person name="Gianugo Rabellino" email="gianugo@rabellino.it"/>
   		 </authors>
  -		 <abstract>This document describes all available selectors of @doctitle@.</abstract>
  +		 <abstract>This document describes all available selectors of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Goal">
   			<p>
  -      This document lists all available selectors of @doctitle@ and
  +      This document lists all available selectors of Apache Cocoon and
         describes their purpose.
         </p>
   		 </s1>
   		 <s1 title="Overview">
   			<p>
  -      Selectors in @docname@ have a role similar to matchers 
  +      Selectors in Apache Cocoon have a role similar to matchers 
         while being more flexible. Like matchers they are designed
         to test something against a part of the environment (the
         request URI, headers, cookies and so on), but unlike matchers
  @@ -73,9 +72,9 @@
   </source>
         
   		 </s1>
  -		 <s1 title="The Selectors in @doctitle@">
  +		 <s1 title="The Selectors in Cocoon">
   			<p>
  -      These are the available Selectors in @doctitle@:
  +      These are the available Selectors in Cocoon:
         </p>
   			<ul>
   				<li><strong>BrowserSelector</strong>: matches the value of the "test"
  @@ -89,7 +88,7 @@
           against the Host request header</li>
   
   				<li><strong>ParameterSelector</strong>: matches the string specified
  -        in the "test" parameter against a specified @docname@ internal
  +        in the "test" parameter against a specified Cocoon internal
           (e.g. sitemap) parameter;</li>
   
   				<li><strong>HeaderSelector</strong>: same as the Parameter selector,
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/book.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- book.xml	2001/10/05 09:31:16	1.2.2.1
  +++ book.xml	2001/10/25 07:43:51	1.2.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Serializers" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Serializers" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/html-serializer.xml
  
  Index: html-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/html-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- html-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ html-serializer.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -3,13 +3,13 @@
   
   <document>
   	<header>
  -		<title>HTML Serializer in @doctitle@</title>
  +		<title>HTML Serializer</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the html serializer of @docname@.</abstract>
  +		 <abstract>This document describes the html serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		 <s1 title="HTML Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/link-serializer.xml
  
  Index: link-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/link-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- link-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ link-serializer.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Link Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the link serializer of @docname@.</abstract>
  +		 <abstract>This document describes the link serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Link Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/pcl-serializer.xml
  
  Index: pcl-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/pcl-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- pcl-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ pcl-serializer.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,14 +4,13 @@
   <document>
       <header>
           <title>PCL Serializer</title>
  -        <subtitle>in @doctitle@</subtitle>
           <version>0.9</version>
           <type>Technical document</type>
           <authors>
               <person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
         <person name="John Morrison" email="john.morrison@uk.experian.com"/>
            </authors>
  -         <abstract>This document describes the pcl serializer of @docname@.</abstract>
  +         <abstract>This document describes the pcl serializer of Cocoon.</abstract>
       </header>
       <body>
           <s1 title="PCL Serializer">
  
  
  
  1.1.2.2   +5 -6      xml-cocoon2/documentation/xdocs/userdocs/serializers/pdf-serializer.xml
  
  Index: pdf-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/pdf-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- pdf-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ pdf-serializer.xml	2001/10/25 07:43:51	1.1.2.2
  @@ -4,14 +4,13 @@
   <document>
       <header>
           <title>PDF Serializer</title>
  -        <subtitle>in @doctitle@</subtitle>
           <version>0.9</version>
           <type>Technical document</type>
           <authors>
               <person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
         <person name="John Morrison" email="john.morrison@uk.experian.com"/>
            </authors>
  -         <abstract>This document describes the pdf serializer of @docname@.</abstract>
  +         <abstract>This document describes the pdf serializer of Cocoon.</abstract>
       </header>
       <body>
           <s1 title="PDF Serializer">
  @@ -27,18 +26,18 @@
               </ul>
           </s1>
           <s1 title="FOP and Embedding Fonts">
  -          <p>Dynamically generating a pdf file (with embeded fonts) in @docname@
  +          <p>Dynamically generating a pdf file (with embeded fonts) in Cocoon
               is basically 8 steps:</p>
             <ol>
               <li>Create the font(s) metric file(s).</li>
  -            <li>Create a custom configuration file for FOP (@docname@s PDF renderer)
  +            <li>Create a custom configuration file for FOP (Cocoons PDF renderer)
                 which tells it what fonts are available and where to find them.</li>
               <li>Create your xml (left as an exercise for the reader ;)</li>
               <li>Create your xslt (again, up to you)</li>
               <li>In the sitemap, tell the fo2pdf serializer where your custom
                 configuration file is located.</li>
               <li>Add a match for your pdf (I'm sure you can do the rest...).</li>
  -            <li>Start @docname@.</li>
  +            <li>Start Cocoon.</li>
               <li>Request your pdf.</li>
             </ol>
             <p>Easy yeah? OK. Step-by-step...</p>
  @@ -70,7 +69,7 @@
   
               <s3 title="Generating the Arial metrics">
                 <p>Start a command session (as appropriate to your env) then change
  -                to @docname@ libs directory.</p>
  +                to Cocoon libs directory.</p>
                 <source>$ cd cocoon\lib</source>
                 <p>create the metrics directory (D:\fop-fonts)</p>
                 <source>$ mkdir d:\fop-fonts</source>
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/ps-serializer.xml
  
  Index: ps-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/ps-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ps-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ ps-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,14 +4,13 @@
   <document>
       <header>
           <title>PS Serializer</title>
  -        <subtitle>in @doctitle@</subtitle>
           <version>0.9</version>
           <type>Technical document</type>
           <authors>
               <person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
         <person name="John Morrison" email="john.morrison@uk.experian.com"/>
            </authors>
  -         <abstract>This document describes the ps serializer of @docname@.</abstract>
  +         <abstract>This document describes the ps serializer of Cocoon.</abstract>
       </header>
       <body>
           <s1 title="PS Serializer">
  
  
  
  1.2.2.2   +3 -4      xml-cocoon2/documentation/xdocs/userdocs/serializers/serializers.xml
  
  Index: serializers.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/serializers.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- serializers.xml	2001/10/05 09:31:16	1.2.2.1
  +++ serializers.xml	2001/10/25 07:43:52	1.2.2.2
  @@ -4,17 +4,16 @@
   <document>
   	<header>
   		<title>Serializers</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes all available serializers of @docname@.</abstract>
  +		 <abstract>This document describes all available serializers of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Goal">
  -			<p>This document lists all available serializers of @doctitle@ and
  +			<p>This document lists all available serializers of Apache Cocoon and
                        describes their purpose.</p>
   		 </s1>
   		 <s1 title="Overview">
  @@ -23,7 +22,7 @@
                        see <link href="../../sitemap.html">the sitemap</link>.
         	      </p>
   		 </s1>
  -		 <s1 title="The Serializers in @doctitle@">
  +		 <s1 title="The Serializers in Apache Cocoon">
   			<ul>
   				<li><link href="html-serializer.html">HTML Serializer</link> (The default serializer)</li>
   				<li><link href="xml-serializer.html">XML Serializer</link></li>
  
  
  
  1.1.2.2   +3 -3      xml-cocoon2/documentation/xdocs/userdocs/serializers/svg-serializer.xml
  
  Index: svg-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/svg-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- svg-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ svg-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -18,7 +18,7 @@
   					valid Scalable Vector Graphic documents (currently to the
   					2000-08-02 Candidate Recommendation specification) and
   					renders it to an image which is served just like any other
  -					document in @docname@.
  +					document in Cocoon.
   				</p>
   				<p>
   					Why would you want to do this? Well, charts can be produced from the
  @@ -27,7 +27,7 @@
   					beautified.
   				</p>
   				<note>
  -					For examples of this serializer, see the @docname@ welcome
  +					For examples of this serializer, see the Cocoon welcome
   					page in the distribution (<code>[cocoon2
   					root]/welcome</code>).
   				</note>
  @@ -66,7 +66,7 @@
   						stream is generated from the file <code>sample.svg</code>, which is
   						serialized using the <code>svg2jpeg</code> serializer. This
   						serializer is configured to use a specific transcoder. The MIME type
  -						is specified so that @docname@ can tell the client which type the
  +						is specified so that Cocoon can tell the client which type the
   						document is. It can be seen that in general the use of this
   						serializer is identical to that of the other serializers.
   					</p>
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/svgjpeg-serializer.xml
  
  Index: svgjpeg-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/svgjpeg-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- svgjpeg-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ svgjpeg-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>SVG/JPEG Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the svg/jpeg serializer of @docname@.</abstract>
  +		 <abstract>This document describes the svg/jpeg serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="SVG/JPEG Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/svgpng-serializer.xml
  
  Index: svgpng-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/svgpng-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- svgpng-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ svgpng-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>SVG/PNG Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the svg/png serializer of @docname@.</abstract>
  +		 <abstract>This document describes the svg/png serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="SVG/PNG Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml
  
  Index: svgxml-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/svgxml-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- svgxml-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ svgxml-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>SVG/XML Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the svg/xml serializer of @docname@.</abstract>
  +		 <abstract>This document describes the svg/xml serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="SVG/XML Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/text-serializer.xml
  
  Index: text-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/text-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- text-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ text-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Text Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the text serializer of @docname@.</abstract>
  +		 <abstract>This document describes the text serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Text Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/vrml-serializer.xml
  
  Index: vrml-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/vrml-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- vrml-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ vrml-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>VRML Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the vrml serializer of @docname@.</abstract>
  +		 <abstract>This document describes the vrml serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="VRML Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/wap-serializer.xml
  
  Index: wap-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/wap-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- wap-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ wap-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>WAP/WML Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the wap/wml serializer of @docname@.</abstract>
  +		 <abstract>This document describes the wap/wml serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="WML/WAP Serializer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/serializers/xml-serializer.xml
  
  Index: xml-serializer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/xml-serializer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- xml-serializer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ xml-serializer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>XML Serializer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the xml serializer of @docname@.</abstract>
  +		 <abstract>This document describes the xml serializer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="XML Serializer">
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/book.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- book.xml	2001/10/05 09:31:16	1.2.2.1
  +++ book.xml	2001/10/25 07:43:52	1.2.2.2
  @@ -1,7 +1,7 @@
   <?xml version="1.0"?>
   
  -<book software="@doctitle@" 
  -      title="@docname@ Transformers" 
  +<book software="Apache Cocoon" 
  +      title="Apache Cocoon Transformers" 
         copyright="@year@ The Apache Software Foundation">
   
     <menu label="Navigation">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml
  
  Index: cinclude-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- cinclude-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ cinclude-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>CInclude Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the CInclude transformer of @docname@.</abstract>
  +		 <abstract>This document describes the CInclude transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="CInclude Transformer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/extractor-transformer.xml
  
  Index: extractor-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/extractor-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- extractor-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ extractor-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Fragment Extractor Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the Fragment Extractor transformer of @docname@.</abstract>
  +		 <abstract>This document describes the Fragment Extractor transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Fragment Extractor Transformer">
  
  
  
  1.1.2.2   +2 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/filter-transformer.xml
  
  Index: filter-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/filter-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- filter-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ filter-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -3,7 +3,7 @@
   
   <document>
   	<header>
  -		<title>Filter Transformer in @doctitle@</title>
  +		<title>Filter Transformer</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
  @@ -11,7 +11,7 @@
   			<person name="Sven Beauprez" email="Sven.Beauprez@the-ecorp.com"/>
   			<person name="Davanum Srinivas" email="dims@yahoo.com"/>
   		 </authors>
  -		 <abstract>This document describes the Filter transformer of @docname@.</abstract>
  +		 <abstract>This document describes the Filter transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Filter Transformer">
  
  
  
  1.2.2.3   +5 -5      xml-cocoon2/documentation/xdocs/userdocs/transformers/i18n-transformer.xml
  
  Index: i18n-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/i18n-transformer.xml,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- i18n-transformer.xml	2001/10/24 09:33:50	1.2.2.2
  +++ i18n-transformer.xml	2001/10/25 07:43:52	1.2.2.3
  @@ -3,7 +3,7 @@
   
   <document>
   	<header>
  -		<title>I18n Transformer in @doctitle@</title>
  +		<title>I18n Transformer</title>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
  @@ -11,7 +11,7 @@
   		 </authors>
   		<abstract>
   		This document describes an approach for internationalization of XML
  -		documents within @docname@. It introduces some tags to markup text 
  +		documents within Cocoon. It introduces some tags to markup text 
   		that should be translated and a format for dictionaries.
   		The first proposal was made by Infozone Group (http://www.infozone-group.org).
   		</abstract>
  @@ -20,11 +20,11 @@
   		<s1 title="I18n Transformer">
   				<p>
   				Developing and maintaining multi-language sites is a common problem for web developers.
  -				The usage of XML and XSL makes this task much more easier, especially with @docname@'s 
  +				The usage of XML and XSL makes this task much more easier, especially with Cocoon's 
   				content, logic and presentation separation concept.
   				</p>
   				<p>
  -				This approach for internationalization (further - i18n) of XML documents within @docname@ 
  +				This approach for internationalization (further - i18n) of XML documents within Cocoon 
   				is based on a transformer - <link href="../../javadocs/org/apache/cocoon/transformation/I18nTransformer.html">
   						<code>I18nTransformer</code>
   					</link>
  @@ -383,7 +383,7 @@
   			<s2 title="Contacts">
   				<p>
   					Feel free to contact for any comments and improvement ideas either directly <link href="mailto:kpiroumian@flagship.ru">Konstantin Piroumian</link> 
  -					or through the <link href="../../mail-lists.html">@docname@ Mail List</link>.
  +					or through the <link href="../../mail-lists.html">Cocoon Mail List</link>.
   				</p>
   			</s2>
   		</s1>
  
  
  
  1.1.2.2   +2 -3      xml-cocoon2/documentation/xdocs/userdocs/transformers/ldap-transformer.xml
  
  Index: ldap-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/ldap-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- ldap-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ ldap-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>LDAP Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the LDAP transformer of @docname@.</abstract>
  +		 <abstract>This document describes the LDAP transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="LDAP Transformer">
  @@ -27,7 +26,7 @@
   			</ul>
   			<p>This transformer is optional and not available in the binary distribution.
                        However if you want to use it, you have to retrieve the jndi package,
  -                     copy the jar file into the lib directory of @docname@ and rebuild.
  +                     copy the jar file into the lib directory of Cocoon and rebuild.
                     </p>
                     <p>
    The file will be specified in a parameter tag in the sitemap pipeline to the
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/log-transformer.xml
  
  Index: log-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/log-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- log-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ log-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>Log Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the Log transformer of @docname@.</abstract>
  +		 <abstract>This document describes the Log transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Log Transformer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/readdomsession-transformer.xml
  
  Index: readdomsession-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/readdomsession-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- readdomsession-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ readdomsession-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,7 +4,6 @@
   <document>
   	<header>
   		<title>Read DOM Session Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
  @@ -12,7 +11,7 @@
   			<person name="Sven Beauprez" email="Sven.Beauprez@the-ecorp.com"/>
   			<person name="Davanum Srinivas" email="dims@yahoo.com"/>
   		 </authors>
  -		 <abstract>This document describes the read dom session transformer of @docname@.</abstract>
  +		 <abstract>This document describes the read dom session transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Read DOM Session Transformer">
  
  
  
  1.1.2.2   +2 -3      xml-cocoon2/documentation/xdocs/userdocs/transformers/sql-transformer.xml
  
  Index: sql-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/sql-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- sql-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ sql-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,7 +4,6 @@
   <document>
   <header>
   <title>SQL Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   <authors>
     <person name="Sven Beauprez" email="Sven.Beauprez@the-ecorp.com"/>
  @@ -86,7 +85,7 @@
   
          <title>Hello</title>
          <content>
  -        <para>This is my first @docname@ page filled with sql data!</para>
  +        <para>This is my first Cocoon page filled with sql data!</para>
   
           <execute-query xmlns="http://apache.org/cocoon/SQL/2.0"> 
            <query name="department">
  @@ -135,7 +134,7 @@
         <page xmlns:sql="http://apache.org/cocoon/SQL/2.0">
          <title>Hello</title>
          <content>
  -        <para>This is my first @docname@ page filled with sql data!</para>
  +        <para>This is my first Cocoon page filled with sql data!</para>
           <rowset nrofrows="2" name="department" 
         xmlns="http://apache.org/cocoon/SQL/2.0">
             <row>
  
  
  
  1.2.2.2   +3 -4      xml-cocoon2/documentation/xdocs/userdocs/transformers/transformers.xml
  
  Index: transformers.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/transformers.xml,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- transformers.xml	2001/10/05 09:31:16	1.2.2.1
  +++ transformers.xml	2001/10/25 07:43:52	1.2.2.2
  @@ -4,17 +4,16 @@
   <document>
   	<header>
   		<title>Transformers</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes all available transformers of @doctitle@.</abstract>
  +		 <abstract>This document describes all available transformers of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Goal">
  -			<p>This document lists all available transformers of @doctitle@ and
  +			<p>This document lists all available transformers of Apache Cocoon and
                        describes their purpose.</p>
   		 </s1>
   		 <s1 title="Overview">
  @@ -23,7 +22,7 @@
                        see <link href="../../sitemap.html">the sitemap</link>.
         	      </p>
   		 </s1>
  -		 <s1 title="The Transformers in @doctitle@">
  +		 <s1 title="The Transformers in Apache Cocoon">
   			<ul>
   				<li><link href="xslt-transformer.html">XSLT Transformer</link> (The default transformer)</li>
   				<li><link href="extractor-transformer.html">Fragment Extractor Transformer</link></li>
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/writedomsession-transformer.xml
  
  Index: writedomsession-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/writedomsession-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- writedomsession-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ writedomsession-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,7 +4,6 @@
   <document>
   	<header>
   		<title>Write DOM Session Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
  @@ -12,7 +11,7 @@
   			<person name="Sven Beauprez" email="Sven.Beauprez@the-ecorp.com"/>
   			<person name="Davanum Srinivas" email="dims@yahoo.com"/>
   		 </authors>
  -		 <abstract>This document describes the write dom session transformer of @docname@.</abstract>
  +		 <abstract>This document describes the write dom session transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="Write DOM Session Transformer">
  
  
  
  1.1.2.2   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/xinclude-transformer.xml
  
  Index: xinclude-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/xinclude-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- xinclude-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ xinclude-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>XInclude Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the XInclude transformer of @docname@.</abstract>
  +		 <abstract>This document describes the XInclude transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="XInclude Transformer">
  
  
  
  1.1.2.3   +1 -2      xml-cocoon2/documentation/xdocs/userdocs/transformers/xslt-transformer.xml
  
  Index: xslt-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/xslt-transformer.xml,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- xslt-transformer.xml	2001/10/10 16:56:37	1.1.2.2
  +++ xslt-transformer.xml	2001/10/25 07:43:52	1.1.2.3
  @@ -4,14 +4,13 @@
   <document>
   	<header>
   		<title>XSLT Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   			<person name="Sylvain Wallez" email="sylvain@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the xslt transformer of @docname@.</abstract>
  +		 <abstract>This document describes the xslt transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		 <s1 title="Trax/XSLT Transformer">
  
  
  
  1.1.2.2   +2 -3      xml-cocoon2/documentation/xdocs/userdocs/transformers/xt-transformer.xml
  
  Index: xt-transformer.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/xt-transformer.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- xt-transformer.xml	2001/10/05 09:31:16	1.1.2.1
  +++ xt-transformer.xml	2001/10/25 07:43:52	1.1.2.2
  @@ -4,13 +4,12 @@
   <document>
   	<header>
   		<title>XT Transformer</title>
  -		<subtitle>in @doctitle@</subtitle>
   		<version>0.9</version>
   		<type>Technical document</type>
   		<authors>
   			<person name="Carsten Ziegeler" email="cziegeler@apache.org"/>
   		 </authors>
  -		 <abstract>This document describes the XT transformer of @docname@.</abstract>
  +		 <abstract>This document describes the XT transformer of Cocoon.</abstract>
   	</header>
   	<body>
   		<s1 title="XT Transformer">
  @@ -18,7 +17,7 @@
                        which uses the xt transformer instead of a trax compatible
                        transformer.</p>
   			<p>This transformer is optional and requires the xt package
  -                     in the lib directory when building @docname@. However,
  +                     in the lib directory when building Cocoon. However,
                        the distribution includes this package already.</p>
   			<ul>
   				<li>Name : xt</li>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.3   +5 -5      xml-cocoon2/webapp/resources/entities/CatalogManager.properties
  
  Index: CatalogManager.properties
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/resources/entities/CatalogManager.properties,v
  retrieving revision 1.4.2.2
  retrieving revision 1.4.2.3
  diff -u -r1.4.2.2 -r1.4.2.3
  --- CatalogManager.properties	2001/09/06 17:19:26	1.4.2.2
  +++ CatalogManager.properties	2001/10/25 07:43:53	1.4.2.3
  @@ -1,9 +1,9 @@
   # CatalogManager.properties
   #
  -# This is the default properties file for @docname@. This facilitates local
  +# This is the default properties file for Apache Cocoon. This facilitates local
   # configuration of application-specific catalogs.
   #
  -# @docname@ will automatically load a default catalog from
  +# Apache Cocoon will automatically load a default catalog from
   #  webapps/cocoon/resources/entities/catalog
   #
   # See the documentation (catalog.html).
  @@ -31,17 +31,17 @@
   prefer=public
   
   # static-catalog ... see the Sun doco
  -#  TODO: ? what impact does this setting have for @docname@
  +#  TODO: ? what impact does this setting have for Apache Cocoon
   #
   static-catalog=yes
   
   # allow-oasis-xml-catalog-pi ... see the Sun doco
  -#  TODO: ? what impact does this setting have for @docname@
  +#  TODO: ? what impact does this setting have for Apache Cocoon
   #
   allow-oasis-xml-catalog-pi=yes
   
   # catalog-class-name ... specify an alternate class name to use
  -#  @docname@ does not need this setting - we already have a named class
  +#  Apache Cocoon does not need this setting - we already have a named class
   #
   # catalog-class-name=com.sun.resolver.Resolver
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +1 -1      xml-cocoon2/webapp/sub/stylesheets/error2html.xsl
  
  Index: error2html.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/webapp/sub/stylesheets/error2html.xsl,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- error2html.xsl	2001/08/24 01:22:24	1.2.2.1
  +++ error2html.xsl	2001/10/25 07:43:53	1.2.2.2
  @@ -22,7 +22,7 @@
         <xsl:value-of select="translate(error:notify/error:extra[2],'&#13;',' ')"/>
       </pre>
       <font face="Verdana" size="-2">
  -      Brought to you by <a href="http://xml.apache.org/cocoon2/">@docname@</a> in no time!
  +      Brought to you by <a href="http://xml.apache.org/cocoon2/">Apache Cocoon</a> in no time!
       </font>
     </body>
   </html>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message