Author: markt Date: Fri Mar 6 14:25:36 2009 New Revision: 750915 URL: http://svn.apache.org/viewvc?rev=750915&view=rev Log: Fix spelling errors
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Mar 6 14:25:36 2009 @@ -1 +1 @@ -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,747834,748344 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,748344 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Mar 6 14:25:36 2009 @@ -95,12 +95,6 @@ code a warning that it won't be there in the next version. -1: -* Fix spelling errors reported on users and dev list - http://svn.apache.org/viewvc?rev=746321&view=rev - http://svn.apache.org/viewvc?rev=746384&view=rev - +1: markt, mturk, fhanik, jim - -1: - * Fix error in 2.5 web.xml XSD http://svn.apache.org/viewvc?rev=747863&view=rev +1: markt, fhanik, jim Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_2.dtd?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== Binary files - no diff available. Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_3.dtd?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== Binary files - no diff available. Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd Fri Mar 6 14:25:36 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 concatenate 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. @@ -452,7 +452,7 @@ element, depending on which style is used. The order in which filters are invoked is the order in which filter-mapping declarations that match a request URI for a - servlet appear in the list of filter-mapping elements.The + servlet appear in the list of filter-mapping elements. The filter-name value must be the value of the filter-name sub-elements of one of the filter declarations in the deployment descriptor. @@ -874,7 +874,7 @@ The servletType is used to declare a servlet. It contains the declarative data of a servlet. If a jsp-file is specified and the load-on-startup - element is present, then the JSP should be precompiled and + element is present, then the JSP should be pre-compiled and loaded. Used in: web-app @@ -915,7 +915,7 @@ The load-on-startup element indicates that this servlet should be loaded (instantiated and have - its init() called) on the startup of the web + its init() called) on the start-up of the web application. The optional contents of these element must be an integer indicating the order in which the servlet should be loaded. If the value Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_5.xsd Fri Mar 6 14:25:36 2009 @@ -82,7 +82,7 @@ session-config, jsp-config, and login-config. When there are multiple elements of welcome-file-list or locale-encoding-mapping-list, the container must - concatenate the element contents. The multiple occurence + concatenate 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. @@ -363,7 +363,7 @@ which filters are invoked is the order in which filter-mapping declarations that match a request URI for a servlet appear in the list of filter-mapping - elements.The filter-name value must be the value of the + elements. The filter-name value must be the value of the filter-name sub-elements of one of the filter declarations in the deployment descriptor. </xsd:documentation> @@ -702,7 +702,7 @@ <xsd:documentation> The load-on-startup element indicates that this servlet should be loaded (instantiated and have - its init() called) on the startup of the web + its init() called) on the start-up of the web application. The optional contents of these element must be an integer indicating the order in which the servlet should be loaded. If the Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebRuleSet.java Fri Mar 6 14:25:36 2009 @@ -512,7 +512,7 @@ throws Exception { if (isLoginConfigSet){ throw new IllegalArgumentException( - "<login-config> element is limited to 1 occurance"); + "<login-config> element is limited to 1 occurrence"); } isLoginConfigSet = true; } @@ -533,7 +533,7 @@ throws Exception { if (isJspConfigSet){ throw new IllegalArgumentException( - "<jsp-config> element is limited to 1 occurance"); + "<jsp-config> element is limited to 1 occurrence"); } isJspConfigSet = true; } @@ -554,7 +554,7 @@ throws Exception { if (isSessionConfigSet){ throw new IllegalArgumentException( - "<session-config> element is limited to 1 occurance"); + "<session-config> element is limited to 1 occurrence"); } isSessionConfigSet = true; } Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=750915&r1=750914&r2=750915&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Mar 6 14:25:36 2009 @@ -294,6 +294,9 @@ <fix> Fix possible synchronisation bottleneck in cookie creation. (markt) </fix> + <fix> + Fix various spelling errors reported on the mailing lists. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org