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-net.git
The following commit(s) were added to refs/heads/master by this push:
new 0656402 Standardize on American English spelling of 'behavior'.
0656402 is described below
commit 06564020fcfad7b5055914209eabab1ead5edd6c
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Mar 30 15:13:02 2020 -0400
Standardize on American English spelling of 'behavior'.
---
src/changes/changes.xml | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPSClient.java | 4 ++--
src/main/java/org/apache/commons/net/imap/IMAPSClient.java | 4 ++--
src/main/java/org/apache/commons/net/pop3/POP3SClient.java | 4 ++--
src/main/java/org/apache/commons/net/smtp/SMTPSClient.java | 4 ++--
.../java/org/apache/commons/net/telnet/EchoOptionHandler.java | 4 ++--
.../java/org/apache/commons/net/telnet/SimpleOptionHandler.java | 4 ++--
.../org/apache/commons/net/telnet/SuppressGAOptionHandler.java | 4 ++--
.../java/org/apache/commons/net/telnet/TelnetOptionHandler.java | 8 ++++----
.../org/apache/commons/net/telnet/TerminalTypeOptionHandler.java | 4 ++--
.../org/apache/commons/net/telnet/WindowSizeOptionHandler.java | 4 ++--
.../org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java | 2 +-
.../commons/net/telnet/TelnetOptionHandlerTestAbstract.java | 2 +-
14 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 643e18d..3a6c8ad 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -989,7 +989,7 @@ This is primarily a maintenance release, but it also
includes new features and e
SubnetUtils.SubnetInfo.isInRange(...) returned incorrect values
</action>
<action issue="NET-261" dev="rwinston" type="update">
- SubnetUtils.SubnetInfo.isInRange(...) behaviour not documented
+ SubnetUtils.SubnetInfo.isInRange(...) behavior not documented
</action>
<action issue="NET-262" dev="rwinston" type="fix">
SubnetUtils did not handle /31 and /32 CIDRs well
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
index cd40e91..d31c947 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
@@ -147,7 +147,7 @@ public class FTPClientConfig
/**
* Identifier for alternate UNIX parser; same as {@link #SYST_UNIX} but
leading spaces are
* trimmed from file names. This is to maintain backwards compatibility
with
- * the original behaviour of the parser which ignored multiple spaces
between the date
+ * the original behavior of the parser which ignored multiple spaces
between the date
* and the start of the file name.
* @since 3.4
*/
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
index f85d361..68a835a 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
@@ -706,7 +706,7 @@ public class FTPSClient extends FTPClient {
/**
* Return whether or not endpoint identification using the HTTPS algorithm
- * on Java 1.7+ is enabled. The default behaviour is for this to be
disabled.
+ * on Java 1.7+ is enabled. The default behavior is for this to be
disabled.
*
* This check is only performed on client mode connections.
*
@@ -720,7 +720,7 @@ public class FTPSClient extends FTPClient {
/**
* Automatic endpoint identification checking using the HTTPS algorithm
- * is supported on Java 1.7+. The default behaviour is for this to be
disabled.
+ * is supported on Java 1.7+. The default behavior is for this to be
disabled.
*
* This check is only performed on client mode connections.
*
diff --git a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
index 89e61de..dde3b35 100644
--- a/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
+++ b/src/main/java/org/apache/commons/net/imap/IMAPSClient.java
@@ -363,7 +363,7 @@ public class IMAPSClient extends IMAPClient
/**
* Return whether or not endpoint identification using the HTTPS algorithm
- * on Java 1.7+ is enabled. The default behaviour is for this to be
disabled.
+ * on Java 1.7+ is enabled. The default behavior is for this to be
disabled.
*
* @return True if enabled, false if not.
* @since 3.4
@@ -375,7 +375,7 @@ public class IMAPSClient extends IMAPClient
/**
* Automatic endpoint identification checking using the HTTPS algorithm
- * is supported on Java 1.7+. The default behaviour is for this to be
disabled.
+ * is supported on Java 1.7+. The default behavior is for this to be
disabled.
*
* @param enable Enable automatic endpoint identification checking using
the HTTPS algorithm on Java 1.7+.
* @since 3.4
diff --git a/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
b/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
index ff08d6f..3ee936d 100644
--- a/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
+++ b/src/main/java/org/apache/commons/net/pop3/POP3SClient.java
@@ -368,7 +368,7 @@ public class POP3SClient extends POP3Client
/**
* Return whether or not endpoint identification using the HTTPS algorithm
- * on Java 1.7+ is enabled. The default behaviour is for this to be
disabled.
+ * on Java 1.7+ is enabled. The default behavior is for this to be
disabled.
*
* @return True if enabled, false if not.
* @since 3.4
@@ -380,7 +380,7 @@ public class POP3SClient extends POP3Client
/**
* Automatic endpoint identification checking using the HTTPS algorithm
- * is supported on Java 1.7+. The default behaviour is for this to be
disabled.
+ * is supported on Java 1.7+. The default behavior is for this to be
disabled.
*
* @param enable Enable automatic endpoint identification checking using
the HTTPS algorithm on Java 1.7+.
* @since 3.4
diff --git a/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
b/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
index 8b29479..4680b08 100644
--- a/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
+++ b/src/main/java/org/apache/commons/net/smtp/SMTPSClient.java
@@ -357,7 +357,7 @@ public class SMTPSClient extends SMTPClient
/**
* Return whether or not endpoint identification using the HTTPS algorithm
- * on Java 1.7+ is enabled. The default behaviour is for this to be
disabled.
+ * on Java 1.7+ is enabled. The default behavior is for this to be
disabled.
*
* @return True if enabled, false if not.
* @since 3.4
@@ -369,7 +369,7 @@ public class SMTPSClient extends SMTPClient
/**
* Automatic endpoint identification checking using the HTTPS algorithm
- * is supported on Java 1.7+. The default behaviour is for this to be
disabled.
+ * is supported on Java 1.7+. The default behavior is for this to be
disabled.
*
* @param enable Enable automatic endpoint identification checking using
the HTTPS algorithm on Java 1.7+.
* @since 3.4
diff --git a/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
index a48f59c..7e7c73d 100644
--- a/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/EchoOptionHandler.java
@@ -25,7 +25,7 @@ public class EchoOptionHandler extends TelnetOptionHandler
/***
* Constructor for the EchoOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param initlocal - if set to true, a WILL is sent upon connection.
@@ -42,7 +42,7 @@ public class EchoOptionHandler extends TelnetOptionHandler
/***
* Constructor for the EchoOptionHandler. Initial and accept
- * behaviour flags are set to false
+ * behavior flags are set to false
***/
public EchoOptionHandler()
{
diff --git
a/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
index 8a88e0f..d06ccb8 100644
--- a/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/SimpleOptionHandler.java
@@ -26,7 +26,7 @@ public class SimpleOptionHandler extends TelnetOptionHandler
/***
* Constructor for the SimpleOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param optcode - option code.
@@ -47,7 +47,7 @@ public class SimpleOptionHandler extends TelnetOptionHandler
/***
* Constructor for the SimpleOptionHandler. Initial and accept
- * behaviour flags are set to false
+ * behavior flags are set to false
* <p>
* @param optcode - option code.
***/
diff --git
a/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
index b353d48..ecfb324 100644
--- a/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/SuppressGAOptionHandler.java
@@ -25,7 +25,7 @@ public class SuppressGAOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the SuppressGAOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param initlocal - if set to true, a WILL is sent upon connection.
@@ -42,7 +42,7 @@ public class SuppressGAOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the SuppressGAOptionHandler. Initial and accept
- * behaviour flags are set to false
+ * behavior flags are set to false
***/
public SuppressGAOptionHandler()
{
diff --git
a/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java
index 14b4f01..2e63a7e 100644
--- a/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/TelnetOptionHandler.java
@@ -23,7 +23,7 @@ package org.apache.commons.net.telnet;
* <p>
* TelnetOptionHandler implements basic option handling
* functionality and defines abstract methods that must be
- * implemented to define subnegotiation behaviour.
+ * implemented to define subnegotiation behavior.
***/
public abstract class TelnetOptionHandler
{
@@ -65,7 +65,7 @@ public abstract class TelnetOptionHandler
/***
* Constructor for the TelnetOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param optcode - Option code.
@@ -121,7 +121,7 @@ public abstract class TelnetOptionHandler
}
/***
- * Set behaviour of the option for DO requests coming from
+ * Set behavior of the option for DO requests coming from
* the other end.
* <p>
* @param accept - if true, subsequent DO requests will be accepted.
@@ -132,7 +132,7 @@ public abstract class TelnetOptionHandler
}
/***
- * Set behaviour of the option for WILL requests coming from
+ * Set behavior of the option for WILL requests coming from
* the other end.
* <p>
* @param accept - if true, subsequent WILL requests will be accepted.
diff --git
a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
index 49e0fa3..70a687b 100644
--- a/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/TerminalTypeOptionHandler.java
@@ -45,7 +45,7 @@ public class TerminalTypeOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the TerminalTypeOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param termtype - terminal type that will be negotiated.
@@ -67,7 +67,7 @@ public class TerminalTypeOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the TerminalTypeOptionHandler. Initial and accept
- * behaviour flags are set to false
+ * behavior flags are set to false
* <p>
* @param termtype - terminal type that will be negotiated.
***/
diff --git
a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
index b46ea30..2541336 100644
--- a/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
+++ b/src/main/java/org/apache/commons/net/telnet/WindowSizeOptionHandler.java
@@ -41,7 +41,7 @@ public class WindowSizeOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the WindowSizeOptionHandler. Allows defining desired
* initial setting for local/remote activation of this option and
- * behaviour in case a local/remote activation request for this
+ * behavior in case a local/remote activation request for this
* option is received.
* <p>
* @param nWidth - Window width.
@@ -73,7 +73,7 @@ public class WindowSizeOptionHandler extends
TelnetOptionHandler
/***
* Constructor for the WindowSizeOptionHandler. Initial and accept
- * behaviour flags are set to false
+ * behavior flags are set to false
* <p>
* @param nWidth - Window width.
* @param nHeight - Window Height
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
index df37efa..00e54e8 100644
---
a/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParserTest.java
@@ -175,7 +175,7 @@ public class UnixFTPEntryParserTest extends
FTPParseTestFramework {
assertEquals(" zxbox", f.getName() ); // leading spaces retained
}
- public void testLeadingSpacesNET566() { // check new behaviour
+ public void testLeadingSpacesNET566() { // check new behavior
FTPFile f = new UnixFTPEntryParser(null, false).parseFTPEntry(
"drwxr-xr-x 2 john smith group 4096 Mar 2 15:13
zxbox");
assertNotNull(f);
diff --git
a/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
b/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
index 664a7c0..15671ab 100644
---
a/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
+++
b/src/test/java/org/apache/commons/net/telnet/TelnetOptionHandlerTestAbstract.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
* testing TelnetOptionHandler. It can be used to derive
* the actual test classes for TelnetOptionHadler derived
* classes, by adding creation of three new option handlers
- * and testing of the specific subnegotiation behaviour.
+ * and testing of the specific subnegotiation behavior.
***/
public abstract class TelnetOptionHandlerTestAbstract extends TestCase
{
