[tomcat] branch master updated: Fix typos and consistent naming

2021-04-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new acb4383  Fix typos and consistent naming
acb4383 is described below

commit acb438307f5e96a68819bb88cb3e9b12dc124f2e
Author: remm 
AuthorDate: Mon Apr 19 16:49:14 2021 +0200

Fix typos and consistent naming
---
 java/org/apache/tomcat/util/bcel/classfile/ClassParser.java | 10 +-
 java/org/apache/tomcat/util/bcel/classfile/JavaClass.java   | 12 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index 89dab31..af24856 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -49,7 +49,7 @@ public final class ClassParser {
 private String[] interfaceNames; // Names of implemented interfaces
 private ConstantPool constantPool; // collection of constants
 private Annotations runtimeVisibleAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined in the class
-private List runtimeVisibleMethodOfFieldAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined elsewhere
+private List runtimeVisibleFieldOrMethodAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined elsewhere
 private static final int BUFSIZE = 8192;
 
 private static final String[] INTERFACES_EMPTY_ARRAY = new String[0];
@@ -99,7 +99,7 @@ public final class ClassParser {
 // Return the information we have gathered in a new object
 return new JavaClass(class_name, superclassName,
 accessFlags, constantPool, interfaceNames,
-runtimeVisibleAnnotations, 
runtimeVisibleMethodOfFieldAnnotations);
+runtimeVisibleAnnotations, 
runtimeVisibleFieldOrMethodAnnotations);
 }
 
 
