cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shan...@apache.org
Subject cvs commit: xml-cocoon2/src/documentation/xdocs/userdocs/concepts databases.xml sitemap.xml
Date Fri, 07 Jun 2002 20:02:34 GMT
shannon     2002/06/07 13:02:34

  Modified:    src/documentation/xdocs/userdocs/concepts Tag:
                        cocoon_2_0_3_branch databases.xml sitemap.xml
  Log:
  sync with head
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +9 -9      xml-cocoon2/src/documentation/xdocs/userdocs/concepts/databases.xml
  
  Index: databases.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/databases.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- databases.xml	28 Apr 2002 20:06:15 -0000	1.1.2.1
  +++ databases.xml	7 Jun 2002 20:02:34 -0000	1.1.2.2
  @@ -16,13 +16,13 @@
   	  <p>
   		Publishing dynamic content or creating web-applications at
   		some point often involves database access. Apache Cocoon
  -		offers a number of different facilities to access databases,
  -		(object) relational and XML. This document aims to give an
  -		overview over the different choices to access (object)
  +		offers a number of different facilities to access
  +		(object) relational and XML databases. This document provides
  +		an overview of the different ways to access (object)
   		relational databases.
   	  </p>
   	  <p>
  -		This document will not explain how to setup database
  +		This document will not explain how to set up database
   		connectivity with Apache Cocoon. For this, see <link
   		  href="../../developing/datasources.html">here.</link>
   	  </p>
  @@ -37,14 +37,14 @@
   
   	<s1 title="Actions">
   	  <p>
  -		<link href="actions.html">Actions</link> are code that is executed
  -		during pipeline setup and its outcome can change how the pipeline is
  -		assembled. This way a pipeline can for example contain an alternative
  +		<link href="actions.html">Actions</link> are code to be executed
  +		during pipeline setup. The outcome of an action can change how the pipeline is
  +		assembled. For exampl, a pipeline may produce an alternative
   		page to display when a database operation failed.
   	  </p>
   	  <p>
  -		Actions are especially great to insert, change, or delete data. By
  -		using the pipeline switching feature of actions, pages can be simpler
  +		Actions are especially great for inserting, changing, or deleting data. 
  +		When pipeline switching features of actions are used, pages can be simpler
   		as they are only concerned with one view - either successful operation
   		or failure.
   	  </p>
  
  
  
  1.3.2.2   +2 -5      xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml
  
  Index: sitemap.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- sitemap.xml	17 May 2002 05:03:09 -0000	1.3.2.1
  +++ sitemap.xml	7 Jun 2002 20:02:34 -0000	1.3.2.2
  @@ -568,11 +568,8 @@
      </s2>
      <s2 title="Aggregating">
       <p>
  -     Beside defining one generator which produces xml content you can define an aggregator.
  -     An aggregator has one more parts defining the sources of xml content.
  -     The parts of an aggregator are merged being the xml content of the aggregator.
  -     The name of the parent element of all merged-in parts is defines by the attribute
  -     element in side the aggregate element.
  +An aggregator produces XML content. It is composed of one or more parts, each of which
defined by an XML source. During pipeline processing, all parts of an aggregator are merged.
  +The name of the parent element which contains the merged XML content from each part is
defined by the value of the map:aggregate's attribute called element.
       </p>
       <p>
        You can define an aggregator in places where you define a generator. Defining an aggregator
  
  
  

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