This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 9747b14 Standardize on American English spelling of 'behavior'.
9747b14 is described below
commit 9747b14469aa88714bc979cab24e1ffda663aa78
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 30 15:03:29 2020 -0400
Standardize on American English spelling of 'behavior'.
---
RELEASE-NOTES.txt | 4 ++--
src/changes/changes.xml | 4 ++--
.../java/org/apache/commons/lang3/ArrayUtils.java | 2 +-
.../org/apache/commons/lang3/BooleanUtils.java | 2 +-
.../org/apache/commons/lang3/CharSetUtils.java | 2 +-
.../java/org/apache/commons/lang3/CharUtils.java | 2 +-
.../java/org/apache/commons/lang3/ClassUtils.java | 2 +-
.../java/org/apache/commons/lang3/LocaleUtils.java | 4 ++--
.../java/org/apache/commons/lang3/ObjectUtils.java | 2 +-
.../apache/commons/lang3/SerializationUtils.java | 2 +-
.../org/apache/commons/lang3/text/StrBuilder.java | 22 +++++++++++-----------
.../org/apache/commons/lang3/text/WordUtils.java | 2 +-
.../text/translate/NumericEntityUnescaper.java | 2 +-
.../apache/commons/lang3/tuple/ImmutablePair.java | 2 +-
.../commons/lang3/tuple/ImmutableTriple.java | 2 +-
.../resources/release-notes/RELEASE-NOTES-2.1.txt | 4 ++--
.../resources/release-notes/RELEASE-NOTES-2.2.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-2.3.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-2.4.txt | 2 +-
.../release-notes/RELEASE-NOTES-3.2.1.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-3.2.txt | 2 +-
.../release-notes/RELEASE-NOTES-3.3.1.txt | 2 +-
.../release-notes/RELEASE-NOTES-3.3.2.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-3.3.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-3.4.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-3.5.txt | 2 +-
.../resources/release-notes/RELEASE-NOTES-3.6.txt | 4 ++--
.../resources/release-notes/RELEASE-NOTES-3.7.txt | 4 ++--
.../release-notes/RELEASE-NOTES-3.8.1.txt | 4 ++--
.../resources/release-notes/RELEASE-NOTES-3.8.txt | 4 ++--
.../resources/release-notes/RELEASE-NOTES-3.9.txt | 4 ++--
src/site/xdoc/article3_0.xml | 2 +-
src/site/xdoc/upgradeto2_1.xml | 4 ++--
src/site/xdoc/upgradeto2_3.xml | 2 +-
src/site/xdoc/upgradeto2_4.xml | 2 +-
.../commons/lang3/StringEscapeUtilsTest.java | 4 ++--
36 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 1379254..33771d0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -418,7 +418,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -1128,7 +1128,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 86afaaa..f79d5c4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -189,7 +189,7 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="LANG-1256" type="add" dev="pschumacher" due-to="C0rWin">Add
JMH maven dependencies</action>
<action issue="LANG-1167" type="add" dev="chtompki" due-to="Mark
Dacek">Add null filter to ReflectionToStringBuilder</action>
<action issue="LANG-1320" type="fix" dev="britter">LocaleUtils#toLocale
does not support language followed by UN M.49 numeric-3 area code followed by
variant</action>
- <action issue="LANG-1300" type="fix" dev="chtompki" due-to="Mark
Dacek">Clarify or improve behaviour of int-based indexOf methods in
StringUtils</action>
+ <action issue="LANG-1300" type="fix" dev="chtompki" due-to="Mark
Dacek">Clarify or improve behavior of int-based indexOf methods in
StringUtils</action>
<action issue="LANG-1299" type="add" dev="djones">Add method for
converting string to an array of code points</action>
<action issue="LANG-1286" type="fix" dev="djones">RandomStringUtils random
method can overflow and return characters outside of specified range</action>
<action issue="LANG-660" type="add" dev="djones">Add methods to insert
arrays into arrays at an index</action>
@@ -523,7 +523,7 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="LANG-828" type="fix">FastDateParser does not handle
non-Gregorian calendars properly</action>
<action issue="LANG-826" type="fix">FastDateParser does not handle
non-ASCII digits correctly</action>
<action issue="LANG-825" type="add">Create StrBuilder APIs similar to
String.format(String, Object...)</action>
- <action issue="LANG-822" type="fix">NumberUtils#createNumber - bad
behaviour for leading "--"</action>
+ <action issue="LANG-822" type="fix">NumberUtils#createNumber - bad
behavior for leading "--"</action>
<action issue="LANG-818" type="fix">FastDateFormat's "z" pattern does not
respect timezone of Calendar instances passed to format()</action>
<action issue="LANG-817" type="fix">Add
org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8</action>
<action issue="LANG-813" type="fix">StringUtils.equalsIgnoreCase doesn't
check string reference equality</action>
diff --git a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
index 010d8c1..320fba6 100644
--- a/src/main/java/org/apache/commons/lang3/ArrayUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ArrayUtils.java
@@ -41,7 +41,7 @@ import org.apache.commons.lang3.mutable.MutableInt;
* <p>This class tries to handle {@code null} input gracefully.
* An exception will not be thrown for a {@code null}
* array input. However, an Object array that contains a {@code null}
- * element may throw an exception. Each method documents its behaviour.
+ * element may throw an exception. Each method documents its behavior.
*
* <p>#ThreadSafe#
* @since 2.0
diff --git a/src/main/java/org/apache/commons/lang3/BooleanUtils.java
b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
index 7cf3794..5bfcea2 100644
--- a/src/main/java/org/apache/commons/lang3/BooleanUtils.java
+++ b/src/main/java/org/apache/commons/lang3/BooleanUtils.java
@@ -23,7 +23,7 @@ import org.apache.commons.lang3.math.NumberUtils;
*
* <p>This class tries to handle {@code null} input gracefully.
* An exception will not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>#ThreadSafe#</p>
* @since 2.0
diff --git a/src/main/java/org/apache/commons/lang3/CharSetUtils.java
b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
index b3580b7..03ff899 100644
--- a/src/main/java/org/apache/commons/lang3/CharSetUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharSetUtils.java
@@ -21,7 +21,7 @@ package org.apache.commons.lang3;
*
* <p>This class handles {@code null} input gracefully.
* An exception will not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>#ThreadSafe#</p>
* @see CharSet
diff --git a/src/main/java/org/apache/commons/lang3/CharUtils.java
b/src/main/java/org/apache/commons/lang3/CharUtils.java
index b872ac0..b4e8ccf 100644
--- a/src/main/java/org/apache/commons/lang3/CharUtils.java
+++ b/src/main/java/org/apache/commons/lang3/CharUtils.java
@@ -21,7 +21,7 @@ package org.apache.commons.lang3;
*
* <p>This class tries to handle {@code null} input gracefully.
* An exception will not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>#ThreadSafe#</p>
* @since 2.1
diff --git a/src/main/java/org/apache/commons/lang3/ClassUtils.java
b/src/main/java/org/apache/commons/lang3/ClassUtils.java
index d0891dd..a6d1d1d 100644
--- a/src/main/java/org/apache/commons/lang3/ClassUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ClassUtils.java
@@ -34,7 +34,7 @@ import org.apache.commons.lang3.mutable.MutableObject;
* <p>Operates on classes without using reflection.</p>
*
* <p>This class handles invalid {@code null} inputs as best it can.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>The notion of a {@code canonical name} includes the human
* readable name for the type, for example {@code int[]}. The
diff --git a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
index 703b336..3dd8cf1 100644
--- a/src/main/java/org/apache/commons/lang3/LocaleUtils.java
+++ b/src/main/java/org/apache/commons/lang3/LocaleUtils.java
@@ -31,7 +31,7 @@ import java.util.concurrent.ConcurrentMap;
*
* <p>This class tries to handle {@code null} input gracefully.
* An exception will not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* @since 2.2
*/
@@ -71,7 +71,7 @@ public class LocaleUtils {
* LocaleUtils.toLocale("en_GB_xxx") = new Locale("en", "GB", "xxx")
(#)
* </pre>
*
- * <p>(#) The behaviour of the JDK variant constructor changed between
JDK1.3 and JDK1.4.
+ * <p>(#) The behavior of the JDK variant constructor changed between
JDK1.3 and JDK1.4.
* In JDK1.3, the constructor upper cases the variant, in JDK1.4, it
doesn't.
* Thus, the result from getVariant() may vary depending on your JDK.</p>
*
diff --git a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
index b94c2ae..940dcd8 100644
--- a/src/main/java/org/apache/commons/lang3/ObjectUtils.java
+++ b/src/main/java/org/apache/commons/lang3/ObjectUtils.java
@@ -38,7 +38,7 @@ import org.apache.commons.lang3.text.StrBuilder;
*
* <p>This class tries to handle {@code null} input gracefully.
* An exception will generally not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>#ThreadSafe#</p>
* @since 1.0
diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java
b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
index 14bfc1d..5f7ed8c 100644
--- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java
+++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java
@@ -39,7 +39,7 @@ import java.util.Map;
* </ul>
*
* <p>This class throws exceptions for invalid {@code null} inputs.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* <p>#ThreadSafe#</p>
* @since 1.0
diff --git a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
index 31779b4..21c88e4 100644
--- a/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/text/StrBuilder.java
@@ -1894,7 +1894,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Deletes all parts of the builder that the matcher matches.
* <p>
- * Matchers can be used to perform advanced deletion behaviour.
+ * Matchers can be used to perform advanced deletion behavior.
* For example you could write a matcher to delete all occurrences
* where the character 'a' is followed by a number.
*
@@ -1908,7 +1908,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Deletes the first match within the builder using the specified matcher.
* <p>
- * Matchers can be used to perform advanced deletion behaviour.
+ * Matchers can be used to perform advanced deletion behavior.
* For example you could write a matcher to delete
* where the character 'a' is followed by a number.
*
@@ -2044,7 +2044,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Replaces all matches within the builder with the replace string.
* <p>
- * Matchers can be used to perform advanced replace behaviour.
+ * Matchers can be used to perform advanced replace behavior.
* For example you could write a matcher to replace all occurrences
* where the character 'a' is followed by a number.
*
@@ -2059,7 +2059,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Replaces the first match within the builder with the replace string.
* <p>
- * Matchers can be used to perform advanced replace behaviour.
+ * Matchers can be used to perform advanced replace behavior.
* For example you could write a matcher to replace
* where the character 'a' is followed by a number.
*
@@ -2075,7 +2075,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Advanced search and replaces within the builder using a matcher.
* <p>
- * Matchers can be used to perform advanced behaviour.
+ * Matchers can be used to perform advanced behavior.
* For example you could write a matcher to delete all occurrences
* where the character 'a' is followed by a number.
*
@@ -2098,7 +2098,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Replaces within the builder using a matcher.
* <p>
- * Matchers can be used to perform advanced behaviour.
+ * Matchers can be used to perform advanced behavior.
* For example you could write a matcher to delete all occurrences
* where the character 'a' is followed by a number.
*
@@ -2390,7 +2390,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* Checks if the string builder contains a string matched using the
* specified matcher.
* <p>
- * Matchers can be used to perform advanced searching behaviour.
+ * Matchers can be used to perform advanced searching behavior.
* For example you could write a matcher to search for the character
* 'a' followed by a number.
*
@@ -2487,7 +2487,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Searches the string builder using the matcher to find the first match.
* <p>
- * Matchers can be used to perform advanced searching behaviour.
+ * Matchers can be used to perform advanced searching behavior.
* For example you could write a matcher to find the character 'a'
* followed by a number.
*
@@ -2502,7 +2502,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* Searches the string builder using the matcher to find the first
* match searching from the given index.
* <p>
- * Matchers can be used to perform advanced searching behaviour.
+ * Matchers can be used to perform advanced searching behavior.
* For example you could write a matcher to find the character 'a'
* followed by a number.
*
@@ -2608,7 +2608,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
/**
* Searches the string builder using the matcher to find the last match.
* <p>
- * Matchers can be used to perform advanced searching behaviour.
+ * Matchers can be used to perform advanced searching behavior.
* For example you could write a matcher to find the character 'a'
* followed by a number.
*
@@ -2623,7 +2623,7 @@ public class StrBuilder implements CharSequence,
Appendable, Serializable, Build
* Searches the string builder using the matcher to find the last
* match searching from the given index.
* <p>
- * Matchers can be used to perform advanced searching behaviour.
+ * Matchers can be used to perform advanced searching behavior.
* For example you could write a matcher to find the character 'a'
* followed by a number.
*
diff --git a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
index aa84e75..ee1249e 100644
--- a/src/main/java/org/apache/commons/lang3/text/WordUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/WordUtils.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang3.StringUtils;
*
* <p>This class tries to handle {@code null} input gracefully.
* An exception will not be thrown for a {@code null} input.
- * Each method documents its behaviour in more detail.</p>
+ * Each method documents its behavior in more detail.</p>
*
* @since 2.0
* @deprecated as of 3.6, use commons-text
diff --git
a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
index 2b7ee8e..b9da84a 100644
---
a/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
+++
b/src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java
@@ -54,7 +54,7 @@ public class NumericEntityUnescaper extends
CharSequenceTranslator {
* and to throw an IllegalArgumentException when they're missing:
* new
NumericEntityUnescaper(NumericEntityUnescaper.OPTION.errorIfNoSemiColon)
*
- * Note that the default behaviour is to ignore them.
+ * Note that the default behavior is to ignore them.
*
* @param options to apply to this unescaper
*/
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
index a9be293..9c106e6 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
@@ -24,7 +24,7 @@ import java.util.Map;
* <p>Although the implementation is immutable, there is no restriction on the
objects
* that may be stored. If mutable objects are stored in the pair, then the pair
* itself effectively becomes mutable. The class is also {@code final}, so a
subclass
- * can not add undesirable behaviour.</p>
+ * can not add undesirable behavior.</p>
*
* <p>#ThreadSafe# if both paired objects are thread-safe</p>
*
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
index f51df45..e30689e 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutableTriple.java
@@ -22,7 +22,7 @@ package org.apache.commons.lang3.tuple;
* <p>Although the implementation is immutable, there is no restriction on the
objects
* that may be stored. If mutable objects are stored in the triple, then the
triple
* itself effectively becomes mutable. The class is also {@code final}, so a
subclass
- * can not add undesirable behaviour.</p>
+ * can not add undesirable behavior.</p>
*
* <p>#ThreadSafe# if all three objects are thread-safe</p>
*
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-2.1.txt
b/src/site/resources/release-notes/RELEASE-NOTES-2.1.txt
index 137c300..3c36325 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-2.1.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-2.1.txt
@@ -32,7 +32,7 @@ INCOMPATIBLE CHANGES:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
@@ -98,7 +98,7 @@ indexOfThrowable method untouched (see incompatible changes
section)
-- method to parse a date string using multiple patterns
- FastDateFormat - extra formatting methods that take in a millisecond long
value
-- additional static factory methods
-- StopWatch - new methods for split behaviour
+- StopWatch - new methods for split behavior
BUG FIXES:
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-2.2.txt
b/src/site/resources/release-notes/RELEASE-NOTES-2.2.txt
index b47e074..38e7017 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-2.2.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-2.2.txt
@@ -35,7 +35,7 @@ ADDITIONAL INCOMPATIBLE CHANGES WITH VERSION 2.0:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-2.3.txt
b/src/site/resources/release-notes/RELEASE-NOTES-2.3.txt
index fcaaf2b..f3e774e 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-2.3.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-2.3.txt
@@ -37,7 +37,7 @@ ADDITIONAL INCOMPATIBLE CHANGES WITH VERSION 2.0:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-2.4.txt
b/src/site/resources/release-notes/RELEASE-NOTES-2.4.txt
index a573521..a54b341 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-2.4.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-2.4.txt
@@ -43,7 +43,7 @@ ADDITIONAL INCOMPATIBLE CHANGES WITH VERSION 2.0:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.2.1.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.2.1.txt
index e02008a..3cfdb83 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.2.1.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.2.1.txt
@@ -147,7 +147,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.2.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.2.txt
index 29cc42a..c19d4c2 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.2.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.2.txt
@@ -135,7 +135,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.3.1.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.3.1.txt
index 43a0679..20d195a 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.3.1.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.3.1.txt
@@ -226,7 +226,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
index d4e1a46..364f20f 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.3.2.txt
@@ -239,7 +239,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.3.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.3.txt
index b810ddf..69d3076 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.3.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.3.txt
@@ -212,7 +212,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
index 7d47794..43b059e 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.4.txt
@@ -372,7 +372,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.5.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.5.txt
index af36b2b..fd14bab 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.5.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.5.txt
@@ -668,7 +668,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.6.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.6.txt
index 3cff920..87a738b 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.6.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.6.txt
@@ -142,7 +142,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -852,7 +852,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.7.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.7.txt
index d83e0ee..5746fb5 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.7.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.7.txt
@@ -194,7 +194,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -904,7 +904,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.8.1.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.8.1.txt
index fc2a186..5664a86 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.8.1.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.8.1.txt
@@ -288,7 +288,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -998,7 +998,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.8.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.8.txt
index 0206310..cea0df2 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.8.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.8.txt
@@ -255,7 +255,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -965,7 +965,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/resources/release-notes/RELEASE-NOTES-3.9.txt
b/src/site/resources/release-notes/RELEASE-NOTES-3.9.txt
index f9ee7aa..17d7ed3 100644
--- a/src/site/resources/release-notes/RELEASE-NOTES-3.9.txt
+++ b/src/site/resources/release-notes/RELEASE-NOTES-3.9.txt
@@ -311,7 +311,7 @@ o LANG-1319: MultilineRecursiveToStringStyle
StackOverflowError when object is
an array.
o LANG-1320: LocaleUtils#toLocale does not support language followed by UN M.49
numeric-3 area code followed by variant.
-o LANG-1300: Clarify or improve behaviour of int-based indexOf methods in
+o LANG-1300: Clarify or improve behavior of int-based indexOf methods in
StringUtils. Thanks to Mark Dacek.
o LANG-1286: RandomStringUtils random method can overflow and return characters
outside of specified range.
@@ -1021,7 +1021,7 @@ o LANG-831: FastDateParser does not handle white-space
properly.
o LANG-830: FastDateParser could use \Q \E to quote regexes.
o LANG-828: FastDateParser does not handle non-Gregorian calendars properly.
o LANG-826: FastDateParser does not handle non-ASCII digits correctly.
-o LANG-822: NumberUtils#createNumber - bad behaviour for leading "--".
+o LANG-822: NumberUtils#createNumber - bad behavior for leading "--".
o LANG-818: FastDateFormat's "z" pattern does not respect timezone of Calendar
instances passed to format().
o LANG-817: Add org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS_8.
diff --git a/src/site/xdoc/article3_0.xml b/src/site/xdoc/article3_0.xml
index 2a3c519..cfac368 100644
--- a/src/site/xdoc/article3_0.xml
+++ b/src/site/xdoc/article3_0.xml
@@ -184,7 +184,7 @@ available in the <a
href="userguide.html#lang.concurrent.">user guide</a>.</p>
<ul>
<li>StringUtils.isAlpha, isNumeric and isAlphanumeric now all return false
when passed an empty String. Previously they returned true. </li>
<li>SystemUtils.isJavaVersionAtLeast now relies on the
<code>java.specification.version</code> and not the <code>java.version</code>
System property. </li>
-<li>StringEscapeUtils.escapeXml and escapeHtml no longer escape high value
Unicode characters by default. The text.translate package is available to
recreate the old behaviour. </li>
+<li>StringEscapeUtils.escapeXml and escapeHtml no longer escape high value
Unicode characters by default. The text.translate package is available to
recreate the old behavior. </li>
<li>Validate utility methods have been changed and genericized to return the
validated argument where possible, to allow for inline use. </li>
<li>Validate utility methods handle validity violations arising from
diff --git a/src/site/xdoc/upgradeto2_1.xml b/src/site/xdoc/upgradeto2_1.xml
index ea40158..05aac87 100644
--- a/src/site/xdoc/upgradeto2_1.xml
+++ b/src/site/xdoc/upgradeto2_1.xml
@@ -39,7 +39,7 @@ INCOMPATIBLE CHANGES:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
@@ -105,7 +105,7 @@ indexOfThrowable method untouched (see incompatible changes
section)
-- method to parse a date string using multiple patterns
- FastDateFormat - extra formatting methods that take in a millisecond long
value
-- additional static factory methods
-- StopWatch - new methods for split behaviour
+- StopWatch - new methods for split behavior
BUG FIXES:
diff --git a/src/site/xdoc/upgradeto2_3.xml b/src/site/xdoc/upgradeto2_3.xml
index 3abf04b..a641bef 100644
--- a/src/site/xdoc/upgradeto2_3.xml
+++ b/src/site/xdoc/upgradeto2_3.xml
@@ -44,7 +44,7 @@ ADDITIONAL INCOMPATIBLE CHANGES WITH VERSION 2.0:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
diff --git a/src/site/xdoc/upgradeto2_4.xml b/src/site/xdoc/upgradeto2_4.xml
index e80e079..6e56ca4 100644
--- a/src/site/xdoc/upgradeto2_4.xml
+++ b/src/site/xdoc/upgradeto2_4.xml
@@ -50,7 +50,7 @@ ADDITIONAL INCOMPATIBLE CHANGES WITH VERSION 2.0:
- The Nestable interface defines the method indexOfThrowable(Class).
Previously the implementations checked only for a specific Class.
Now they check for subclasses of that Class as well.
-For most situations this will be the expected behaviour (ie. its a bug fix).
+For most situations this will be the expected behavior (ie. its a bug fix).
If it causes problems, please use the ExceptionUtils.indexOfThrowable(Class)
method instead.
Note that the ExceptionUtils method is available in v1.0 and v2.0 of
commons-lang and has not been changed.
(An alternative to this is to change the public static matchSubclasses flag on
NestableDelegate.
diff --git a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
index e04c20e..92ea003 100644
--- a/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
+++ b/src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java
@@ -501,11 +501,11 @@ public class StringEscapeUtilsTest {
final String original = "\u304B\u304C\u3068";
final String escaped = StringEscapeUtils.escapeHtml4(original);
assertEquals(original, escaped,
- "Hiragana character Unicode behaviour should not be being
escaped by escapeHtml4");
+ "Hiragana character Unicode behavior should not be being
escaped by escapeHtml4");
final String unescaped = StringEscapeUtils.unescapeHtml4( escaped );
- assertEquals(escaped, unescaped, "Hiragana character Unicode behaviour
has changed - expected no unescaping");
+ assertEquals(escaped, unescaped, "Hiragana character Unicode behavior
has changed - expected no unescaping");
}
/**
