Fix spelling

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@746321 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/javax/servlet/resources/web-app_2_4.xsd b/java/javax/servlet/resources/web-app_2_4.xsd
index 9ab8490..fe21d84 100644 (file)
--- a/java/javax/servlet/resources/web-app_2_4.xsd
+++ b/java/javax/servlet/resources/web-app_2_4.xsd
@@ -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.

diff --git a/java/org/apache/catalina/startup/WebRuleSet.java b/java/org/apache/catalina/startup/WebRuleSet.java
index 16c1423..951b79a 100644 (file)
--- a/java/org/apache/catalina/startup/WebRuleSet.java
+++ b/java/org/apache/catalina/startup/WebRuleSet.java
@@ -539,7 +539,7 @@ final class SetLoginConfig extends Rule {
         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;
     }
@@ -560,7 +560,7 @@ final class SetJspConfig extends Rule {
         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;
     }
@@ -581,7 +581,7 @@ final class SetSessionConfig extends Rule {
         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;
     }