This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f897666 Correct doubled words
f897666 is described below
commit f89766660abace814fc5aef8d64fe0afad235c41
Author: Felix Schumacher <fschumac...@apache.org>
AuthorDate: Fri Mar 22 18:08:23 2019 +0100
Correct doubled words
These are a few places where the following script found duplicated word:
$ grep -rP '\b([a-z]\w+)\s+\1\b' webapps/
---
RELEASE-NOTES | 2 +-
webapps/docs/changelog.xml | 4 ++--
webapps/examples/WEB-INF/classes/HelloWorldExample.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a52a3d..d9cc4af 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -120,7 +120,7 @@ and putting them in the shared classloader instead (JARs
should be put in the
Security manager URLs:
======================
In order to grant security permissions to JARs located inside the
-web application repository, use URLs of of the following format
+web application repository, use URLs of the following format
in your policy file:
file:${catalina.base}/webapps/examples/WEB-INF/lib/driver.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0fce5c0..dee1320 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1244,7 +1244,7 @@
Consistent exception propagation for NIO2 SSL close. (remm)
</fix>
<fix>
- Log an error message if the AJP connector detects the the reverse proxy
+ Log an error message if the AJP connector detects that the reverse
proxy
is sending AJP messages that are too large for the configured
<code>packetSize</code>. (markt)
</fix>
@@ -3095,7 +3095,7 @@
<changelog>
<fix>
Review those places where Tomcat re-encodes a URI or URI component and
- ensure that that correct encoding (path differs from query string) is
+ ensure that the correct encoding (path differs from query string) is
applied and that the encoding is applied consistently. (markt)
</fix>
<fix>
diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
index 1a5ea5a..4a75a4d 100644
--- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
@@ -56,7 +56,7 @@ public class HelloWorldExample extends HttpServlet {
// note that all links are created to be relative. this
// ensures that we can move the web application that this
- // servlet belongs to to a different place in the url
+ // servlet belongs to a different place in the url
// tree and not have any harmful side effects.
// XXX
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