@@ -126,10 +126,10 @@ public final class ClassParser {
 if (name.equals("RuntimeVisibleAnnotations")) {
 if (fieldOrMethod) {
 Annotations fieldOrMethodAnnotations = new 
Annotations(dataInputStream, constantPool);
-if (runtimeVisibleMethodOfFieldAnnotations == null) {
-runtimeVisibleMethodOfFieldAnnotations = new 
ArrayList<>();
+if (runtimeVisibleFieldOrMethodAnnotations == null) {
+runtimeVisibleFieldOrMethodAnnotations = new 
ArrayList<>();
 }
-
runtimeVisibleMethodOfFieldAnnotations.add(fieldOrMethodAnnotations);
+
runtimeVisibleFieldOrMethodAnnotations.add(fieldOrMethodAnnotations);
 } else {
 if (runtimeVisibleAnnotations != null) {
 throw new ClassFormatException(
diff --git a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java 
b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
index 14ef3a1..819175a 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
@@ -35,7 +35,7 @@ public class JavaClass {
 private final String superclassName;
 private final String[] interfaceNames;
 private final Annotations runtimeVisibleAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined in the class
-private final List runtimeVisibleMethodOfFieldAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined elsewhere
+private final List runtimeVisibleFieldOrMethodAnnotations; // 
"RuntimeVisibleAnnotations" attribute defined elsewhere
 
 /**
  * Constructor gets all contents as arguments.
@@ -46,14 +46,14 @@ public class JavaClass {
  * @param constant_pool Array of constants
  * @param interfaceNames Implemented interfaces
  * @param runtimeVisibleAnnotations "RuntimeVisibleAnnotations" attribute 
defined on the Class, or null
- * @param runtimeVisibleMethodOfFieldAnnotations 
"RuntimeVisibleAnnotations" attribute defined on the fields or methids, or null
+ * @param runtimeVisibleFieldOrMethodAnnotations 
"RuntimeVisibleAnnotations" attribute defined on the fields or methods, or null
  */
 JavaClass(final String className, final String superclassName,
 final int accessFlags, final ConstantPool constant_pool, final 
String[] interfaceNames,
-final Annotations runtimeVisibleAnnotations, final 
List runtimeVisibleMethodOfFieldAnnotations) {
+final Annotations runtimeVisibleAnnotations, final 
List runtimeVisibleFieldOrMethodAnnotations) {
 this.accessFlags = accessFlags;
 this.runtimeVisibleAnnotations = runtimeVisibleAnnotations;
-this.runtimeVisibleMethodOfFieldAnnotations = 
runtimeVisibleMethodOfFieldAnnotations;
+

[tomcat] branch master updated: Fix typos

2021-03-03 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 4cb12b1  Fix typos
4cb12b1 is described below

commit 4cb12b194b07d0dad978c13f47e0a838421ff520
Author: Mark Thomas 
AuthorDate: Wed Mar 3 12:03:28 2021 +

Fix typos
---
 webapps/docs/security-howto.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/security-howto.xml b/webapps/docs/security-howto.xml
index b986dc7..197cbe9 100644
--- a/webapps/docs/security-howto.xml
+++ b/webapps/docs/security-howto.xml
@@ -466,10 +466,10 @@
   when the session is persisted during a restart or to a Store.
 
   When using the JDBCStore, the session store should be
-  secured (dedciated credentials, appropriate permissions) such that only
+  secured (dedicated credentials, appropriate permissions) such that only
   the JDBCStore is able to access the persisted session
-  data. In particular, the JDBCStore should be accessible
-  via any credentials available to a web application.
+  data. In particular, the JDBCStore should not be
+  accessible via any credentials available to a web application.
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2020-11-17 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 4741f50  Fix typos
4741f50 is described below

commit 4741f50f5632ebc15d93057ac40886cd37a607ec
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Nov 17 17:39:16 2020 +0200

Fix typos
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 57754b7..68f74dd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
   
 Fix processing of URIs with %nn encoded solidus characters when
 encodedSolidusHandling was set to passthrough
-and the encoded solidus was preceeded by other %nn encoded characters.
+and the encoded solidus was preceded by other %nn encoded characters.
 Based on a pull request by willmeck. (markt)
   
   
@@ -175,7 +175,7 @@
   
   
 64849: Correct JPMS metadata for the Jakarta Expression
-Langauge JARs to provide missing ServiceLoader information. (markt)
+Language JARs to provide missing ServiceLoader information. (markt)
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2020-09-15 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new f438fd5  Fix typos
f438fd5 is described below

commit f438fd56311f85e321884ea236cf6f90a04455a2
Author: Violeta Georgieva [VMware] 
AuthorDate: Tue Sep 15 17:57:00 2020 +0300

Fix typos
---
 webapps/docs/changelog.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f61cb8a..9936d7c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,7 +83,7 @@
 Update to Commons Daemon 1.2.3. This adds support to jsvc for
 --enable-preview and native memory tracking (Procrun
 already supported these features), adds some addition debug logging and
-adds a new feature to Procrun that outputs the commnd to (re-)configure
+adds a new feature to Procrun that outputs the command to 
(re-)configure
 the service with the current settings. (markt)
   
 
@@ -103,7 +103,7 @@
 opportunity to rewrite the request. (remm/markt)
   
   
-Change top package name for generated emebedded classes to avoid
+Change top package name for generated embedded classes to avoid
 conflict with default host name on case insensitive filesystems.
 (remm)
   
@@ -134,7 +134,7 @@
 Based on a patch provided by Milo van der Zee. (markt)
   
   
-Correct the path vaidation to allow the use of the file system root for
+Correct the path validation to allow the use of the file system root 
for
 the docBase attribute of a Context. Note that
 such a configuration should be used with caution. (markt)
   
@@ -159,7 +159,7 @@
   
 64713: The JASPIC authenticator now checks the value of
 jakarta.servlet.http.registerSession set by the
-ServerAuthModule when decideing whether or nor to register
+ServerAuthModule when deciding whether or nor to register
 the session. Based on a patch by Robert Rodewald. (markt)
   
 
@@ -275,7 +275,7 @@
 (schultz)
   
   
-Remove the out of date functional specification secton from the
+Remove the out of date functional specification section from the
 documentation web application. (markt)
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2020-05-07 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 7260ad6  Fix typos
7260ad6 is described below

commit 7260ad62a0ae1532f5dda1b1632c70e6288c654d
Author: Violeta Georgieva 
AuthorDate: Thu May 7 10:57:15 2020 +0300

Fix typos
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ab76d56..703a2e0 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -87,7 +87,7 @@
   
 Log a warning if a CredentialHandler instance is added to
 an instance of the CombinedRealm (or a sub-class) as the
-CombinedRealm doesn't use a configued
+CombinedRealm doesn't use a configured
 CredentialHandler and it is likely that a configuration
 error has occurred. (markt)
   
@@ -417,7 +417,7 @@
 Correct the documentation web application to remove references to the
 org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH
 system property changing how the sequence %5c is
-interpretted in a URI. (markt)
+interpreted in a URI. (markt)
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2020-03-10 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new a812a85  Fix typos
a812a85 is described below

commit a812a85c84ae40d900072931adbd024b959d1bfe
Author: Violeta Georgieva 
AuthorDate: Tue Mar 10 15:40:35 2020 +0200

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fdfc254..a85f645 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,7 +178,7 @@
   
 Expand the documentation for the address attribute of the
 AJP Connector and document that the AJP Connector also supports the
-ipv6v6only attribute with the APR/Native implementaiton.
+ipv6v6only attribute with the APR/Native implementation.
 (markt)
   
 
@@ -200,7 +200,7 @@
 Tomcat. (remm)
   
   
-64190: Add support for specifing milliseconds (using
+64190: Add support for specifying milliseconds (using
 S, SS or SSS) in the timestamp
 used by JULIs OneLineFormatter. (markt)
   
@@ -317,7 +317,7 @@
 log entry to write. Based on a patch by Karol Bucek. (markt)
   
   
-Update implementated specification version information in a few places
+Update implemented specification version information in a few places
 where it has not been updated for Jakarta EE 9. (markt)
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2020-02-06 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new fbf2891  Fix typos
fbf2891 is described below

commit fbf28916eedb844097c0abe49afd6f1dda975073
Author: Mark Thomas 
AuthorDate: Thu Feb 6 12:00:40 2020 +

Fix typos
---
 java/org/apache/coyote/AbstractProtocol.java   | 4 ++--
 java/org/apache/coyote/LocalStrings.properties | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/AbstractProtocol.java 
b/java/org/apache/coyote/AbstractProtocol.java
index 92ff009..1190c99 100644
--- a/java/org/apache/coyote/AbstractProtocol.java
+++ b/java/org/apache/coyote/AbstractProtocol.java
@@ -369,7 +369,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void addWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.add", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.add", 
processor));
 }
 waitingProcessors.add(processor);
 }
@@ -377,7 +377,7 @@ public abstract class AbstractProtocol implements 
ProtocolHandler,
 
 public void removeWaitingProcessor(Processor processor) {
 if (getLog().isDebugEnabled()) {
-
getLog().debug(sm.getString("abstractProcotol.waitingProcerssor.remove", 
processor));
+
getLog().debug(sm.getString("abstractProtocol.waitingProcessor.remove", 
processor));
 }
 waitingProcessors.remove(processor);
 }
diff --git a/java/org/apache/coyote/LocalStrings.properties 
b/java/org/apache/coyote/LocalStrings.properties
index b20d056..6acb6be 100644
--- a/java/org/apache/coyote/LocalStrings.properties
+++ b/java/org/apache/coyote/LocalStrings.properties
@@ -36,8 +36,8 @@ abstractProcessor.socket.ssl=Exception getting SSL attributes
 abstractProtocol.mbeanDeregistrationFailed=Failed to deregister MBean named 
[{0}] from MBean server [{1}]
 abstractProtocol.processorRegisterError=Error registering request processor
 abstractProtocol.processorUnregisterError=Error unregistering request processor
-abstractProcotol.waitingProcerssor.add=Added processor [{0}] to waiting 
processors
-abstractProcotol.waitingProcerssor.remove=Removed processor [{0}] from waiting 
processors
+abstractProtocol.waitingProcessor.add=Added processor [{0}] to waiting 
processors
+abstractProtocol.waitingProcessor.remove=Removed processor [{0}] from waiting 
processors
 
 abstractProtocolHandler.asyncTimeoutError=Error processing async timeouts
 abstractProtocolHandler.destroy=Destroying ProtocolHandler [{0}]


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2019-12-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 4dab3f2  Fix typos
4dab3f2 is described below

commit 4dab3f2c0f006cb508eaae5624b7bb8ab96a9a00
Author: Mark Thomas 
AuthorDate: Wed Dec 18 16:26:33 2019 +

Fix typos
---
 webapps/docs/changelog.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 14774e6..55781a4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,7 +178,7 @@
   
 Refactor FORM authentication to reduce duplicate code and to ensure 
that
 the authenticated Principal is not cached in the session when caching 
is
-disabled. (markt)
+disabled. This is the fix for CVE-2019-17563. (markt/kkolinko)
   
 
   
@@ -309,7 +309,8 @@
   
 
   
-   Refactor JMX remote RMI registry creation. (remm)
+   Refactor JMX remote RMI registry creation. This is the fix for
+   CVE-2019-12418. (remm)
   
   
 Improvement to CsrfPreventionFilter: expose the latest available nonce


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2019-11-21 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 18d1dbf  Fix typos
18d1dbf is described below

commit 18d1dbf2f84b7e68e40b7a37256c0ff34f71553f
Author: Violeta Georgieva 
AuthorDate: Thu Nov 21 12:59:04 2019 +0200

Fix typos
---
 webapps/docs/changelog.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b66046..8ed612f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -272,7 +272,7 @@
 63826: Remove commons-daemon-native.tar.gz and
 tomcat-native.tar.gz from the binary zip distributions for
 Windows since compiled versions of those components are already
-included within the zip distriubutions. (markt)
+included within the zip distributions. (markt)
   
   
 63838: Suppress reflexive access warnings when running the
@@ -572,7 +572,7 @@
   
   
 When performing a silent install with the Windows Installer, ensure 
that
-the registry entires are added to the 64-bit registry when using a
+the registry entries are added to the 64-bit registry when using a
 64-bit JVM. (markt)
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos (#208)

2019-10-07 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 5daacce  Fix typos (#208)
5daacce is described below

commit 5daacce2722bb8f895221d58dfc5cd7ca3b8f91e
Author: 康智冬 
AuthorDate: Mon Oct 7 17:32:44 2019 +0800

Fix typos (#208)

Clean-up. Fix typos, remove obsolete comment about ServerFactory
---
 java/javax/servlet/ServletContextListener.java   |  2 +-
 java/javax/servlet/annotation/WebServlet.java|  2 +-
 java/javax/servlet/http/HttpServlet.java |  2 +-
 java/javax/servlet/http/HttpSessionBindingEvent.java |  2 +-
 java/javax/servlet/http/WebConnection.java   |  2 +-
 java/org/apache/catalina/Server.java |  4 
 .../catalina/ha/session/ClusterSessionListener.java  |  2 +-
 .../apache/catalina/manager/HTMLManagerServlet.java  |  4 ++--
 .../manager/host/HTMLHostManagerServlet.java |  4 ++--
 .../apache/catalina/ssi/ResponseIncludeWrapper.java  |  6 +++---
 .../apache/catalina/startup/mbeans-descriptors.xml   |  2 +-
 .../catalina/storeconfig/StoreFactoryBase.java   |  2 +-
 .../catalina/tribes/group/ExtendedRpcCallback.java   |  2 +-
 .../apache/catalina/tribes/group/GroupChannel.java   |  2 +-
 java/org/apache/catalina/tribes/io/XByteBuffer.java  |  2 +-
 .../catalina/tribes/tipis/LocalStrings.properties|  6 +++---
 .../org/apache/catalina/util/ExtensionValidator.java |  2 +-
 .../apache/catalina/valves/rewrite/RewriteRule.java  |  2 +-
 java/org/apache/coyote/Request.java  |  2 +-
 java/org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java  | 20 ++--
 java/org/apache/tomcat/util/buf/MessageBytes.java|  4 ++--
 java/org/apache/tomcat/util/buf/UEncoder.java|  2 +-
 .../tomcat/util/http/parser/LocalStrings.properties  |  2 +-
 .../coyote/http11/filters/TestGzipOutputFilter.java  |  2 +-
 webapps/docs/rewrite.xml |  2 +-
 .../WEB-INF/classes/websocket/drawboard/Room.java|  2 +-
 webapps/examples/websocket/drawboard.xhtml   |  4 ++--
 27 files changed, 43 insertions(+), 47 deletions(-)

diff --git a/java/javax/servlet/ServletContextListener.java 
b/java/javax/servlet/ServletContextListener.java
index 2300aa7..7f926b4 100644
--- a/java/javax/servlet/ServletContextListener.java
+++ b/java/javax/servlet/ServletContextListener.java
@@ -42,7 +42,7 @@ public interface ServletContextListener extends EventListener 
{
 
 /**
  ** Notification that the servlet context is about to be shut down. All
- * servlets and filters have been destroy()ed before any
+ * servlets and filters have been destroyed before any
  * ServletContextListeners are notified of context destruction.
  * The default implementation is a NO-OP.
  * @param sce Information about the ServletContext that was destroyed
diff --git a/java/javax/servlet/annotation/WebServlet.java 
b/java/javax/servlet/annotation/WebServlet.java
index 8e518b7..29d0b32 100644
--- a/java/javax/servlet/annotation/WebServlet.java
+++ b/java/javax/servlet/annotation/WebServlet.java
@@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * This annotation is used to declare the configuration of an
+ * This annotation is used to declare the configuration of a
  * {@link javax.servlet.Servlet}. 
  *
  * If the name attribute is not defined, the fully qualified name of the class
diff --git a/java/javax/servlet/http/HttpServlet.java 
b/java/javax/servlet/http/HttpServlet.java
index f28eac3..aedbee6 100644
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -447,7 +447,7 @@ public abstract class HttpServlet extends GenericServlet {
 
 /**
  * Called by the server (via the service method)
- * to allow a servlet to handle a OPTIONS request.
+ * to allow a servlet to handle an OPTIONS request.
  *
  * The OPTIONS request determines which HTTP methods
  * the server supports and
diff --git a/java/javax/servlet/http/HttpSessionBindingEvent.java 
b/java/javax/servlet/http/HttpSessionBindingEvent.java
index 91e5167..70138c7 100644
--- a/java/javax/servlet/http/HttpSessionBindingEvent.java
+++ b/java/javax/servlet/http/HttpSessionBindingEvent.java
@@ -20,7 +20,7 @@ package javax.servlet.http;
 /**
  * Events of this type are either sent to an object that implements
  * {@link HttpSessionBindingListener} when it is bound or unbound from a
- * session, or to a {@link HttpSessionAttributeListener} that has been
+ * session, or to an {@link HttpSessionAttributeListener} that has been
  * configured in the deployment descriptor when any attribute is bound, unbound
  * or replaced in a session.
  * 
diff --git a/java/javax/servlet/http/WebConnection.java 
b/java/javax/servlet/http/WebConnection.java

[tomcat] branch master updated: Fix typos

2019-10-02 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 8db21b3  Fix typos
8db21b3 is described below

commit 8db21b3894fefab07a7fed0bf8ff2b4e147662e9
Author: Violeta Georgieva 
AuthorDate: Wed Oct 2 09:59:48 2019 +0300

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4c27a08..8f901f5 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -67,7 +67,7 @@
   
 63766: Ensure Processor objects are recycled when processing
 an HTTP upgrade connection that terminates before processing switches 
to
-the Processor for the upgraded procotol. (markt)
+the Processor for the upgraded protocol. (markt)
   
 
   
@@ -160,7 +160,7 @@
   
   
 Avoid a potential NullPointerException on Service stop if 
a
-Service is embedded directly (i.e. with no Server) in an applciation
+Service is embedded directly (i.e. with no Server) in an application
 and JNDI is enabled. Patch provided by S. Ali Tokmen. (markt)
   
   
@@ -511,7 +511,7 @@
   
   
 Add embed to the Bundle-Name and
-Bundle-Symbolic-Name for the Tomact embedded WebSocket JAR
+Bundle-Symbolic-Name for the Tomcat embedded WebSocket JAR
 to align the naming with the other embedded JARs and to differentiate 
it
 from the standard WebSocket JAR that does not include the API classes.
 (markt)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2019-06-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 865dad9  Fix typos
865dad9 is described below

commit 865dad9a2fb5953189a12339d113907b90e752fc
Author: Mark Thomas 
AuthorDate: Wed Jun 26 17:48:36 2019 +0100

Fix typos
---
 webapps/docs/config/engine.xml   | 4 ++--
 webapps/docs/host-manager-howto.xml  | 2 +-
 webapps/docs/html-host-manager-howto.xml | 2 +-
 webapps/docs/logging.xml | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index a430b52..ff4fbcd 100644
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -117,8 +117,8 @@
 Runtime.getRuntime().availableProcessors() + value being
 used unless this is less than 1 in which case 1 thread will be used. If
 not specified, the default value of 1 will be used. If 1 thread is
-used then rather than using an ExecutorService the current
-thread will be used.
+used then, rather than using an ExecutorService, the
+current thread will be used.
   
 
 
diff --git a/webapps/docs/host-manager-howto.xml 
b/webapps/docs/host-manager-howto.xml
index c05f9e3..fb1ccfd 100644
--- a/webapps/docs/host-manager-howto.xml
+++ b/webapps/docs/host-manager-howto.xml
@@ -78,7 +78,7 @@
 
   The description below uses $CATALINA_HOME to refer the
 base Tomcat directory. It is the directory in which you installed
-Tomcat, for example C:/tomcat9, or
+Tomcat, for example C:\tomcat9, or
 /usr/share/tomcat9.
 
   
diff --git a/webapps/docs/html-host-manager-howto.xml 
b/webapps/docs/html-host-manager-howto.xml
index d30152e..59ea49c 100644
--- a/webapps/docs/html-host-manager-howto.xml
+++ b/webapps/docs/html-host-manager-howto.xml
@@ -81,7 +81,7 @@
   
 The description below uses $CATALINA_HOME to refer the
   base Tomcat directory. It is the directory in which you installed
-  Tomcat, for example C:/tomcat9, or
+  Tomcat, for example C:\tomcat9, or
   /usr/share/tomcat9.
 
 
diff --git a/webapps/docs/logging.xml b/webapps/docs/logging.xml
index 78fb03c..1f546bb 100644
--- a/webapps/docs/logging.xml
+++ b/webapps/docs/logging.xml
@@ -289,7 +289,7 @@ java.util.logging.ConsoleHandler.level=ALL
   boolean value.
   The root logger can define its set of handlers using the
   .handlers property.
-   By default the log files will be kept on the file system
+   By default the log files will be kept on the file system for
   90 days. This may be changed per handler using the
   handlerName.maxDays property. If the specified value for the
   property is 0 then the log files will be kept on the


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch master updated: Fix typos

2019-06-11 Thread violetagg
This is an automated email from the ASF dual-hosted git repository.

violetagg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new ca524fa  Fix typos
ca524fa is described below

commit ca524faa0e44d435aff357e9632dcab88bd7dd5b
Author: Violeta Georgieva 
AuthorDate: Tue Jun 11 18:23:37 2019 -0400

Fix typos
---
 webapps/docs/changelog.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7027b16..eecddf8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -281,7 +281,7 @@
   
 Use the test command to check for terminal availability
 rather than the tty command since the tty
-based test fails on non-Eglish locales. (markt)
+based test fails on non-English locales. (markt)
   
 
   
@@ -299,7 +299,7 @@
 file. Identified by Coverity scan. (markt)
   
   
-Fix a potential concurrency issue in the StringCache identifed by
+Fix a potential concurrency issue in the StringCache identified by
 Coverity scan. (markt)
   
   
@@ -339,7 +339,7 @@
   
   
 63361: Add a new method
-(Registry.disableRegistry()) that can be used to disbale
+(Registry.disableRegistry()) that can be used to disable
 JMX registration of Tomcat components providing it is called before the
 first component is registered. (markt)
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org