I like British English myself. On 3 August 2016 at 18:23, Remko Popma <remko.po...@gmail.com> wrote:
> We never agreed that there is any need to standardize on a particular > flavour of the English language. Let's celebrate our diversity and the fact > that we are a global community. I respectfully ask that this change is > reverted. -Remko > > > On Thursday, 4 August 2016, <ggreg...@apache.org> wrote: > >> Repository: logging-log4j2 >> Updated Branches: >> refs/heads/master 248efa48a -> 2aeebfe4d >> >> >> Use the standard US English spelling for "behavior". >> >> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo >> Commit: >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2aeebfe4 >> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2aeebfe4 >> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2aeebfe4 >> >> Branch: refs/heads/master >> Commit: 2aeebfe4db5e0914e6fd3775d96d956d46679bc1 >> Parents: 248efa4 >> Author: Gary Gregory <ggreg...@apache.org> >> Authored: Wed Aug 3 15:32:03 2016 -0700 >> Committer: Gary Gregory <ggreg...@apache.org> >> Committed: Wed Aug 3 15:32:03 2016 -0700 >> >> ---------------------------------------------------------------------- >> .../src/main/java/org/apache/logging/log4j/util/Constants.java | 2 +- >> .../logging/log4j/core/appender/MemoryMappedFileAppender.java | 2 +- >> .../logging/log4j/core/appender/RandomAccessFileAppender.java | 2 +- >> .../log4j/core/appender/RollingRandomAccessFileAppender.java | 2 +- >> .../logging/log4j/core/async/AsyncQueueFullPolicyFactory.java | 4 ++-- >> .../main/java/org/apache/logging/log4j/core/util/Constants.java | 4 ++-- >> 6 files changed, 8 insertions(+), 8 deletions(-) >> ---------------------------------------------------------------------- >> >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java >> b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java >> index 2b64550..6e84d10 100644 >> --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java >> +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/Constants.java >> @@ -31,7 +31,7 @@ public final class Constants { >> "log4j2.is.webapp", >> isClassAvailable("javax.servlet.Servlet")); >> >> /** >> - * Kill switch for object pooling in ThreadLocals that enables much >> of the LOG4J2-1270 no-GC behaviour. >> + * Kill switch for object pooling in ThreadLocals that enables much >> of the LOG4J2-1270 no-GC behavior. >> * <p> >> * {@code True} for non-{@link #IS_WEB_APP web apps}, disable by >> setting system property >> * "log4j2.enable.threadlocals" to "false". >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java >> index 0949ffd..3270e29 100644 >> --- >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java >> +++ >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java >> @@ -81,7 +81,7 @@ public final class MemoryMappedFileAppender extends >> AbstractOutputStreamAppender >> @Override >> public void append(final LogEvent event) { >> >> - // Leverage the nice batching behaviour of async >> Loggers/Appenders: >> + // Leverage the nice batching behavior of async >> Loggers/Appenders: >> // we can signal the file manager that it needs to flush the >> buffer >> // to disk at the end of a batch. >> // From a user's point of view, this means that all log events >> are >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java >> index 738816d..dcceb0d 100644 >> --- >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java >> +++ >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java >> @@ -77,7 +77,7 @@ public final class RandomAccessFileAppender extends >> AbstractOutputStreamAppender >> @Override >> public void append(final LogEvent event) { >> >> - // Leverage the nice batching behaviour of async >> Loggers/Appenders: >> + // Leverage the nice batching behavior of async >> Loggers/Appenders: >> // we can signal the file manager that it needs to flush the >> buffer >> // to disk at the end of a batch. >> // From a user's point of view, this means that all log events >> are >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java >> index 67777e6..2f8c805 100644 >> --- >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java >> +++ >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java >> @@ -87,7 +87,7 @@ public final class RollingRandomAccessFileAppender >> extends AbstractOutputStreamA >> final RollingRandomAccessFileManager manager = getManager(); >> manager.checkRollover(event); >> >> - // Leverage the nice batching behaviour of async >> Loggers/Appenders: >> + // Leverage the nice batching behavior of async >> Loggers/Appenders: >> // we can signal the file manager that it needs to flush the >> buffer >> // to disk at the end of a batch. >> // From a user's point of view, this means that all log events >> are >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java >> index 534a899..e8d7d5c 100644 >> --- >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java >> +++ >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java >> @@ -27,7 +27,7 @@ import org.apache.logging.log4j.util.PropertiesUtil; >> * created by this factory is used in AsyncLogger, AsyncLoggerConfig and >> AsyncAppender >> * to control if events are logged in the current thread, the background >> thread, or discarded. >> * <p> >> - * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the routing >> behaviour. If this property is not specified or has >> + * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the routing >> behavior. If this property is not specified or has >> * value {@code "Default"}, this factory creates {@link >> DefaultAsyncQueueFullPolicy} objects. >> * </p> <p> >> * If this property has value {@code "Discard"}, this factory creates >> {@link DiscardingAsyncQueueFullPolicy} objects. >> @@ -53,7 +53,7 @@ public class AsyncQueueFullPolicyFactory { >> /** >> * Creates and returns {@link AsyncQueueFullPolicy} instances based >> on user-specified system properties. >> * <p> >> - * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the >> routing behaviour. If this property is not specified or >> + * Property {@code "log4j2.AsyncQueueFullPolicy"} controls the >> routing behavior. If this property is not specified or >> * has value {@code "Default"}, this method returns {@link >> DefaultAsyncQueueFullPolicy} objects. >> * </p> <p> >> * If this property has value {@code "Discard"}, this method returns >> {@link DiscardingAsyncQueueFullPolicy} objects. >> >> >> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2aeebfe4/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java >> ---------------------------------------------------------------------- >> diff --git >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java >> index 09ec0bb..ab10360 100644 >> --- >> a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java >> +++ >> b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java >> @@ -79,7 +79,7 @@ public final class Constants { >> public static final boolean IS_WEB_APP = >> org.apache.logging.log4j.util.Constants.IS_WEB_APP; >> >> /** >> - * Kill switch for object pooling in ThreadLocals that enables much >> of the LOG4J2-1270 no-GC behaviour. >> + * Kill switch for object pooling in ThreadLocals that enables much >> of the LOG4J2-1270 no-GC behavior. >> * <p> >> * {@code True} for non-{@link #IS_WEB_APP web apps}, disable by >> setting system property >> * "log4j2.enable.threadlocals" to "false". >> @@ -89,7 +89,7 @@ public final class Constants { >> public static final boolean ENABLE_THREADLOCALS = >> org.apache.logging.log4j.util.Constants.ENABLE_THREADLOCALS; >> >> /** >> - * Kill switch for garbage-free Layout behaviour that encodes >> LogEvents directly into >> + * Kill switch for garbage-free Layout behavior that encodes >> LogEvents directly into >> * {@link >> org.apache.logging.log4j.core.layout.ByteBufferDestination}s without >> creating intermediate temporary >> * Objects. >> * <p> >> >> -- Matt Sicker <boa...@gmail.com>
