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 af16402 Improve language
af16402 is described below
commit af16402ace9f68fdf4294be337bc9e96d5dce660
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 20 15:20:22 2021 +0100
Improve language
---
java/org/apache/catalina/User.java | 8 ++++----
.../tribes/group/interceptors/TcpFailureDetector.java | 2 +-
java/org/apache/coyote/Response.java | 2 +-
java/org/apache/tomcat/util/buf/Utf8Decoder.java | 2 +-
.../apache/tomcat/util/net/openssl/OpenSSLEngine.java | 6 +++---
webapps/docs/appdev/build.xml.txt | 4 ++--
webapps/docs/appdev/deployment.xml | 4 ++--
webapps/docs/appdev/processes.xml | 2 +-
webapps/docs/manager-howto.xml | 4 ++--
webapps/docs/realm-howto.xml | 18 +++++++++---------
.../WEB-INF/classes/websocket/drawboard/Room.java | 2 +-
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/java/org/apache/catalina/User.java
b/java/org/apache/catalina/User.java
index e50fd8f..7f1d1e5 100644
--- a/java/org/apache/catalina/User.java
+++ b/java/org/apache/catalina/User.java
@@ -24,10 +24,10 @@ import java.util.Iterator;
/**
- * <p>Abstract representation of a user in a {@link UserDatabase}. Each user
- * is optionally associated with a set of {@link Group}s through which he or
- * she inherits additional security roles, and is optionally assigned a set
- * of specific {@link Role}s.</p>
+ * Abstract representation of a user in a {@link UserDatabase}. Each user is
+ * optionally associated with a set of {@link Group}s through which they
inherit
+ * additional security roles, and is optionally assigned a set of specific
+ * {@link Role}s.
*
* @author Craig R. McClanahan
* @since 4.1
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 746786e..e493540 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -265,7 +265,7 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
continue;
}
if (membership.memberAlive(members[i])) {
- //we don't have this one in our membership, check to see if
he/she is alive
+ //we don't have this one in our membership, check to see if
the member is alive
if (memberAlive(members[i])) {
log.warn(sm.getString("tcpFailureDetector.performBasicCheck.memberAdded",
members[i]));
super.memberAdded(members[i]);
diff --git a/java/org/apache/coyote/Response.java
b/java/org/apache/coyote/Response.java
index 99d3324..f46dfed 100644
--- a/java/org/apache/coyote/Response.java
+++ b/java/org/apache/coyote/Response.java
@@ -432,7 +432,7 @@ public final class Response {
return true;
} catch( NumberFormatException ex ) {
// Do nothing - the spec doesn't have any "throws"
- // and the user might know what he's doing
+ // and the user might know what they're doing
return false;
}
}
diff --git a/java/org/apache/tomcat/util/buf/Utf8Decoder.java
b/java/org/apache/tomcat/util/buf/Utf8Decoder.java
index ca819c42..932e88c 100644
--- a/java/org/apache/tomcat/util/buf/Utf8Decoder.java
+++ b/java/org/apache/tomcat/util/buf/Utf8Decoder.java
@@ -155,7 +155,7 @@ public class Utf8Decoder extends CharsetDecoder {
int inIndex = pos + in.arrayOffset();
int outIndex = out.position() + out.arrayOffset();
// if someone would change the limit in process,
- // he would face consequences
+ // they would face consequences
for (; inIndex < inIndexLimit && outRemaining > 0; inIndex++) {
int jchar = bArr[inIndex];
if (jchar < 0) {
diff --git a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
index a12074a..0a9b463 100644
--- a/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java
@@ -903,11 +903,11 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
accepted = Accepted.EXPLICIT;
break;
case IMPLICIT:
- // A user did not start handshake by calling this method by
him/herself,
+ // A user did not start handshake by calling this method by
themselves,
// but handshake has been started already by wrap() or unwrap()
implicitly.
// Because it's the user's first time to call this method, it is
unfair to
- // raise an exception. From the user's standpoint, he or she
never asked
- // for renegotiation.
+ // raise an exception. From the user's standpoint, they never
asked for
+ // renegotiation.
accepted = Accepted.EXPLICIT; // Next time this method is invoked
by the user, we should raise an exception.
break;
diff --git a/webapps/docs/appdev/build.xml.txt
b/webapps/docs/appdev/build.xml.txt
index 51d8350..a75afe1 100644
--- a/webapps/docs/appdev/build.xml.txt
+++ b/webapps/docs/appdev/build.xml.txt
@@ -111,7 +111,7 @@
Defaults to "dist".
manager.password The login password of a user that is assigned the
- "manager-script" role (so that he or she can execute
+ "manager-script" role (so that they can execute
commands via the "/manager" web application)
manager.url The URL of the "/manager" web application on the
@@ -119,7 +119,7 @@
applications and web services.
manager.username The login username of a user that is assigned the
- "manager-script" role (so that he or she can execute
+ "manager-script" role (so that they can execute
commands via the "/manager" web application)
-->
diff --git a/webapps/docs/appdev/deployment.xml
b/webapps/docs/appdev/deployment.xml
index 77395a4..06349f5 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -53,8 +53,8 @@ distribute your application to be installed.</p>
<p>The top-level directory of your web application hierarchy is also the
<em>document root</em> of your application. Here, you will place the HTML
files and JSP pages that comprise your application's user interface. When the
-system administrator deploys your application into a particular server, he
-or she assigns a <em>context path</em> to your application (a later section
+system administrator deploys your application into a particular server, they
+assign a <em>context path</em> to your application (a later section
of this manual describes deployment on Tomcat). Thus, if the
system administrator assigns your application to the context path
<code>/catalog</code>, then a request URI referring to
diff --git a/webapps/docs/appdev/processes.xml
b/webapps/docs/appdev/processes.xml
index 276e868..ef94246 100644
--- a/webapps/docs/appdev/processes.xml
+++ b/webapps/docs/appdev/processes.xml
@@ -64,7 +64,7 @@ once (no matter how many web applications you plan to
develop).</p>
<li><p><em>Define one or more Tomcat users</em>. The <em>Manager</em> web
application runs under a security constraint that requires a user to be
logged in, and have the security role <code>manager-script</code> assigned
- to him or her. How such users are defined depends on which Realm you have
+ to then. How such users are defined depends on which Realm you have
configured in Tomcat's <code>conf/server.xml</code> file -- see the
<a href="../realm-howto.html">Realm Configuration How-To</a> for more
information. You may define any number of users (with any username
diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index f0ef4fd..7161b2b 100644
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -155,7 +155,7 @@ To maintain the CSRF protection:</p>
</ul>
<p><strong>Note</strong> that JMX proxy interface is effectively low-level
root-like
-administrative interface of Tomcat. One can do a lot, if he knows
+administrative interface of Tomcat. One can do a lot, if one knows
what commands to call. You should be cautious when enabling the
<strong>manager-jmx</strong> role.</p>
@@ -180,7 +180,7 @@ Exactly how the usernames/passwords are configured depends
on which
look something like this:
<source><![CDATA[<user username="craigmcc" password="secret"
roles="standard,manager-script" />]]></source>
which defines the username and password used by this individual to
- log on, and the role names he or she is associated with. You can
+ log on, and the role names they are associated with. You can
add the <strong>manager-script</strong> role to the comma-delimited
<code>roles</code> attribute for one or more existing users, and/or
create new users with that assigned role.</li>
diff --git a/webapps/docs/realm-howto.xml b/webapps/docs/realm-howto.xml
index 1cd8567..9f19c6d 100644
--- a/webapps/docs/realm-howto.xml
+++ b/webapps/docs/realm-howto.xml
@@ -392,7 +392,7 @@ name "java:/comp/env/jdbc/authority".</p>
<code>Realm</code>. Thus, any changes you have made to the database
directly (new users, changed passwords or roles, etc.) will be immediately
reflected.</li>
-<li>Once a user has been authenticated, the user (and his or her associated
+<li>Once a user has been authenticated, the user (and their associated
roles) are cached within Tomcat for the duration of the user's login.
(For FORM-based authentication, that means until the session times out or
is invalidated; for BASIC authentication, that means until the user
@@ -737,10 +737,10 @@ userPassword: janet</source>
searches the directory for a unique entry with that value as its mail
attribute and attempts to bind to the directory as
<code>uid=jjones,ou=people,dc=mycompany,dc=com</code> with the given
-password. If authentication succeeds, she is assigned three roles:
-"role2" and "role3", the values of the "memberOf" attribute in her
+password. If authentication succeeds, they are assigned three roles:
+"role2" and "role3", the values of the "memberOf" attribute in their
directory entry, and "tomcat", the value of the "cn" attribute in the
-only group entry of which she is a member.</p>
+only group entry of which they are a member.</p>
<p>Finally, to authenticate the user by retrieving
the password from the directory and making a local comparison in the
@@ -769,7 +769,7 @@ authentication is usually to be preferred.</p>
<code>Realm</code>. Thus, any changes you have made to the directory
(new users, changed passwords or roles, etc.) will be immediately
reflected.</li>
-<li>Once a user has been authenticated, the user (and his or her associated
+<li>Once a user has been authenticated, the user (and their associated
roles) are cached within Tomcat for the duration of the user's login.
(For FORM-based authentication, that means until the session times out or
is invalidated; for BASIC authentication, that means until the user
@@ -836,7 +836,7 @@ to all virtual hosts and web applications. The default
contents of the
<li>When a user attempts to access a protected resource for the first time,
Tomcat will call the <code>authenticate()</code> method of this
<code>Realm</code>.</li>
-<li>Once a user has been authenticated, the user (and his or her associated
+<li>Once a user has been authenticated, the user (and their associated
roles) are cached within Tomcat for the duration of the user's login.
(For FORM-based authentication, that means until the session times out or
is invalidated; for BASIC authentication, that means until the user
@@ -894,7 +894,7 @@ valid user, consisting of the following attributes:</p>
<li>When a user attempts to access a protected resource for the first time,
Tomcat will call the <code>authenticate()</code> method of this
<code>Realm</code>.</li>
-<li>Once a user has been authenticated, the user (and his or her associated
+<li>Once a user has been authenticated, the user (and their associated
roles) are cached within Tomcat for the duration of the user's login.
(For FORM-based authentication, that means until the session times out or
is invalidated; for BASIC authentication, that means until the user
@@ -1005,8 +1005,8 @@ and restarting the server, without any code changes to
your application.</li>
method of this <code>Realm</code>. Thus, any changes you have
made in
the security mechanism directly (new users, changed passwords or
roles, etc.) will be immediately reflected.</li>
- <li>Once a user has been authenticated, the user (and his or
- her associated roles) are cached within Tomcat for the duration
of
+ <li>Once a user has been authenticated, the user (and their
+ associated roles) are cached within Tomcat for the duration of
the user's login. For FORM-based authentication, that means
until
the session times out or is invalidated; for BASIC
authentication,
that means until the user closes their browser. Any changes to
the
diff --git a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
index a25adc8..c7e966f 100644
--- a/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
+++ b/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
@@ -193,7 +193,7 @@ public final class Room {
TIMER_DELAY, TIMER_DELAY);
}
- // Send him the current number of players and the current room image.
+ // Send the current number of players and the current room image.
String content = String.valueOf(players.size());
p.sendRoomMessage(MessageType.IMAGE_MESSAGE, content);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
