You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fs...@apache.org on 2019/03/22 17:21:34 UTC
[tomcat] branch 7.0.x updated: Correct doubled words
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new d923443 Correct doubled words
d923443 is described below
commit d923443f48b2b5c4e24f6f73b1cc01a0fcf38189
Author: Felix Schumacher <fs...@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 | 14 +++++++-------
webapps/examples/WEB-INF/classes/HelloWorldExample.java | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d3fe912..43ea7ae 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -180,7 +180,7 @@ To enable and configue SSI support, please see the ssi-howto.html page.
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 0499770..c1526fd 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -815,7 +815,7 @@
<subsection name="Coyote">
<changelog>
<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>
@@ -2057,7 +2057,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>
@@ -3438,7 +3438,7 @@
examples web application. (markt)
</fix>
<fix>
- <bug>59229</bug>: Fix error in HTTP docs and make clear the the HTTP NIO
+ <bug>59229</bug>: Fix error in HTTP docs and make clear that the HTTP NIO
connector uses non-blocking I/O to read the HTTP request headers.
(markt)
</fix>
@@ -5623,7 +5623,7 @@
client implementation. Patch provided by Niklas Hallqvist. (markt)
</fix>
<fix>
- <bug>57118</bug>: Ensure that that an <code>EncodeException</code> is
+ <bug>57118</bug>: Ensure that an <code>EncodeException</code> is
thrown by <code>RemoteEndpoint.Basic.sendObject(Object)</code> rather
than an <code>IOException</code> when no suitable <code>Encoder</code>
is configured for the given Object. (markt)
@@ -12332,7 +12332,7 @@
<fix>
The fix for bug <bug>51310</bug> caused a regression that re-introduced
bug <bug>49957</bug> and deleted the contents of the work directory
- when Tomcat was shutdown. This fix ensures that that work directory for
+ when Tomcat was shutdown. This fix ensures that the work directory for
an application is not deleted when Tomcat is shutdown. (markt)
</fix>
<fix>
@@ -14174,7 +14174,7 @@
</fix>
<add>
<bug>50222</bug>: Modify memory leak prevention code so it pins the
- system class loader in memory rather than than the common class loader,
+ system class loader in memory rather than the common class loader,
which is better for embedded systems. Patch provided by Christopher
Schultz. (markt)
</add>
@@ -14926,7 +14926,7 @@
</update>
<fix>
Update a few places in the docs where the Manager documentation referred
- to the old role name of manager rather than than the new manager-script.
+ to the old role name of manager rather than the new manager-script.
(markt)
</fix>
</changelog>
diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
index b642aba..49b8601 100644
--- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java
+++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java
@@ -54,7 +54,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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org