This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new ac6bbc6aae misc: fix grammar / spelling / remove duplicate words
ac6bbc6aae is described below
commit ac6bbc6aaef44c377f20e5ee6991b3d0bc824552
Author: John Bampton <[email protected]>
AuthorDate: Tue Apr 1 23:28:00 2025 +1000
misc: fix grammar / spelling / remove duplicate words
Docs clean ups in Java, XML and XSL
---
java/org/apache/coyote/AsyncStateMachine.java | 2 +-
java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java | 2 +-
webapps/docs/changelog.xml | 2 +-
webapps/docs/config/http.xml | 2 +-
webapps/docs/default-servlet.xml | 2 +-
webapps/docs/jndi-resources-howto.xml | 2 +-
webapps/docs/rewrite.xml | 2 +-
webapps/docs/ssl-howto.xml | 2 +-
webapps/docs/tomcat-docs.xsl | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/coyote/AsyncStateMachine.java
b/java/org/apache/coyote/AsyncStateMachine.java
index 76ac7d1104..cdf42ecac3 100644
--- a/java/org/apache/coyote/AsyncStateMachine.java
+++ b/java/org/apache/coyote/AsyncStateMachine.java
@@ -356,7 +356,7 @@ class AsyncStateMachine {
return true;
} else if (state == AsyncState.COMPLETING || state ==
AsyncState.DISPATCHING ||
state == AsyncState.DISPATCHED) {
- // NOOP - App called complete() or dispatch() between the the
+ // NOOP - App called complete() or dispatch() between the
// timeout firing and execution reaching this point
return false;
} else {
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
index a9639e0be4..04ef05a58c 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
@@ -36,7 +36,7 @@ public class ConstantPool {
* Reads constants from given input stream.
*
* @param input Input stream
- * @throws IOException if an I/O error occurs reading the the InputStream
+ * @throws IOException if an I/O error occurs reading the InputStream
* @throws ClassFormatException If the .class file is not valid
*/
ConstantPool(final DataInput input) throws IOException,
ClassFormatException {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 761b181660..0b5c9d7ecf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -286,7 +286,7 @@
Add support for specifying Java 25 (with the value <code>25</code>) as
the compiler source and/or compiler target for JSP compilation. If used
with an Eclipse JDT compiler version that does not support these
values,
- a warning will be logged and the default will used.
+ a warning will be logged and the default will be used.
(markt)
</add>
</changelog>
diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml
index 3dc3d102aa..231559bc80 100644
--- a/webapps/docs/config/http.xml
+++ b/webapps/docs/config/http.xml
@@ -1457,7 +1457,7 @@
certificate. The default is the value of the
<code>javax.net.ssl.trustStoreProvider</code> system property. If
that property is null and a single certificate has been configured for
- this TLS virtual host then default will be the the value of
+ this TLS virtual host then default will be the value of
<code>keystoreProvider</code> of the single certificate. If none of these
identify a default, the list of registered providers is traversed in
preference order and the first provider that supports the
diff --git a/webapps/docs/default-servlet.xml b/webapps/docs/default-servlet.xml
index 3ad270060a..362fb40096 100644
--- a/webapps/docs/default-servlet.xml
+++ b/webapps/docs/default-servlet.xml
@@ -209,7 +209,7 @@ Tomcat.</p>
</property>
<property name="directoryRedirectStatusCode">
When a directory redirect (trailing slash missing) is made, use this as
- the the HTTP response code. [302]
+ the HTTP response code. [302]
</property>
<property name="allowPostAsGet">
Controls whether a direct request (i.e. not a forward or an include)
for
diff --git a/webapps/docs/jndi-resources-howto.xml
b/webapps/docs/jndi-resources-howto.xml
index 6690479c36..5cc4bb03bc 100644
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -329,7 +329,7 @@ writer.println("foo = " + bean.getFoo() + ", bar = " +
<p>If the bean property is of type <code>String</code>, the BeanFactory
will call the property setter using the provided property value. If the
- bean property type is a primitive or a primitive wrapper, the the
+ bean property type is a primitive or a primitive wrapper, the
BeanFactory will convert the value to the appropriate primitive or
primitive wrapper and then use that value when calling the setter. Some
beans have properties with types that cannot automatically be converted
diff --git a/webapps/docs/rewrite.xml b/webapps/docs/rewrite.xml
index c6daf279ab..3134df4f95 100644
--- a/webapps/docs/rewrite.xml
+++ b/webapps/docs/rewrite.xml
@@ -455,7 +455,7 @@ public interface RewriteMap {
<p>Note: 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>
- <p>That map instance will be given the the lookup value that is configured
in the corresponding <code>RewriteRule</code> by
+ <p>That map instance will be given the lookup value that is configured in
the corresponding <code>RewriteRule</code> by
calling <code>lookup(String)</code>. Your implementation is free to return
<code>null</code> to indicate,
that the given default should be used, or to return a replacement
value.</p>
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index febc8e63ab..e4a4ad0651 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -102,7 +102,7 @@ client are taking place over a secure connection (because
your application
needs to be able to ask about this), but it does not participate in the
encryption or decryption itself.</p>
-<p>Tomcat is able to use any of the the cryptographic protocols that are
+<p>Tomcat is able to use any of the cryptographic protocols that are
provided by the underlying environment. Java itself provides cryptographic
capabilities through <a
href="https://docs.oracle.com/javase/9/security/java-cryptography-architecture-jca-reference-guide.htm";>JCE/JCA</a>
and encrypted communications capabilities through <a
href="https://docs.oracle.com/javase/9/security/java-secure-socket-extension-jsse-reference-guide.htm";>JSSE</a>.
diff --git a/webapps/docs/tomcat-docs.xsl b/webapps/docs/tomcat-docs.xsl
index e70311d2d4..fc5961b9f1 100644
--- a/webapps/docs/tomcat-docs.xsl
+++ b/webapps/docs/tomcat-docs.xsl
@@ -52,7 +52,7 @@
<xsl:param name="sitedir" select="''"/>
<xsl:param name="filename" select="'-'"/>
- <!-- Defined variables (non-overrideable) -->
+ <!-- Defined variables (non-overridable) -->
<xsl:variable name="project-xml-filename"><xsl:value-of
select="$subdir"/>project.xml</xsl:variable>
<xsl:variable name="project"
select="document($project-xml-filename)/project"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
