[commons-codec] branch master updated: Standardize on US English spelling.

[gg...@apache.org]

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-codec.git


The following commit(s) were added to refs/heads/master by this push:
     new 4bc2c28  Standardize on US English spelling.
     new b957a82  Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-codec
4bc2c28 is described below

commit 4bc2c28a190e7cc774dda60038c74865c9058946
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Dec 27 20:47:10 2019 -0500

    Standardize on US English spelling.
---
 src/main/java/org/apache/commons/codec/digest/MurmurHash3.java    | 4 ++--
 src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index d4a95ea..7ccc39c 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -754,7 +754,7 @@ public final class MurmurHash3 {
      * <p>This is an implementation of the 128-bit hash function {@code MurmurHash3_x64_128}
      * from from Austin Applyby's original MurmurHash3 {@code c++} code in SMHasher.</p>
      *
-     * <p>This implementation contains a sign-extension bug in the seed initialisation.
+     * <p>This implementation contains a sign-extension bug in the seed initialization.
      * This manifests if the seed is negative.<p>
      *
      * @param data The input byte array
@@ -762,7 +762,7 @@ public final class MurmurHash3 {
      * @param length The length of array
      * @param seed The initial seed value
      * @return The 128-bit hash (2 longs)
-     * @deprecated Use {@link #hash128x64(byte[], int, int, int)}. This corrects the seed initialisation.
+     * @deprecated Use {@link #hash128x64(byte[], int, int, int)}. This corrects the seed initialization.
      */
     @Deprecated
     public static long[] hash128(final byte[] data, final int offset, final int length, final int seed) {
diff --git a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
index 6a4c305..1b1d0b5 100644
--- a/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
+++ b/src/test/java/org/apache/commons/codec/binary/BaseNCodecTest.java
@@ -201,7 +201,7 @@ public class BaseNCodecTest {
         final Context context = new Context();
         Assert.assertNull("Initial buffer should be null", context.buffer);
 
-        // Test initialisation
+        // Test initialization
         context.pos = 76979;
         context.readPos = 273;
         ncodec.ensureBufferSize(0, context);