Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 14939 invoked from network); 20 Feb 2009 18:38:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Feb 2009 18:38:11 -0000 Received: (qmail 55423 invoked by uid 500); 20 Feb 2009 18:38:10 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 54681 invoked by uid 500); 20 Feb 2009 18:38:07 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 54670 invoked by uid 99); 20 Feb 2009 18:38:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Feb 2009 10:38:07 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [98.136.44.59] (HELO smtp104.prem.mail.sp1.yahoo.com) (98.136.44.59) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 20 Feb 2009 18:37:58 +0000 Received: (qmail 54448 invoked from network); 20 Feb 2009 18:37:37 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Received:X-YMail-OSG:X-Yahoo-Newman-Property:Message-Id:From:To:In-Reply-To:Content-Type:Content-Transfer-Encoding:Mime-Version:Subject:Date:References:X-Mailer; b=PbHL+H65VgnaNDtMawELuW2/BRGYwnVVpchJKJf1/2bsQA00LbxSZks6YSZ9LDFP2dJLzOvHag6m2JV6twoa1hQzonzZym/tD5n++Dn9X+/TQDYexL0JAPgnJQarkuJ9NvGXp/SOcqeMTbQrBnZMC0JOtuCPH0TfMexScEadvjY= ; Received: from unknown (HELO ?10.11.55.44?) (david_jencks@76.76.148.215 with plain) by smtp104.prem.mail.sp1.yahoo.com with SMTP; 20 Feb 2009 18:37:36 -0000 X-YMail-OSG: eoLqtXkVM1k.n06GfSL4SK6J.n8jifnNEGOo6qM8TmEEnNa3iF3DkgTNwjqp5YLcmDyFJv876QA9eEzouXDvLyOGhWYro.jARvkIY.QPEo49tI47Et.4LybDjnVthoU_B2PZ1xuc6nncB6Eksc6W26MqJW9w6z8O5wbWDOj61a4n_Rh9DX5fwEqJIZ_TGsccysRr8Wziwsp6QOb0jIGyMHH6f__1rmFU8NXOHrAW2Lmpz4SUEnq5hwYohoL21ohewibCwSS_34MQvtFM9H.otedywco- X-Yahoo-Newman-Property: ymail-3 Message-Id: <11593FB3-2819-408D-AFF5-4B94DED376ED@yahoo.com> From: David Jencks To: "Tomcat Developers List" In-Reply-To: <20090220181729.D7BB523888A2@eris.apache.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Subject: Re: svn commit: r746321 - in /tomcat/trunk/java: javax/servlet/resources/web-app_2_4.xsd org/apache/catalina/startup/WebRuleSet.java Date: Fri, 20 Feb 2009 10:37:35 -0800 References: <20090220181729.D7BB523888A2@eris.apache.org> X-Mailer: Apple Mail (2.930.3) X-Virus-Checked: Checked by ClamAV on apache.org umm, concatinate >> concatenate david jencks On Feb 20, 2009, at 10:17 AM, markt@apache.org wrote: > Author: markt > Date: Fri Feb 20 18:17:29 2009 > New Revision: 746321 > > URL: http://svn.apache.org/viewvc?rev=746321&view=rev > Log: > Fix spelling > > Modified: > tomcat/trunk/java/javax/servlet/resources/web-app_2_4.xsd > tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java > > Modified: tomcat/trunk/java/javax/servlet/resources/web-app_2_4.xsd > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/resources/web-app_2_4.xsd?rev=746321&r1=746320&r2=746321&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- tomcat/trunk/java/javax/servlet/resources/web-app_2_4.xsd > (original) > +++ tomcat/trunk/java/javax/servlet/resources/web-app_2_4.xsd Fri > Feb 20 18:17:29 2009 > @@ -99,7 +99,7 @@ > file must not contain multiple elements of session-config, > jsp-config, and login-config. When there are multiple elements of > welcome-file-list or locale-encoding-mapping-list, the container > - must concatinate the element contents. The multiple occurance > + must concatinate the element contents. The multiple occurrence > of the element distributable is redundant and the container > treats that case exactly in the same way when there is only > one distributable. > > Modified: tomcat/trunk/java/org/apache/catalina/startup/ > WebRuleSet.java > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=746321&r1=746320&r2=746321&view=diff > = > = > = > = > = > = > = > = > ====================================================================== > --- tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java > (original) > +++ tomcat/trunk/java/org/apache/catalina/startup/WebRuleSet.java > Fri Feb 20 18:17:29 2009 > @@ -539,7 +539,7 @@ > throws Exception { > if (isLoginConfigSet){ > throw new IllegalArgumentException( > - " element is limited to 1 occurance"); > + " element is limited to 1 occurrence"); > } > isLoginConfigSet = true; > } > @@ -560,7 +560,7 @@ > throws Exception { > if (isJspConfigSet){ > throw new IllegalArgumentException( > - " element is limited to 1 occurance"); > + " element is limited to 1 occurrence"); > } > isJspConfigSet = true; > } > @@ -581,7 +581,7 @@ > throws Exception { > if (isSessionConfigSet){ > throw new IllegalArgumentException( > - " element is limited to 1 occurance"); > + " element is limited to 1 occurrence"); > } > isSessionConfigSet = true; > } > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org > For additional commands, e-mail: dev-help@tomcat.apache.org > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org