More typos

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

diff --git a/java/javax/servlet/resources/web-app_2_2.dtd b/java/javax/servlet/resources/web-app_2_2.dtd
index 87fbdaf..bc80ca2 100644 (file)
--- a/java/javax/servlet/resources/web-app_2_2.dtd
+++ b/java/javax/servlet/resources/web-app_2_2.dtd
@@ -94,7 +94,7 @@ The param-value element contains the value of a parameter.
 <!--
 The servlet element 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 loaded.
+present, then the JSP should be pre-compiled and loaded.
 -->
 
 <!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
@@ -130,7 +130,7 @@ initialization param of the servlet
 
 <!--
 The load-on-startup element indicates that this servlet should be
-loaded on the startup of the web application. The optional contents of
+loaded on the start-up of the web application. The optional contents of
 these element must be a positive integer indicating the order in which
 the servlet should be loaded. Lower integers are loaded before higher
 integers. If no value is specified, or if the value specified is not a
@@ -509,7 +509,7 @@ application package.
 <!--
 The ID mechanism is to allow tools to easily make tool-specific
 references to the elements of the deployment descriptor. This allows
-tools that produce additional deployment information (i.e information
+tools that produce additional deployment information (i.e. information
 beyond the standard deployment descriptor information) to store the
 non-standard information in a separate file, and easily refer from
 these tools-specific files to the information in the standard web-app

diff --git a/java/javax/servlet/resources/web-app_2_3.dtd b/java/javax/servlet/resources/web-app_2_3.dtd
index 25fd506..3b57005 100644 (file)
--- a/java/javax/servlet/resources/web-app_2_3.dtd
+++ b/java/javax/servlet/resources/web-app_2_3.dtd
@@ -230,7 +230,7 @@ during deployment.
 env-entry-type)>
 
 <!--
-The env-entry-name element contains the name of a web applications's
+The env-entry-name element contains the name of a web application's
 environment entry.  The name is a JNDI name relative to the
 java:comp/env context.  The name must be unique within a web application.
 
@@ -336,7 +336,7 @@ to apply it matches filter-mapping declarations either on servlet-name,
 or on url-pattern for each filter-mapping 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 filter-name
+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.
 
@@ -460,7 +460,7 @@ Used in: listener
 
 <!--
 The load-on-startup element indicates that this servlet should be
-loaded (instantiated and have its init() called) on the startup
+loaded (instantiated and have 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 is a negative integer,

diff --git a/java/javax/servlet/resources/web-app_2_4.xsd b/java/javax/servlet/resources/web-app_2_4.xsd
index fe21d84..c3b6b1c 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 occurrence
+       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

diff --git a/java/javax/servlet/resources/web-app_2_5.xsd b/java/javax/servlet/resources/web-app_2_5.xsd
index 2c73b8a..fcb4bca 100644 (file)
--- a/java/javax/servlet/resources/web-app_2_5.xsd
+++ b/java/javax/servlet/resources/web-app_2_5.xsd
@@ -82,7 +82,7 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
                 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 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
                 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 @@ http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
                     <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