- Comet support allows a servlet to process IO aynchronously, receiving
+ Comet support allows a servlet to process IO asynchronously, receiving
events when data is available for reading on the connection (rather than
always using a blocking read), and writing data back on connections
- asychnonously (most likely responding to some event raised from some
+ asynchronously (most likely responding to some event raised from some
other source).
@@ -74,7 +74,7 @@
fields using the request and response objects. Between the end of the processing
of this event, and the beginning of the processing of the end or error events,
it is possible to use the response object to write data on the open connection.
- Note that the response object and depedent OutputStream and Writer are still
+ Note that the response object and dependent OutputStream and Writer are still
not synchronized, so when they are accessed by multiple threads,
synchronization is mandatory. After processing the initial event, the request
is considered to be committed.
diff --git a/webapps/docs/appdev/build.xml.txt b/webapps/docs/appdev/build.xml.txt
index 37952a10d..d074939a0 100644
--- a/webapps/docs/appdev/build.xml.txt
+++ b/webapps/docs/appdev/build.xml.txt
@@ -29,7 +29,7 @@
src Java source code (and associated resource files)
to be compiled to the "WEB-INF/classes"
- subdirectory of your web applicaiton.
+ subdirectory of your web application.
web Static HTML, JSP, and other content (such as
image files), including the WEB-INF subdirectory
diff --git a/webapps/docs/appdev/introduction.xml b/webapps/docs/appdev/introduction.xml
index 69ca1b110..b71e7a294 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -63,7 +63,7 @@ information, documentation, and software that is useful in developing
web applications with Tomcat.
http://java.sun.com/products/jsp/download.html -
- JavaServer Pages (JSP) Specfication, Version 2.0. Describes
+ JavaServer Pages (JSP) Specification, Version 2.0. Describes
the programming environment provided by standard implementations
of the JavaServer Pages (JSP) technology. In conjunction with
the Servlet API Specification (see below), this document describes
diff --git a/webapps/docs/appdev/source.xml b/webapps/docs/appdev/source.xml
index cb938ff1a..6280adb0c 100644
--- a/webapps/docs/appdev/source.xml
+++ b/webapps/docs/appdev/source.xml
@@ -240,7 +240,7 @@ archive file so you can distribute your application. A well-constructed
build.xml file will contain internal documentation describing
the targets that are designed for use by the developer, versus those targets
used internally. To ask Ant to display the project documentation, change to
-the directory containing the build.xml flie and type:
+the directory containing the build.xml file and type:
ant -projecthelp
diff --git a/webapps/docs/appdev/web.xml.txt b/webapps/docs/appdev/web.xml.txt
index 81b6371ef..b54c61a2d 100644
--- a/webapps/docs/appdev/web.xml.txt
+++ b/webapps/docs/appdev/web.xml.txt
@@ -96,7 +96,7 @@
submits in the app will be submitted to a request URI like
"saveCustomer.do", which will therefore be mapped to this servlet.
- The initialization parameter namess for this servlet are the
+ The initialization parameter names for this servlet are the
"servlet path" that will be received by this servlet (after the
filename extension is removed). The corresponding value is the
name of the action class that will be used to process this request.
diff --git a/webapps/docs/apr.xml b/webapps/docs/apr.xml
index eb9e690a3..0191b3ff9 100644
--- a/webapps/docs/apr.xml
+++ b/webapps/docs/apr.xml
@@ -149,8 +149,8 @@
- When APR is enabled, the HTTP connector will use sendfile for hadling large static files (all such
- files will be sent ansychronously using high performance kernel level calls), and will use
+ When APR is enabled, the HTTP connector will use sendfile for handling large static files (all such
+ files will be sent asynchronously using high performance kernel level calls), and will use
a socket poller for keepalive, increasing scalability of the server.
@@ -264,7 +264,7 @@
- Pass phrase for the encrypted private key. If "SSLPassword" is not provided, the callback fonction
+ Pass phrase for the encrypted private key. If "SSLPassword" is not provided, the callback function
should prompt for the pass phrase.
diff --git a/webapps/docs/architecture/overview.xml b/webapps/docs/architecture/overview.xml
index 9fc9e19a3..13d03ae48 100644
--- a/webapps/docs/architecture/overview.xml
+++ b/webapps/docs/architecture/overview.xml
@@ -126,9 +126,9 @@ including commercial ones.
In recent releases of Tomcat, mostly starting with Tomcat 5,
-we have begun effots to make more aspects of Tomcat managable via
+we have begun efforts to make more aspects of Tomcat manageable via
JMX. In addition, the Manager and Admin webapps have been greatly
-enhanced and improved. Managability is a primary area of concern
+enhanced and improved. Manageability is a primary area of concern
for us as the product matures and the specification becomes more
stable.
diff --git a/webapps/docs/architecture/requestProcess.xml b/webapps/docs/architecture/requestProcess.xml
index 405bb4889..ee96a1b4c 100644
--- a/webapps/docs/architecture/requestProcess.xml
+++ b/webapps/docs/architecture/requestProcess.xml
@@ -55,7 +55,7 @@ A UML sequence diagram of the request process is available
The Servlet Specification provides many opportunities for
-listening in (using Listeners) or modiying (using Filters)
+listening in (using Listeners) or modifying (using Filters)
the request handling process even before the request arrives
at the servlet that will handle it.
diff --git a/webapps/docs/architecture/startup/serverStartup.txt b/webapps/docs/architecture/startup/serverStartup.txt
index e85dcf3e8..b40dbd4c9 100644
--- a/webapps/docs/architecture/startup/serverStartup.txt
+++ b/webapps/docs/architecture/startup/serverStartup.txt
@@ -62,7 +62,7 @@ What it does:
XML-object mapping tool, that will create the objects defined in server.xml
Startup of the actual container has not started yet.
b5) Assigns System.out and System.err to the SystemLogHandler class
- b6) Calls intialize on all components, this makes each object register itself with the
+ b6) Calls initialize on all components, this makes each object register itself with the
JMX agent.
During the process call the Connectors also initialize the adapters.
The adapters are the components that do the request pre-processing.
@@ -124,7 +124,7 @@ What it does:
invokes the invoke() method on the Host pipeline (StandardHost.getPipeLine())
d9) the StandardHost has two valves by default, the StandardHostValve and the ErrorReportValve
d10) The standard host valve associates the correct class loader with the current thread
- It also retrives the Manager and the session associated with the request (if there is one)
+ It also retrieves the Manager and the session associated with the request (if there is one)
If there is a session access() is called to keep the session alive
d11) After that the StandardHostValve invokes the pipeline on the context associated
with the request.
@@ -132,20 +132,7 @@ What it does:
valve. Then the StandardContextValve gets invoke.
The StandardContextValve invokes any context listeners associated with the context.
Next it invokes the pipeline on the Wrapper component (StandardWrapperValve)
- d13) During the invokation of the StandardWrapperValve, the JSP wrapper (Jasper) gets invoked
+ d13) During the invocation of the StandardWrapperValve, the JSP wrapper (Jasper) gets invoked
This results in the actual compilation of the JSP.
And then invokes the actual servlet.
- e) Invokation of the servlet class
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ e) Invocation of the servlet class
diff --git a/webapps/docs/balancer-howto.xml b/webapps/docs/balancer-howto.xml
index d704c06bd..8d6016c73 100644
--- a/webapps/docs/balancer-howto.xml
+++ b/webapps/docs/balancer-howto.xml
@@ -52,7 +52,7 @@ Please refer to the JK 1.2.x documentation.
Please refer to the mod_proxy documentation for Apache HTTP Server 2.2. This supports either
-HTTP or AJP load balancing. This new version of mod_proxy is also useable with
+HTTP or AJP load balancing. This new version of mod_proxy is also usable with
Apache HTTP Server 2.0, but mod_proxy will have to be compiled separately using the code
from Apache HTTP Server 2.2.
diff --git a/webapps/docs/class-loader-howto.xml b/webapps/docs/class-loader-howto.xml
index c49437550..f88e13d85 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -149,7 +149,7 @@ All other class loaders in Tomcat 6 follow the usual delegation pattern.
loading looks in the following repositories, in this order:
Bootstrap classes of your JVM
-
System class loader classses (described above)
+
System class loader classes (described above)
/WEB-INF/classes of your web application
/WEB-INF/lib/*.jar of your web application
$CATALINA_HOME/lib
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index 43d373e43..d84ecf685 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -161,7 +161,7 @@ should be completed:
What is important to mention here, is that session replication is only the beginning of clustering.
- Another popular concept used to implement clusters is farming, ie, you deploy your apps only to one
+ Another popular concept used to implement clusters is farming, i.e., you deploy your apps only to one
server, and the cluster will distribute the deployments across the entire cluster.
This is all capabilities that can go into with the FarmWarDeployer (s. cluster example at server.xml)
In the next section will go deeper into how session replication works and how to configure it.
@@ -186,7 +186,7 @@ should be completed:
One of the most important performance considerations is the synchronous versus asynchronous replication.
In a synchronous replication mode the request doesn't return until the replicated session has been
sent over the wire and reinstantiated on all the other cluster nodes.
- Synchronous vs asynchronous is configured using the channelSendOptions
+ Synchronous vs. asynchronous is configured using the channelSendOptions
flag and is an integer value. The default value for the SimpleTcpCluster/DeltaManager combo is
8, which is asynchronous. You can read more on the send flag(overview) or the
send flag(javadoc).
@@ -218,7 +218,7 @@ should be completed:
Hint:
With attribute sessionIdAttribute you can change the request attribute name that included the old session id.
- Default attribuite name is org.apache.catalina.cluster.session.JvmRouteOrignalSessionID.
+ Default attribute name is org.apache.catalina.cluster.session.JvmRouteOrignalSessionID.
Trick:
diff --git a/webapps/docs/config/ajp.xml b/webapps/docs/config/ajp.xml
index b4053c799..26a5fe4e6 100644
--- a/webapps/docs/config/ajp.xml
+++ b/webapps/docs/config/ajp.xml
@@ -120,8 +120,8 @@
The standard protocol value for an AJP connector is AJP/1.3
which uses an auto-switching mechanism to select either a Java based
connector or an APR/native based connector. If the
- PATH(Windows) or LD_LIBRARY_PATH (on most unix
- system) environment variables contain the Tomcat native library, the
+ PATH (Windows) or LD_LIBRARY_PATH (on most unix
+ systems) environment variables contain the Tomcat native library, the
native/APR connector will be used. If the native library cannot be
found, the Java based connector will be used.
To use an explicit protocol rather than rely on the auto-switching
@@ -188,7 +188,7 @@
This specifies if the encoding specified in contentType should be used
for URI query parameters, instead of using the URIEncoding. This
setting is present for compatibility with Tomcat 4.1.x, where the
- encoding specified in the contentType, or explicitely set using
+ encoding specified in the contentType, or explicitly set using
Request.setCharacterEncoding method was also used for the parameters from
the URL. The default value is false.
@@ -202,7 +202,7 @@
Set this attribute to true to cause Tomcat to advertise
- support for the Srevlet specification using the header recommended in the
+ support for the Servlet specification using the header recommended in the
specification. The default value is false.
@@ -303,7 +303,7 @@
-
If true and a secret has been configured, a correctly fomatted AJP
+
If true and a secret has been configured, a correctly formatted AJP
request (that includes the secret) will shutdown the Tomcat instance
associated with this connector. This is set to false by
default.
@@ -323,7 +323,7 @@
-
If set to true, the authetication will be done in Tomcat.
+
If set to true, the authentication will be done in Tomcat.
Otherwise, the authenticated principal will be propagated from the native
webserver and used for authorization in Tomcat.
The default value is true.
diff --git a/webapps/docs/config/cluster-interceptor.xml b/webapps/docs/config/cluster-interceptor.xml
index b6db4a646..997f028f6 100644
--- a/webapps/docs/config/cluster-interceptor.xml
+++ b/webapps/docs/config/cluster-interceptor.xml
@@ -120,7 +120,7 @@
Size in bytes of the dispatch queue, the default value is 1024*1024*64 (64MB) sets the maximum queue size for the dispatch queue
- if the queue fills up, one can trigger the behavior, if alwaysSend is set to true, the mesage will be sent synchronously
+ if the queue fills up, one can trigger the behavior, if alwaysSend is set to true, the message will be sent synchronously
if the flag is false, an error is thrown
diff --git a/webapps/docs/config/cluster-membership.xml b/webapps/docs/config/cluster-membership.xml
index 46550beba..52fb1d069 100644
--- a/webapps/docs/config/cluster-membership.xml
+++ b/webapps/docs/config/cluster-membership.xml
@@ -127,7 +127,7 @@
- In case of a network failure, Java multicast socket don't transparently fail over, instead the socket will continously
+ In case of a network failure, Java multicast socket don't transparently fail over, instead the socket will continuously
throw IOException upon each receive request. When recoveryEnabled is set to true, this will close the multicast socket
and open a new socket with the same properties as defined above.
The default is true.
diff --git a/webapps/docs/config/cluster-receiver.xml b/webapps/docs/config/cluster-receiver.xml
index ff8abaef7..7b49937ae 100644
--- a/webapps/docs/config/cluster-receiver.xml
+++ b/webapps/docs/config/cluster-receiver.xml
@@ -102,7 +102,7 @@
The maximum number of threads in the receiver thread pool. The default value is 6
Adjust this value relative to the number of nodes in the cluster, the number of messages being exchanged and
- the hardware you are running on. A higher value doesn't mean more effiecency, tune this value according to your
+ the hardware you are running on. A higher value doesn't mean more efficiency, tune this value according to your
own test results.
diff --git a/webapps/docs/config/cluster-sender.xml b/webapps/docs/config/cluster-sender.xml
index 70ba9202f..27033294a 100644
--- a/webapps/docs/config/cluster-sender.xml
+++ b/webapps/docs/config/cluster-sender.xml
@@ -51,7 +51,7 @@
When is this useful? The simplest example we can think of is when part of your code is sending a 10MB message,
like a war file being deployed, and you need to push through a small 10KB message, say a session being replicated,
you don't have to wait for the 10MB message to finish, as a separate thread will push in the small message
- transmission at the same time. Currently there is no interrupt, pause or priority mechanism avaiable, but check back soon.
+ transmission at the same time. Currently there is no interrupt, pause or priority mechanism available, but check back soon.
@@ -61,7 +61,7 @@
you would set all the socket options for the outgoing messages. Please see its attributes below.
There are two implementations, in a similar manner to the receiver, one is non-blocking
based and the other is built using blocking IO.
- org.apache.catalina.tribes.transport.bio.PooledMultiSender is the blocking implemenation and
+ org.apache.catalina.tribes.transport.bio.PooledMultiSender is the blocking implementation and
org.apache.catalina.tribes.transport.nio.PooledParallelSender.
Parallel delivery is not available for the blocking implementation due to the fact that it is blocking a thread on sending data.
diff --git a/webapps/docs/config/cluster-valve.xml b/webapps/docs/config/cluster-valve.xml
index d1e7d9643..6045c28d1 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -33,7 +33,7 @@
A cluster valve is no different from any other Tomcat Valve.
- The cluster valves are interceptors in the invokation chain for HTTP requests, and the clustering implementation
+ The cluster valves are interceptors in the invocation chain for HTTP requests, and the clustering implementation
uses these valves to make intelligent decision around data and when data should be replicated.
Deprecated settings: In the previous version of Tomcat you were able to control session
manager settings using manager.<property>=value.
- This has been discontinued, as the way it was written interfers with
+ This has been discontinued, as the way it was written interferes with
the ability to support multiple different manager classes under one cluster implementation,
as the same properties might have the different effect on different managers.
For Tomcat 6, unlike Tomcat 4.x, it is NOT recommended to place
<Context> elements directly in the server.xml file. This
- is because it makes modifing the Context configuration
+ is because it makes modifying the Context configuration
more invasive since the main conf/server.xml file cannot be
reloaded without restarting Tomcat.
@@ -184,7 +184,7 @@
from a default context will be used.
If a symbolic link is used for docBase then changes to the
symbolic link will only be effective after a Tomcat restart or
- by undeploying and redeploying the conext. A context reload is not
+ by undeploying and redeploying the context. A context reload is not
sufficient.
@@ -474,7 +474,7 @@
If you use the standard Context implementation,
- the following configuration steps occur automtically when Catalina
+ the following configuration steps occur automatically when Catalina
is started, or whenever this web application is reloaded. No special
configuration is required to enable this feature.
Logical name of this Engine, used in log and error messages. When
- using muliple Service elements in the same
+ using multiple Service elements in the same
Server, each Engine MUST be assigned a unique
name.
@@ -196,7 +196,7 @@
nesting a Listener element inside this element. The
class name you specify must implement the
org.apache.catalina.LifecycleListener interface, and
- it will be notified about the occurrence of the coresponding
+ it will be notified about the occurrence of the corresponding
lifecycle events. Configuration of such a listener looks like this:
diff --git a/webapps/docs/config/filters.xml b/webapps/docs/config/filters.xml
index 462c055ab..99a329a92 100644
--- a/webapps/docs/config/filters.xml
+++ b/webapps/docs/config/filters.xml
@@ -76,7 +76,7 @@
-
The Add Default Character Set Filter does not support any initialisation
+
The Add Default Character Set Filter does not support any initialization
parameters
but does not require modification of the deployment
descriptor to customize this value.
-
The valid attriutes for a <Resource> element
+
The valid attributes for a <Resource> element
are as follows:
Specify whether the web Application code signs on to the
- corresponding resource manager programatically, or whether the
+ corresponding resource manager programmatically, or whether the
Container will sign on to the resource manager on behalf of the
application. The value of this attribute must be
Application or Container. This
diff --git a/webapps/docs/config/host.xml b/webapps/docs/config/host.xml
index ca89afe57..e36696209 100644
--- a/webapps/docs/config/host.xml
+++ b/webapps/docs/config/host.xml
@@ -171,7 +171,7 @@
Set to false if you want to disable parsing the context.xml
file embedded inside the application (located at /META-INF/context.xml).
- Security consious environments should set this to false to prevent
+ Security conscious environments should set this to false to prevent
applications from interacting with the container's configuration. The
administrator will then be responsible for providing an external context
configuration file, and put it in
@@ -181,7 +181,7 @@
Java class name of the error reporting valve which will be used
- by this Host. The responsability of this valve is to output error
+ by this Host. The responsibility of this valve is to output error
reports. Setting this property allows to customize the look of the
error pages which will be generated by Tomcat. This class must
implement the
@@ -248,7 +248,7 @@
A host is associated with the
org.apache.catalina.core.ContainerBase.[enginename].[hostname]
- log category. Note that the brackets are actuall part of the name,
+ log category. Note that the brackets are part of the name,
don't omit them.
@@ -311,7 +311,7 @@
that the updated WAR file will be re-expanded (note that the auto
deployer, if enabled, will automatically expand the updated WAR file
once the previously expanded directory is removed). Multi-level contexts
- may be defined by using #, eg use a WAR named foo#bar.war
+ may be defined by using #, e.g. use a WAR named foo#bar.war
for a context path of /foo/bar.
@@ -387,10 +387,10 @@
Host element in conf/server.xml, each
with its own set of web applications.
-
However, in some circumstances, it is desireable that two or more
+
However, in some circumstances, it is desirable that two or more
network names should resolve to the same virtual host,
running the same set of applications. A common use case for this
- scenario is a corporate web site, where it is desireable that users
+ scenario is a corporate web site, where it is desirable that users
be able to utilize either www.mycompany.com or
company.com to access exactly the same content and
applications.
@@ -420,7 +420,7 @@
nesting a Listener element inside this element. The
class name you specify must implement the
org.apache.catalina.LifecycleListener interface, and
- it will be notified about the occurrence of the coresponding
+ it will be notified about the occurrence of the corresponding
lifecycle events. Configuration of such a listener looks like this:
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 8b1129ae6..e787588e0 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -124,8 +124,8 @@
Sets the protocol to handle incoming traffic.
The default value is HTTP/1.1 which uses an auto-switching
mechanism to select either a blocking Java based connector or an
- APR/native based connector. If the PATH(Windows) or
- LD_LIBRARY_PATH (on most unix system) environment variables
+ APR/native based connector. If the PATH (Windows) or
+ LD_LIBRARY_PATH (on most unix systems) environment variables
contain the Tomcat native library, the native/APR connector will be used.
If the native library cannot be found, the blocking Java based connector
will be used. Please be advised that the native/APR connector has
@@ -212,7 +212,7 @@
This specifies if the encoding specified in contentType should be used
for URI query parameters, instead of using the URIEncoding. This
setting is present for compatibility with Tomcat 4.1.x, where the
- encoding specified in the contentType, or explicitely set using
+ encoding specified in the contentType, or explicitly set using
Request.setCharacterEncoding method was also used for the parameters from
the URL. The default value is false.
@@ -220,7 +220,7 @@
Set this attribute to true to cause Tomcat to use
- the IP address that the request was recieved on to determine the Host
+ the IP address that the request was received on to determine the Host
to send the request to. The default value is false.
@@ -512,7 +512,7 @@
(int)The time in milliseconds to timeout on a select() for the poller.
- This value is important, since connection clean up is done on the same thread, so dont set this
+ This value is important, since connection clean up is done on the same thread, so do not set this
value to an extremely high one. The default value is 1000 milliseconds.
Introduction - Overall description of this particular
component. There will be a corresponding Java interface (in
- the org.apache.catalina pacakge) that is implemented by one
+ the org.apache.catalina package) that is implemented by one
or more standard implementations.
Attributes - The set of attributes that are legal for
this element. Generally, this will be subdivided into Common
diff --git a/webapps/docs/config/listeners.xml b/webapps/docs/config/listeners.xml
index f9aaae299..f01de9820 100644
--- a/webapps/docs/config/listeners.xml
+++ b/webapps/docs/config/listeners.xml
@@ -97,7 +97,7 @@
The Jasper Listener initialises the Jasper 2 JSP engine
+
The Jasper Listener initializes the Jasper 2 JSP engine
before any web applications that may use it are loaded. For more
information on the Jasper 2 JSP engine see the
Jasper How To.
@@ -111,7 +111,7 @@
Server Lifecycle Listener
(org.apache.catalina.mbeans.ServerLifecycleListener)
-
The Server Lifecycle Listener initialises the
+
The Server Lifecycle Listener initializes the
MBeanServer for the MBeans that may be used to manager Tomcat via JMX.
Without this listener, none of the Tomcat MBeans will be available.
@@ -124,7 +124,7 @@
Global Resources Lifecycle Listener
(org.apache.catalina.mbeans.GlobalResourcesLifecycleListener)
-
The Global Resources Lifecycle Listener initialises the
+
The Global Resources Lifecycle Listener initializes the
Global JNDI resources defined in server.xml as part of the Global Resources element. Without this
listener, none of the Global Resources will be available.
- with the following system properties set (eg in setenv.sh):
+ with the following system properties set (e.g. in setenv.sh):
-Dcom.sun.management.jmxremote.password.file=${catalina.base}/conf/jmxremote.password
-Dcom.sun.management.jmxremote.access.file=${catalina.base}/conf/jmxremote.access
diff --git a/webapps/docs/config/manager.xml b/webapps/docs/config/manager.xml
index 8362b914f..a5ea9b092 100644
--- a/webapps/docs/config/manager.xml
+++ b/webapps/docs/config/manager.xml
@@ -140,7 +140,7 @@
Frequency of the session expiration, and related manager operations.
Manager operations will be done once for the specified amount of
- backgrondProcess calls (ie, the lower the amount, the more often the
+ backgrondProcess calls (i.e., the lower the amount, the more often the
checks will occur). The minimum value is 1, and the default value is 6.
@@ -296,7 +296,7 @@
<Store> element inside, which defines the
characteristics of the persistent data storage. Two implementations
of the <Store> element are currently available,
- with different characteristics, as described belowl
+ with different characteristics, as described below.
Whenver Catalina is shut down normally and restarted, or when an
+
Whenever Catalina is shut down normally and restarted, or when an
application reload is triggered, the standard Manager implementation
will attempt to serialize all currently active sessions to a disk
file located via the pathname attribute. All such saved
diff --git a/webapps/docs/config/realm.xml b/webapps/docs/config/realm.xml
index 14b91e902..2191c7914 100644
--- a/webapps/docs/config/realm.xml
+++ b/webapps/docs/config/realm.xml
@@ -567,12 +567,12 @@
-
A comma-seperated list of the names of the classes that you have made
+
A comma-separated list of the names of the classes that you have made
for your user Principals.
-
A comma-seperated list of the names of the classes that you have made
+
A comma-separated list of the names of the classes that you have made
for your role Principals.
@@ -623,10 +623,10 @@
failed authentication attempts in a given period of time.
To ensure correct operation, there is a reasonable degree of
- synchronisation in this Realm.
+ synchronization in this Realm.
This Realm does not require modification to the underlying Realms or the
- associated user storage mecahisms. It achieves this by recording all failed
+ associated user storage mechanisms. It achieves this by recording all failed
logins, including those for users that do not exist. To prevent a DOS by
deliberating making requests with invalid users (and hence causing this
cache to grow) the size of the list of users that have failed authentication
diff --git a/webapps/docs/config/resources.xml b/webapps/docs/config/resources.xml
index 78e3c73fe..62687f762 100644
--- a/webapps/docs/config/resources.xml
+++ b/webapps/docs/config/resources.xml
@@ -41,7 +41,7 @@
A unified caching engine is provided for all accesses to the webapp
resources made by the servlet container and web applications which use the
- container provided mechanisms to access such resources, such as class laoder
+ container provided mechanisms to access such resources, such as classloader
access, access through the ServletContext interface, or native
access through the DirectoryContext interface.
If false the requirements for escpaing quotes in JSP
+
If false the requirements for escaping quotes in JSP
attributes will be relaxed so that a missing required quote will not
cause an error. If not specified, the specification compliant default of
true will be used.
@@ -233,7 +233,7 @@
every request that is associated with a session will cause the
session's last accessed time to be updated regardless of whether or not
- the request explicity accesses the session. (SRV.7.6)
+ the request explicitly accesses the session. (SRV.7.6)
cookies will be parsed strictly, by default v0 cookies will not work with any invalid characters.
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index ef561a8b6..955731722 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -116,9 +116,10 @@
-
Deafult true. Flag to determine if log rotation should occur.
- If set to false, then this file is never rotated and
+
Flag to determine if log rotation should occur.
+ If set to false, then this file is never rotated and
fileDateFormat is ignored. Use with caution!
+ Default value: true
@@ -142,9 +143,9 @@
-
Deafult true. Flag to determine if logging will be buffered.
- If set to false, then access logging will be written after each
- request.
+
Flag to determine if logging will be buffered.
+ If set to false, then access logging will be written after each
+ request. Default value: true
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index fc2e83fe9..063a3ab40 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -124,7 +124,7 @@ The DefaultServlet allows the following initParamters:
If you wish to customize your directory listing, you
can use an XSL transformation. This value is an absolute
- file name which be used for all direcotory listings.
+ file name which be used for all directory listings.
This can be disabled by per webapp by also declaring the
default servlet in your local webapp's web.xml. The format
of the xml is shown below.
@@ -194,7 +194,7 @@ The DefaultServlet allows the following initParamters:
You can override DefaultServlet with you own implementation and use that
in your web.xml declaration. If you
-can undertand what was just said, we will assume yo can read the code
+can understand what was just said, we will assume you can read the code
to DefaultServlet servlet and make the appropriate adjustments. (If not,
then that method isn't for you)
- It is assumed the user will be familar with Apache Ant for using the TCD.
+ It is assumed the user will be familiar with Apache Ant for using the TCD.
Apache Ant is a scripted build tool. The TCD comes pre-packaged with a
build script to use. Only a modest understanding of Apache Ant is
required (installation as listed earlier in this page, and familiarity
@@ -266,8 +266,8 @@
The TCD uses an exploded web application as input (see the list of the
- properties used below). A web application that is programatically
- deployed with the deployer may include a Context Desciptor in
+ properties used below). A web application that is programmatically
+ deployed with the deployer may include a Context Descriptor in
/META-INF/context.xml.
- Users should be aware that wsdl4j.jar is licenced under CPL 1.0 and not the
+ Users should be aware that wsdl4j.jar is licensed under CPL 1.0 and not the
Apache License version 2.0.
It shall be possible to save the configured state of the running
Tomcat container such that this state can be reproduced when the
container is shut down and restarted.
-
Adminstrative commands to start up and shut down the overall
+
Administrative commands to start up and shut down the overall
Tomcat container are out of scope for the
purposes of these applications. It is assumed that other
(usually platform-specific) mechanisms will be used for container
@@ -272,7 +272,7 @@
described under "External Technologies", above.
Prompts and error messages must be internationalizable to multiple
languages.
-
Rendered HTML must be compatible with Netscape Navigator (verson 4.7
+
Rendered HTML must be compatible with Netscape Navigator (version 4.7
or later) and Internet Explorer (version 5.0 or later).
diff --git a/webapps/docs/funcspecs/fs-admin-objects.xml b/webapps/docs/funcspecs/fs-admin-objects.xml
index 42e86e831..c3e313703 100644
--- a/webapps/docs/funcspecs/fs-admin-objects.xml
+++ b/webapps/docs/funcspecs/fs-admin-objects.xml
@@ -226,7 +226,7 @@ Operations that can be performed when the administrative application is
An optional Loader representing default configuration
properties for the Loader component of deployed web applications.
An optional Manager representing default configuration
- properties for the Manager component fo deployed web applications.
+ properties for the Manager component of deployed web applications.
diff --git a/webapps/docs/funcspecs/fs-default.xml b/webapps/docs/funcspecs/fs-default.xml
index 71856b3c2..35601d9c3 100644
--- a/webapps/docs/funcspecs/fs-default.xml
+++ b/webapps/docs/funcspecs/fs-default.xml
@@ -211,7 +211,7 @@
On each HTTP PUT request processed by this servlet, the following
- processing shall be perfomred:
+ processing shall be performed:
If modifications to the static resources are not allowed (set by a
configuration parameter), return HTTP status 403 (forbidden).
diff --git a/webapps/docs/funcspecs/index.xml b/webapps/docs/funcspecs/index.xml
index 760c84a5d..29fcc35e3 100644
--- a/webapps/docs/funcspecs/index.xml
+++ b/webapps/docs/funcspecs/index.xml
@@ -55,7 +55,7 @@ in the menu (to the left):
NOTE - In some cases, the contents of these functional specs has
been "reverse engineered" from existing implementations. This exercise is
-stil useful, because it provides an introduction to what
+still useful, because it provides an introduction to what
Catalina does, without being as concerned with how this is
accomplished.
diff --git a/webapps/docs/html-manager-howto.xml b/webapps/docs/html-manager-howto.xml
index 5acf434b3..8c5e19400 100644
--- a/webapps/docs/html-manager-howto.xml
+++ b/webapps/docs/html-manager-howto.xml
@@ -85,7 +85,7 @@ application documentation.
applications and provides links for managing them. For each web application
the following is displayed:
-
Path - The web applicaton context path.
+
Path - The web application context path.
Display Name - The display name for the web application
if it has one configured in its "web.xml" file.
Running - Whether the web application is running and
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 3d3c11c7e..c96c35b87 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -121,7 +121,7 @@ Apache Tomcat 6, and using many of the Apache Tomcat features.
Using APR to provide superior performance, scalability and better
integration with native server technologies.
Virtual Hosting -
- Configuring vitual hosting in Apache Tomcat.
+ Configuring virtual hosting in Apache Tomcat.
Advanced IO -
Extensions available over regular, blocking IO.
Jasper 2 has been redesigned to significantly improve performance over
-the orignal Jasper. In addition to general code improvements the following
+the original Jasper. In addition to general code improvements the following
changes were made:
JSP Custom Tag Pooling - The java objects instantiated
@@ -57,7 +57,7 @@ the performance of JSP pages which use custom tags.
a JSP page which had already been compiled Jasper 2 can recompile that
page in the background. The previously compiled JSP page will still be
available to serve requests. Once the new page has been compiled
-successfully it will replace the old page. This helps improve availablity
+successfully it will replace the old page. This helps improve availability
of your JSP pages on a production server.
Recompile JSP when included page changes - Jasper 2
can now detect when a page included at compile time from a JSP has changed
@@ -142,7 +142,7 @@ valid bean class? true or false, default
true.
fork - Have Ant fork JSP page compiles so they are
-performed in a seperate JVM from Tomcat? true or
+performed in a separate JVM from Tomcat? true or
false, default true.
genStringAsCharArray - Should text strings be generated as char
diff --git a/webapps/docs/jndi-datasource-examples-howto.xml b/webapps/docs/jndi-datasource-examples-howto.xml
index a365aa7ee..9bf6445ce 100644
--- a/webapps/docs/jndi-datasource-examples-howto.xml
+++ b/webapps/docs/jndi-datasource-examples-howto.xml
@@ -50,7 +50,7 @@ JNDI-Resources-HOWTO. However, feedback from tomcat-user has
shown that specifics for individual configurations can be rather tricky.
Here then are some example configurations that have been posted to
-tomcat-user for popular databases and some general tips for db useage.
+tomcat-user for popular databases and some general tips for db usage.
You should be aware that since these notes are derived from configuration
and/or feedback posted to tomcat-user YMMV :-). Please let us
@@ -110,7 +110,7 @@ to a dB is more efficient than opening a new connection.
There is one problem with connection pooling. A web application has
-to explicetely close ResultSet's, Statement's, and Connection's.
+to explicitly close ResultSet's, Statement's, and Connection's.
Failure of a web application to close these resources can result in
them never being available again for reuse, a db connection pool "leak".
This can eventually result in your web application db connections failing
@@ -129,7 +129,7 @@ removed and recycled add the following attribute to the
removeAbandoned="true"
-When available db connections run low DBCP will recover and recyle
+When available db connections run low DBCP will recover and recycle
any abandoned dB connections it finds. The default is false.
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index f73e3f493..95c1bbcd5 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -49,7 +49,7 @@
java.util.logging or
Log4J.
Commons Logging provides Tomcat the ability to log
- hierarchially across various log levels without needing to rely on a particular
+ hierarchically across various log levels without needing to rely on a particular
logging implementation.
@@ -159,7 +159,7 @@
- The default implemenatation of java.util.logging provided in the JDK is too limited to be
+ The default implementation of java.util.logging provided in the JDK is too limited to be
useful. A limitation of JDK Logging appears to be the inability to have per-web application logging,
as the configuration is per-VM. As a result, Tomcat will, in the default configuration,
replace the default LogManager implementation with a container friendly implementation
diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 5736b14a6..3b0ff1f0c 100644
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -248,7 +248,7 @@ the host and port appropriately for your installation.
absolute path of a web application Context configuration ".xml"
file which contains the Context configuration element.
directory - The directory name for the web
- applciation context in the Host's application base directory.
+ application context in the Host's application base directory.
webapp.war - The name of a web application war file
located in the Host's application base directory.
@@ -256,7 +256,7 @@ the host and port appropriately for your installation.
Each command will return a response in text/plain format
(i.e. plain ASCII with no HTML markup), making it easy for both humans and
-programs to read). The first line of the response wil begin with either
+programs to read). The first line of the response will begin with either
OK or FAIL, indicating whether the requested
command was successful or not. In the case of failure, the rest of the first
line will contain a description of the problem that was encountered. Some
@@ -639,7 +639,7 @@ the resource type you are interested in (for example, you would specify
JDBC data sources). If you do not specify the type request
parameter, resources of all types will be returned.
-
Depending on whether the type request parameter is specfied
+
Depending on whether the type request parameter is specified
or not, the first line of a normal response will be:
OK - Listed global resources of all types
diff --git a/webapps/docs/maven-jars.xml b/webapps/docs/maven-jars.xml
index 33ecb2254..183185f90 100644
--- a/webapps/docs/maven-jars.xml
+++ b/webapps/docs/maven-jars.xml
@@ -35,7 +35,7 @@
Tomcat snapshots are located in the
Apache Snapshot Repository.
The official URL is http://people.apache.org/repo/m2-snapshot-repository/org/apache/tomcat/
- Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deams a new snapshot might
+ Snapshots are done periodically, not on a regular basis, but when changes happen and the Tomcat team deems a new snapshot might
useful.
diff --git a/webapps/docs/monitoring.xml b/webapps/docs/monitoring.xml
index eaa2034de..082c1f88e 100644
--- a/webapps/docs/monitoring.xml
+++ b/webapps/docs/monitoring.xml
@@ -55,14 +55,14 @@
-
If you require authorisation, add and change this :
+
If you require authorization, add and change this :
-Dcom.sun.management.jmxremote.authenticate=true \
-Dcom.sun.management.jmxremote.password.file=../conf/jmxremote.password \
-Dcom.sun.management.jmxremote.access.file=../conf/jmxremote.access \
-
edit the access authorisation file $CATALINA_BASE/conf/jmxremote.access :
+
edit the access authorization file $CATALINA_BASE/conf/jmxremote.access :
monitorRole readonly
controlRole readwrite
@@ -252,7 +252,7 @@ List of Attributes
echo
-
Echo the command usage (for analyse access or debugging)
+
Echo the command usage (for access analysis or debugging)
false
@@ -283,7 +283,7 @@ Example to open a new JMX connection
-Example to open a JMX connection from URL, with authorisation and
+Example to open a JMX connection from URL, with authorization and
store at other reference
<jmx:open
@@ -296,7 +296,7 @@ store at other reference
-Example to open a JMX connection from URL, with authorisation and
+Example to open a JMX connection from URL, with authorization and
store at other reference, but only when property jmx.if exists and
jmx.unless not exists
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index 985e524af..0e3cba334 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -103,7 +103,7 @@ associated with their username.
applications to declare their security requirements (in the
web.xml deployment descriptor), there is no portable API
defining the interface between a servlet container and the associated user
-and role information. In many cases, however, it is desireable to "connect"
+and role information. In many cases, however, it is desirable to "connect"
a servlet container to some existing authentication database or mechanism
that already exists in the production environment. Therefore, Tomcat 6
defines a Java interface (org.apache.catalina.Realm) that
@@ -184,7 +184,7 @@ Realm element has a direct impact on the "scope" of that Realm
For each of the standard Realm implementations, the
user's password (by default) is stored in clear text. In many
-environments, this is undesireable because casual observers of the
+environments, this is undesirable because casual observers of the
authentication data can collect enough information to log on
successfully, and impersonate other users. To avoid this problem, the
standard implementations support the concept of digesting
@@ -276,7 +276,7 @@ security constraint that requires role "manager" to access ANY request URI
within that application.
For security reasons, no username in the default Realm (i.e. using
-conf/tomcat-users.xml is assigned the "manager" role. Therfore,
+conf/tomcat-users.xml is assigned the "manager" role. Therefore,
no one will be able to utilize the features of this application until the
Tomcat administrator specifically assigns this role to one or more users.
diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index 7c3717e3d..784d5e155 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -143,7 +143,7 @@ Used to set the format of dates and other items processed by SSI
echo - <!--#echo var="VARIABLE_NAME" -->
-will be replaced bt the value of the variable.
+will be replaced by the value of the variable.
exec - Used to run commands on the host system.
@@ -257,7 +257,7 @@ Virtual path to the file
HTTP_ACCEPT_LANGUAGE
- A list of the laguages that the client can accept.
+ A list of the languages that the client can accept.
Apache Tribes is a group or peer-to-peer communcation framework that enables you to easily connect
+
Apache Tribes is a group or peer-to-peer communication framework that enables you to easily connect
your remote objects to communicate with each other.
@@ -92,7 +92,7 @@
The Tribes module was started early 2006 and a small part of the code base comes from the clustering module
that has been existing since 2003 or 2004.
- The current cluster implementation has several short comings and many work arounds were created due
+ The current cluster implementation has several short comings and many workarounds were created due
to the complexity in group communication. Long story short, what should have been two modules a long time
ago, will be now. Tribes takes out the complexity of messaging from the replication module and becomes
a fully independent and highly flexible group communication module.
@@ -195,7 +195,7 @@
message basis. Meaning, that your messages are not delivered based on some static configuration
that remains fixed after the message framework has been started.
To give you an example of how powerful this feature is, I'll try to illustrate it with a simple example.
- Imagine you need to send 10 different messsages, you could send the the following way:
+ Imagine you need to send 10 different messages, you could send the the following way:
Message_1 - asynchronous and fast, no guarantee required, fire and forget
Message_2 - all-or-nothing, either all receivers get it, or none.
diff --git a/webapps/docs/windows-service-howto.xml b/webapps/docs/windows-service-howto.xml
index 46535f46b..ed875661a 100644
--- a/webapps/docs/windows-service-howto.xml
+++ b/webapps/docs/windows-service-howto.xml
@@ -70,7 +70,7 @@
Run the service as console application
This is the default operation. It is called if the no option is
provided. The ServiceName is the name of the executable without
- exe sufix, meaning Tomcat6