This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit e146e75e09bac129dc8d2f7a296e647f188e05a0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 16 18:04:06 2020 +0100
Fix spellings in docs
Based on a PR provided by John Bampton
---
webapps/docs/cdi.xml | 2 +-
webapps/docs/cgi-howto.xml | 4 ++--
webapps/docs/class-loader-howto.xml | 2 +-
webapps/docs/cluster-howto.xml | 2 +-
webapps/docs/config/cluster-valve.xml | 2 +-
webapps/docs/config/context.xml | 2 +-
webapps/docs/config/globalresources.xml | 2 +-
webapps/docs/config/http.xml | 8 ++++----
webapps/docs/config/http2.xml | 2 +-
webapps/docs/default-servlet.xml | 2 +-
webapps/docs/host-manager-howto.xml | 2 +-
webapps/docs/html-host-manager-howto.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
webapps/docs/rewrite.xml | 2 +-
webapps/docs/ssi-howto.xml | 4 ++--
webapps/docs/web-socket-howto.xml | 2 +-
16 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/webapps/docs/cdi.xml b/webapps/docs/cdi.xml
index e9cea2c..5ffa564 100644
--- a/webapps/docs/cdi.xml
+++ b/webapps/docs/cdi.xml
@@ -68,7 +68,7 @@ mvn clean && mvn package]]></source>
The listener will produce a non fatal error if the CDI container loading
fails.<br/>
CDI support can also be enabled at the individual webapp level by adding
- the following listner to the webapp <code>context.xml</code> file nested
+ the following listener to the webapp <code>context.xml</code> file nested
inside the <code>Server</code> element:
<source><![CDATA[<Listener
className="org.apache.webbeans.web.tomcat.OpenWebBeansContextLifecycleListener"
/>]]></source>
</p>
diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml
index 09241ab..e00faf0 100644
--- a/webapps/docs/cgi-howto.xml
+++ b/webapps/docs/cgi-howto.xml
@@ -102,7 +102,7 @@ the web application root directory + File.separator + this
prefix.
By default there is no value, which results in the web application root
directory being used as the search path. The recommended value is
<code>WEB-INF/cgi</code></li>
-<li><strong>cmdLineArgumentsDecoded</strong> - If command line argumemnts
+<li><strong>cmdLineArgumentsDecoded</strong> - If command line arguments
are enabled (via <strong>enableCmdLineArguments</strong>) and Tomcat is running
on Windows then each individual decoded command line argument must match this
pattern else the request will be rejected. This is to protect against known
@@ -112,7 +112,7 @@ lead to remote code execution. For more information on
these issues see
Wulftange's blog</a> and this archived
<a
href="https://web.archive.org/web/20161228144344/https://blogs.msdn.microsoft.com/twistylittlepassagesallalike/2011/04/23/everyone-quotes-command-line-arguments-the-wrong-way/";>blog
by Daniel Colascione</a>.</li>
-<li><strong>cmdLineArgumentsEncoded</strong> - If command line argumemnts
+<li><strong>cmdLineArgumentsEncoded</strong> - If command line arguments
are enabled (via <strong>enableCmdLineArguments</strong>) individual encoded
command line argument must match this pattern else the request will be
rejected.
The default matches the allowed values defined by RFC3875 and is
diff --git a/webapps/docs/class-loader-howto.xml
b/webapps/docs/class-loader-howto.xml
index eecbc01..9d78dbf 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -263,7 +263,7 @@ for further information.</p>
<p>A more complex class loader hierarchy may also be configured. See the
diagram
below. By default, the <strong>Server</strong> and <strong>Shared</strong>
-class loaders are not defined and the simplifed hierarchy shown above is used.
+class loaders are not defined and the simplified hierarchy shown above is used.
This more complex hierarchy may be use by defining values for the
<code>server.loader</code> and/or <code>shared.loader</code> properties in
<code>conf/catalina.properties</code>.</p>
diff --git a/webapps/docs/cluster-howto.xml b/webapps/docs/cluster-howto.xml
index 09cdb2c..cb1f33f 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -258,7 +258,7 @@ should be completed:</p>
<p>
<b>Hint:</b><br/>
With attribute <i>sessionIdAttribute</i> you can change the request
attribute name that included the old session id.
- Default attribute name is
<i>org.apache.catalina.ha.session.JvmRouteOrignalSessionID</i>.
+ Default attribute name is
<i>org.apache.catalina.ha.session.JvmRouteOriginalSessionID</i>.
</p>
<p>
<b>Trick:</b><br/>
diff --git a/webapps/docs/config/cluster-valve.xml
b/webapps/docs/config/cluster-valve.xml
index d930ae2..7722bd7 100644
--- a/webapps/docs/config/cluster-valve.xml
+++ b/webapps/docs/config/cluster-valve.xml
@@ -98,7 +98,7 @@
</attribute>
<attribute name="sessionIdAttribute" required="false">
Old sessionid before failover is registered in request attributes with
this attribute.
- Default attribute name is
<code>org.apache.catalina.ha.session.JvmRouteOrignalSessionID</code>.
+ Default attribute name is
<code>org.apache.catalina.ha.session.JvmRouteOriginalSessionID</code>.
</attribute>
</attributes>
</subsection>
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index 696cbc4..e1ddd20 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -275,7 +275,7 @@
<attribute name="allowMultipleLeadingForwardSlashInPath"
required="false">
<p>Tomcat normalises sequences of multiple <code>/</code> characters in
- a URI to a single <code>/</code>. This is for consistencuy with the
+ a URI to a single <code>/</code>. This is for consistency with the
behaviour of file systems as URIs are often translated to file system
paths. As a result, the return value of
<code>HttpServletRequest#getContextPath()</code> is expected to start
diff --git a/webapps/docs/config/globalresources.xml
b/webapps/docs/config/globalresources.xml
index e9e26ef..35b533e 100644
--- a/webapps/docs/config/globalresources.xml
+++ b/webapps/docs/config/globalresources.xml
@@ -191,7 +191,7 @@
you can use <code>closeMethod="close"</code>. Note that Apache Commons
DBCP 2 requires this to be set for a clean shutdown. When using the
default Tomcat connection pool (based on DBCP 2) Tomcat will set this
- attribute automatically unless it is explictly set to the empty
+ attribute automatically unless it is explicitly set to the empty
string.</p>
</attribute>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 8cb1e10..8ad0a29 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -559,7 +559,7 @@
</attribute>
<attribute name="noCompressionStrongETag" required="false">
- <p>This flag configures whether resources with a stong ETag will be
+ <p>This flag configures whether resources with a strong ETag will be
considered for compression. If <code>true</code>, resources with a strong
ETag will not be compressed. The default value is <code>true</code>.</p>
<p>This attribute is deprecated. It will be removed in Tomcat 10 onwards
@@ -925,7 +925,7 @@
<attribute name="useInheritedChannel" required="false">
<p>(bool)Defines if this connector should inherit an inetd/systemd
network socket.
Only one connector can inherit a network socket. This can option can be
- used to automatcially start Tomcat once a connection request is made to
+ used to automatically start Tomcat once a connection request is made to
the systemd super daemon's port.
The default value is <code>false</code>. See the JavaDoc
for the <code>java.nio.channels.spi.SelectorProvider</code> class for
@@ -1624,7 +1624,7 @@
<p>In addition to the standard key store types (JKS and PKCS12), most Java
runtimes support additional key store types such as Windows-ROOT,
Windows-My, DKS as well as hardware security modules. Generally, to use
- these additional keystore types with a TLS Conector in Tomcat:</p>
+ these additional keystore types with a TLS Connector in Tomcat:</p>
<ul>
<li>Set the certificateKeystoreType and/or truststoreType Connector
@@ -1648,7 +1648,7 @@
<p>Variations in key store implementations, combined with the key store
manipulation Tomcat does in the background to allow interoperability
between
JSSE and OpenSSL configuration styles, means that some keystores may need
- slightly different configuration. Assitance is always available from the
+ slightly different configuration. Assistance is always available from the
<a href="http://tomcat.apache.org/lists.html#tomcat-users";>Apache Tomcat
users mailing list</a>. We aim to document any key stores that vary from
the
above advice here. Currently there are none we are aware of.</p>
diff --git a/webapps/docs/config/http2.xml b/webapps/docs/config/http2.xml
index ddd7b5e..95ce2d4 100644
--- a/webapps/docs/config/http2.xml
+++ b/webapps/docs/config/http2.xml
@@ -269,7 +269,7 @@
<attribute name="streamWriteTimeout" required="false">
<p>The time, in milliseconds, that Tomcat will wait for additional window
- update frames to arrive for the stream and/or conenction when an
+ update frames to arrive for the stream and/or connection when an
application is performing a blocking I/O write and the stream and/or
connection flow control window is too small for the write to complete.
Negative values will be treated as an infinite timeout. If not specified,
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index 899ce02..1136d06 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -85,7 +85,7 @@ Tomcat.</p>
<section anchor="change" name="What can I change?">
<p>
- The DefaultServlet allows the following initParamters:
+ The DefaultServlet allows the following initParameters:
</p>
<properties>
diff --git a/webapps/docs/host-manager-howto.xml
b/webapps/docs/host-manager-howto.xml
index 1530bc1..63c2ab0 100644
--- a/webapps/docs/host-manager-howto.xml
+++ b/webapps/docs/host-manager-howto.xml
@@ -68,7 +68,7 @@
</ul>
<p>
Both ways enable you to add, remove, start, and stop virtual hosts. Changes
- may be presisted by using the <code>persist</code> command. This document
+ may be persisted by using the <code>persist</code> command. This document
focuses on the text interface. For further information about the graphical
interface, see
<a href="html-host-manager-howto.html">Host Manager App -- HTML
Interface</a>.
diff --git a/webapps/docs/html-host-manager-howto.xml
b/webapps/docs/html-host-manager-howto.xml
index 6a9d464..fd23794 100644
--- a/webapps/docs/html-host-manager-howto.xml
+++ b/webapps/docs/html-host-manager-howto.xml
@@ -71,7 +71,7 @@
</ul>
<p>
Both ways enable you to add, remove, start, and stop virtual hosts.
- Changes may be presisted by using the <code>persist</code> command. This
+ Changes may be persisted by using the <code>persist</code> command. This
document focuses on the HTML interface. For further information about the
graphical interface, see
<a href="host-manager-howto.html">Host Manager App -- Text Interface</a>.
diff --git a/webapps/docs/jndi-resources-howto.xml
b/webapps/docs/jndi-resources-howto.xml
index fc5c0aa..4cdba75 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -482,7 +482,7 @@ public class MyBean2 {
is running as. Ensure that these are appropriate to maintain the security
of your installation.</p>
- <p>If referenced in a Realm, the UserDatabse will, by default, monitor
+ <p>If referenced in a Realm, the UserDatabase will, by default, monitor
<code>pathname</code> for changes and reload the file if a change in the
last modified time is observed. This can be disabled by setting the
<code>watchSource</code> attribute to <code>false</code>.
diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index ea98d42..81763fc 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -428,7 +428,7 @@ public interface RewriteMap {
<p>The referenced implementation of such a class – in our example
<code>rewriteMapClassName</code> –
will be instantiated and initialized with the optional parameter –
<code>optionalParameters</code> from above
(be careful with whitespace) – by calling
<code>setParameters(String)</code>. That instance
- will then be registered under the name given as the first paramter of
<code>RewriteMap</code> rule.</p>
+ will then be registered under the name given as the first parameter of
<code>RewriteMap</code> rule.</p>
<p>Note: Starting with Tomcat 9 you can use more than one parameter. These
have to be separated by spaces. Parameters
can be quoted with ". This enables space characters inside
parameters.</p>
diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index 8f866cc..7418e77 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -146,7 +146,7 @@ false.</li>
<p>The directives are:</p>
<ul>
<li>
-<strong>config</strong> - <code><!--#config errmsg="Error
occured" sizefmt="abbrev"
+<strong>config</strong> - <code><!--#config errmsg="Error
occurred" sizefmt="abbrev"
timefmt="%B %Y" --></code>
Used to set SSI error message, the format of dates and file sizes processed by
SSI.<br/>
All are optional but at least one must be used. The available options are as
follows:
@@ -437,4 +437,4 @@ with "\"</td>
</body>
-</document>
\ No newline at end of file
+</document>
diff --git a/webapps/docs/web-socket-howto.xml
b/webapps/docs/web-socket-howto.xml
index e610cb2..7523c57 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -72,7 +72,7 @@
of milliseconds. Setting the property
<code>org.apache.tomcat.websocket.WRITE_IDLE_TIMEOUT_MS</code> will trigger
a
session timeout if no WebSocket message is sent for the specified number of
- milliseconds. These can be used separately or together, with or wihout
+ milliseconds. These can be used separately or together, with or without
<code>Session.setMaxIdleTimeout(long)</code>. If the associated property is
not specified, the read and/or write idle timeout will be applied.</p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
