This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d897288e65a61fa078bc096fad2cf0e629a72e16
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/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/http.xml | 6 +++---
webapps/docs/default-servlet.xml | 2 +-
webapps/docs/ssi-howto.xml | 4 ++--
webapps/docs/web-socket-howto.xml | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/webapps/docs/cgi-howto.xml b/webapps/docs/cgi-howto.xml
index 1c4feb7..37f0488 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 17c6031..561c85e 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -258,7 +258,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 a7653cd..d29c2e6 100644
--- a/webapps/docs/cluster-howto.xml
+++ b/webapps/docs/cluster-howto.xml
@@ -240,7 +240,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 043bc6b..89be5f0 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 a0d27ca..9c0fdc2 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/http.xml b/webapps/docs/config/http.xml
index 96a9715..40a5254 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -534,7 +534,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
@@ -1446,7 +1446,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
@@ -1470,7 +1470,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/default-servlet.xml b/webapps/docs/default-servlet.xml
index 0902400..92e73fa 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -74,7 +74,7 @@ directory listings are disabled and debugging is turned off.
<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/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index fe279f3..77b8de1 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -146,7 +146,7 @@ false.</li>
<p>The directives are:
<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:
@@ -436,4 +436,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 d6e6933..94b74b0 100644
--- a/webapps/docs/web-socket-howto.xml
+++ b/webapps/docs/web-socket-howto.xml
@@ -92,7 +92,7 @@ implement its own timeout mechanism to handle these cases.</p>
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
