This is an automated email from the ASF dual-hosted git repository.
markt 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 68c42b803b Language improvements
68c42b803b is described below
commit 68c42b803b99a2bd2745fbbb14ed0264f3f332ef
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Apr 29 12:19:46 2022 +0100
Language improvements
---
BUILDING.txt | 12 ++++++------
RELEASE-NOTES | 2 +-
RUNNING.txt | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 7973ec83f0..cab413dc6a 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -272,7 +272,7 @@ You can build them by using the following commands:
You do not need it if you do not plan to sign the release.
If "gpg.exec" property does not point to an existing file, it will be
- ignored and this feature will be disabled.
+ ignored and this feature will be deactivated.
You will be prompted for the GPG passphrase when the release build
starts, unless "gpg.passphrase" property is set.
@@ -339,7 +339,7 @@ implementations of Tomcat connectors: NIO, NIO2 and APR.
(If you are not
familiar with Tomcat connectors, see config/http.html in documentation for
details).
-The 3 runs are enabled and disabled individually by the following
+The 3 runs are activated and deactivated individually by the following
properties, which all are "true" by default:
execute.test.nio=true
@@ -439,7 +439,7 @@ as for the property "test.name".
Configuration properties are "junit.formatter.type",
"junit.formatter.extension" and "junit.formatter.usefile".
- For example the following property disables generation of separate report
+ For example the following property deactivates generation of separate report
files:
junit.formatter.usefile=false
@@ -463,7 +463,7 @@ NOTE: Cobertura is licensed under GPL v2 with parts of it
being under
Using Cobertura currently requires setting test.threads configuration
property to the value of 1. Setting that property to a different value
- will disable code coverage.
+ will deactivate code coverage.
The report files by default are written to
@@ -474,7 +474,7 @@ NOTE: Cobertura is licensed under GPL v2 with parts of it
being under
processes are running.
These assumptions are not always true (e.g. on CI systems running in a
- virtual machine) so the performance tests may be disabled by using the
+ virtual machine) so the performance tests may be deactivated by using the
following property:
test.excludePerformance=true
@@ -492,7 +492,7 @@ NOTE: Cobertura is licensed under GPL v2 with parts of it
being under
java.net.preferIPv4Stack=true
10. By default the output of unit tests is sent to the console and can be
- quite verbose. The output can be disabled by setting the property:
+ quite verbose. The output can be deactivated by setting the property:
test.verbose=false
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0a36824568..a341e447d3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -132,7 +132,7 @@ Symlinking static resources:
By default, Unix symlinks will not work when used in a web application to link
resources located outside the web application root directory.
-This behavior is optional, and the "allowLinking" flag may be used to disable
+This behavior is optional, and the "allowLinking" flag may be used to
deactivate
the check.
diff --git a/RUNNING.txt b/RUNNING.txt
index ba36d53979..5e9faebbc5 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -132,8 +132,8 @@ belong to CATALINA_OPTS.
Another frequently used variable is CATALINA_PID (on *nix only). It
specifies the location of the file where process id of the forked Tomcat
-java process will be written. This setting is optional. It will enable the
-following features:
+java process will be written. This setting is optional. It will activate
+the following features:
* better protection against duplicate start attempts and
* allows forceful termination of Tomcat process when it does not react to
@@ -421,9 +421,9 @@ For further reading:
https://httpd.apache.org/
-To disable Apache Tomcat Native library:
+To deactivate Apache Tomcat Native library:
- - To disable Apache Tomcat Native library when it is installed, or
+ - To deactivate Apache Tomcat Native library when it is installed, or
- To remove the warning that is logged during Tomcat startup when the
library is not installed:
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
