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-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new 96720ce Standardize on US spelling of "behavior".
96720ce is described below
commit 96720ced6f263462aaae7217392399267b1d141f
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue May 28 23:50:13 2019 -0400
Standardize on US spelling of "behavior".
---
src/changes/changes.xml | 6 +++---
src/site/xdoc/userguide/howto_combinedbuilder.xml | 4 ++--
src/site/xdoc/userguide_v1.10/howto_configurationbuilder.xml | 4 ++--
.../{TestEqualBehaviour.java => TestEqualBehavior.java} | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f9f6bf5..b741749 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -772,7 +772,7 @@
<action dev="henning" type="fix" issue="CONFIGURATION-556">
In 1.7 and before, any change to the system properties was
immediately reflected in a SystemConfiguration object. This
- behaviour broke in 1.8 and 1.9. This has been fixed for 1.10.
+ behavior broke in 1.8 and 1.9. This has been fixed for 1.10.
</action>
<action dev="henning" type="fix" issue="CONFIGURATION-557">
In 1.7 and before, it was possible to pass an arbitrary Map
@@ -2298,10 +2298,10 @@
accessed with the getContext() method which is now public.
</action>
<action dev="henning" type="add">
- Make the behaviour on missing properties for the get methods that
+ Make the behavior on missing properties for the get methods that
return objects configurable. A property throwExceptionOnMissing
can be set and then the getters throw an NoSuchElementException.
- The old default behaviour of returning a null value has
+ The old default behavior of returning a null value has
been restored.
</action>
<action dev="epugh" type="add" issue="CONFIGURATION-151">
diff --git a/src/site/xdoc/userguide/howto_combinedbuilder.xml
b/src/site/xdoc/userguide/howto_combinedbuilder.xml
index e19bcf6..26a47cd 100644
--- a/src/site/xdoc/userguide/howto_combinedbuilder.xml
+++ b/src/site/xdoc/userguide/howto_combinedbuilder.xml
@@ -397,7 +397,7 @@ CombinedConfigurationBuilder builder =
configs.combinedBuilder("path/to/definiti
In an earlier section about the configuration definition file for
<code>CombinedConfigurationBuilder</code> it was stated that
configuration
files included first can override properties in configuration files
- included later, and an example use case for this behaviour was given.
There
+ included later, and an example use case for this behavior was given.
There
may be cases when there are other requirements.
</p>
<p>
@@ -504,7 +504,7 @@ CombinedConfigurationBuilder builder =
configs.combinedBuilder("path/to/definiti
if there is also an <code><additional></code> section.
</p>
<p>
- It is the <code><additional></code> section that introduces a new
behaviour.
+ It is the <code><additional></code> section that introduces a new
behavior.
All configuration sources listed here are combined to a union
configuration.
In our example we have put two <code>xml</code> elements in this area
that load the available files with database table definitions. The syntax
diff --git a/src/site/xdoc/userguide_v1.10/howto_configurationbuilder.xml
b/src/site/xdoc/userguide_v1.10/howto_configurationbuilder.xml
index dcc25c6..6a2a43e 100644
--- a/src/site/xdoc/userguide_v1.10/howto_configurationbuilder.xml
+++ b/src/site/xdoc/userguide_v1.10/howto_configurationbuilder.xml
@@ -231,7 +231,7 @@ Configuration config = builder.getConfiguration(true);
In an earlier section about the configuration definition file for
<code>DefaultConfigurationBuilder</code> it was stated that configuration
files included first can override properties in configuration files
- included later, and an example use case for this behaviour was given.
There
+ included later, and an example use case for this behavior was given.
There
may be cases when there are other requirements.
</p>
<p>
@@ -337,7 +337,7 @@ Configuration config = builder.getConfiguration(true);
if there is also an <code><additional></code> section.
</p>
<p>
- It is the <code><additional></code> section that introduces a new
behaviour.
+ It is the <code><additional></code> section that introduces a new
behavior.
All configuration sources listed here are combined to a union
configuration.
In our example we have put two <code>xml</code> elements in this area
that load the available files with database table definitions. The syntax
diff --git
a/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java
b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
similarity index 99%
rename from
src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java
rename to src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
index fae528a..d7ffbb5 100644
--- a/src/test/java/org/apache/commons/configuration2/TestEqualBehaviour.java
+++ b/src/test/java/org/apache/commons/configuration2/TestEqualBehavior.java
@@ -35,7 +35,7 @@ import org.junit.Test;
* and normal (Properties) Configuration
*
*/
-public class TestEqualBehaviour
+public class TestEqualBehavior
{
private Configuration setupSimpleConfiguration()
throws Exception
