Return-Path: 
 <cvs-return-27118-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 27039 invoked from network); 6 May 2006 20:38:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 6 May 2006 20:38:14 -0000
Received: (qmail 64100 invoked by uid 500); 6 May 2006 20:38:14 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 64040 invoked by uid 500); 6 May 2006 20:38:13 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 64028 invoked by uid 99); 6 May 2006 20:38:13 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 May 2006 13:38:13 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sat, 06 May 2006 13:38:13 -0700
Received: (qmail 26863 invoked by uid 65534); 6 May 2006 20:37:52 -0000
Message-ID: <20060506203752.26862.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r400367 -
 /cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
Date: Sat, 06 May 2006 20:37:52 -0000
To: cvs@cocoon.apache.org
From: antonio@apache.org
X-Mailer: svnmailer-1.0.8
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: antonio
Date: Sat May  6 13:37:52 2006
New Revision: 400367

URL: http://svn.apache.org/viewcvs?rev=400367&view=rev
Log:
Merge from 2.2.

Modified:
    cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf

Modified: cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf?rev=400367&r1=400366&r2=400367&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/webapp/WEB-INF/cocoon.xconf Sat May  6 13:37:52 2006
@@ -212,7 +212,8 @@
 
     <!--+
         | Following five modules definitions, 'defaults', 'myxml',
-        | 'slashdot' '' and '', are used only in the samples.
+        | 'slashdot' 'random-100-to-500' and 'random-5000-to-10000',
+        | are used only in the samples.
         +-->
     <component-instance logger="core.modules.input" name="defaults"     class="org.apache.cocoon.components.modules.input.DefaultsModule">
       <values>