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 e8afec04 Normalize spelling
e8afec04 is described below
commit e8afec04c1eaa47db9ddad10accae76a2b74fb16
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 6 17:55:13 2024 -0500
Normalize spelling
Note that "UNIX" is a trademark, "Unix" is not
---
src/main/java/org/apache/commons/net/bsd/RCommandClient.java | 4 ++--
src/main/java/org/apache/commons/net/bsd/RExecClient.java | 2 +-
src/main/java/org/apache/commons/net/bsd/RLoginClient.java | 2 +-
.../java/org/apache/commons/net/examples/ftp/FTPClientExample.java | 2 +-
.../java/org/apache/commons/net/examples/nntp/ListNewsgroups.java | 2 +-
src/main/java/org/apache/commons/net/examples/unix/finger.java | 2 +-
src/main/java/org/apache/commons/net/examples/unix/rdate.java | 2 +-
src/main/java/org/apache/commons/net/examples/unix/rlogin.java | 4 ++--
src/main/java/org/apache/commons/net/examples/unix/rshell.java | 2 +-
src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java | 6 +++---
src/main/java/org/apache/commons/net/ftp/FTPFile.java | 4 ++--
.../apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java | 2 +-
.../java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java | 2 +-
.../net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java | 2 +-
14 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
index 0467b753..c1a2a71e 100644
--- a/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RCommandClient.java
@@ -35,8 +35,8 @@ import org.apache.commons.net.io.SocketInputStream;
* without issuing a password. The trust relationship between two machines is
established by the contents of a machine's /etc/hosts.equiv file and a user's
* .rhosts file. These files specify from which hosts and accounts on those
hosts rcmd() requests will be accepted. The only additional measure for
establishing
* trust is that all client connections must originate from a port between 512
and 1023. Consequently, there is an upper limit to the number of rcmd
connections
- * that can be running simultaneously. The required ports are reserved ports
on UNIX systems, and can only be bound by a process running with root
permissions
- * (to accomplish this rsh, rlogin, and related commands usualy have the suid
bit set). Therefore, on a UNIX system, you will only be able to successfully use
+ * that can be running simultaneously. The required ports are reserved ports
on Unix systems, and can only be bound by a process running with root
permissions
+ * (to accomplish this rsh, rlogin, and related commands usualy have the suid
bit set). Therefore, on a Unix system, you will only be able to successfully use
* the RCommandClient class if the process runs as root. However, there is no
such restriction on Windows95 and some other systems. The security risks are
* obvious. However, when carefully used, rcmd() can be very useful when used
behind a firewall.
* <p>
diff --git a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
index 5e6e43b6..b48b9ad9 100644
--- a/src/main/java/org/apache/commons/net/bsd/RExecClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RExecClient.java
@@ -29,7 +29,7 @@ import org.apache.commons.net.io.SocketInputStream;
import org.apache.commons.net.util.NetConstants;
/**
- * RExecClient implements the rexec() facility that first appeared in 4.2BSD
Unix. This class will probably only be of use for connecting to UNIX systems and
+ * RExecClient implements the rexec() facility that first appeared in 4.2BSD
Unix. This class will probably only be of use for connecting to Unix systems and
* only when the rexecd daemon is configured to run, which is a rarity these
days because of the security risks involved. However, rexec() can be very useful
* for performing administrative tasks on a network behind a firewall.
* <p>
diff --git a/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
b/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
index e4cc8d98..e2c2043d 100644
--- a/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
+++ b/src/main/java/org/apache/commons/net/bsd/RLoginClient.java
@@ -45,7 +45,7 @@ import java.io.IOException;
public class RLoginClient extends RCommandClient {
/**
- * The default rlogin port. Set to 513 in BSD UNIX and according to RFC
1282.
+ * The default rlogin port. Set to 513 in BSD Unix and according to RFC
1282.
*/
public static final int DEFAULT_PORT = 513;
diff --git
a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
index bd83852c..7fbce73b 100644
--- a/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
+++ b/src/main/java/org/apache/commons/net/examples/ftp/FTPClientExample.java
@@ -61,7 +61,7 @@ public final class FTPClientExample {
+ "\t-m - list file details using MDTM (remote is used as the
pathname if provided)\n"
+ "\t-n - list file names using NLST (remote is used as the
pathname if provided)\n"
+ "\t-p true|false|protocol[,true|false] - use FTPSClient with the
specified protocol and/or isImplicit setting\n"
- + "\t-s - store file on server (upload)\n" + "\t-S - systemType
set server system type (e.g. UNIX VMS WINDOWS)\n"
+ + "\t-s - store file on server (upload)\n" + "\t-S - systemType
set server system type (e.g. Unix VMS WINDOWS)\n"
+ "\t-t - list file details using MLST (remote is used as the
pathname if provided)\n" + "\t-U - save unparseable responses\n"
+ "\t-w msec - wait time for keep-alive reply
(setControlKeepAliveReplyTimeout)\n"
+ "\t-T all|valid|none - use one of the built-in TrustManager
implementations (none = JVM default)\n"
diff --git
a/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java
b/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java
index 078ee5fe..515fa403 100644
--- a/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java
+++ b/src/main/java/org/apache/commons/net/examples/nntp/ListNewsgroups.java
@@ -23,7 +23,7 @@ import org.apache.commons.net.nntp.NNTPClient;
import org.apache.commons.net.nntp.NewsgroupInfo;
/**
- * This is a trivial example using the NNTP package to approximate the UNIX
newsgroups command. It merely connects to the specified news server and issues
+ * This is a trivial example using the NNTP package to approximate the Unix
newsgroups command. It merely connects to the specified news server and issues
* fetches the list of newsgroups stored by the server. On servers that store
a lot of newsgroups, this command can take a very long time (listing upwards of
* 30,000 groups).
*/
diff --git a/src/main/java/org/apache/commons/net/examples/unix/finger.java
b/src/main/java/org/apache/commons/net/examples/unix/finger.java
index 1c621315..0ee6e1f5 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/finger.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/finger.java
@@ -25,7 +25,7 @@ import org.apache.commons.net.finger.FingerClient;
/**
* This is an example of how you would implement the finger command in Java
using NetComponents. The Java version is much shorter. But keep in mind that the
- * UNIX finger command reads all sorts of local files to output local finger
information. This program only queries the finger daemon.
+ * Unix finger command reads all sorts of local files to output local finger
information. This program only queries the finger daemon.
* <p>
* The -l flag is used to request long output from the server.
*/
diff --git a/src/main/java/org/apache/commons/net/examples/unix/rdate.java
b/src/main/java/org/apache/commons/net/examples/unix/rdate.java
index 83d1c891..67a709b1 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/rdate.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/rdate.java
@@ -25,7 +25,7 @@ import org.apache.commons.net.time.TimeTCPClient;
import org.apache.commons.net.time.TimeUDPClient;
/**
- * This is an example program demonstrating how to use the TimeTCPClient and
TimeUDPClient classes. It's very similar to the simple UNIX rdate command. This
+ * This is an example program demonstrating how to use the TimeTCPClient and
TimeUDPClient classes. It's very similar to the simple Unix rdate command. This
* program connects to the default time service port of a specified server,
retrieves the time, and prints it to standard output. The default is to use the
TCP
* port. Use the -udp flag to use the UDP port. You can test this program by
using the NIST time server at 132.163.135.130 (warning: the IP address may
change).
* <p>
diff --git a/src/main/java/org/apache/commons/net/examples/unix/rlogin.java
b/src/main/java/org/apache/commons/net/examples/unix/rlogin.java
index 83a6aa18..ddb6065c 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/rlogin.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/rlogin.java
@@ -28,11 +28,11 @@ import org.apache.commons.net.examples.util.IOUtil;
* writing the remote stdout and stderr to local stdout. If you don't have
{@code .rhosts} or {@code hosts.equiv} files set up, the rlogin daemon will
prompt
* you for a password.
* <p>
- * On UNIX systems you will not be able to use the rshell capability unless
the process runs as root since only root can bind port addresses lower than
1024.
+ * On Unix systems you will not be able to use the rshell capability unless
the process runs as root since only root can bind port addresses lower than
1024.
* <p>
* JVM's using green threads will likely have problems if the rlogin daemon
requests a password. This program is merely a demonstration and is not suitable
for
* use as an application, especially given that it relies on line-buffered
input from System.in. The best way to run this example is probably from a
Windows
- * DOS box into a UNIX host.
+ * DOS box into a Unix host.
* <p>
* Example: java rlogin myhost localuser remoteuser vt100
* <p>
diff --git a/src/main/java/org/apache/commons/net/examples/unix/rshell.java
b/src/main/java/org/apache/commons/net/examples/unix/rshell.java
index 462ce6ed..099cb93b 100644
--- a/src/main/java/org/apache/commons/net/examples/unix/rshell.java
+++ b/src/main/java/org/apache/commons/net/examples/unix/rshell.java
@@ -27,7 +27,7 @@ import org.apache.commons.net.examples.util.IOUtil;
* be executed on the server. It then reads input from stdin (this will be
line buffered on most systems, so don't expect character at a time
interactivity),
* passing it to the remote process and writes the process stdout and stderr
to local stdout.
* <p>
- * On UNIX systems you will not be able to use the rshell capability unless
the process runs as root since only root can bind port addresses lower than
1024.
+ * On Unix systems you will not be able to use the rshell capability unless
the process runs as root since only root can bind port addresses lower than
1024.
* <p>
* Example: java rshell myhost localusername remoteusername "ps -aux"
* <p>
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 64436680..08f56ba2 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java
@@ -45,7 +45,7 @@ import java.util.TreeMap;
* <li>is in different time zone and you need accurate timestamps for
dependency checking as in Ant</li>
* </ul>
* <p>
- * Unpaged (whole list) access on a UNIX server that uses French month names
but uses the "standard" {@code MMM d yyyy} date formatting
+ * Unpaged (whole list) access on a Unix server that uses French month names
but uses the "standard" {@code MMM d yyyy} date formatting
*
* <pre>
* FTPClient f = FTPClient();
@@ -57,7 +57,7 @@ import java.util.TreeMap;
* FTPFile[] files = listFiles(directory);
* </pre>
* <p>
- * Paged access on a UNIX server that uses Danish month names and "European"
date formatting in Denmark's time zone, when you are in some other time zone.
+ * Paged access on a Unix server that uses Danish month names and "European"
date formatting in Denmark's time zone, when you are in some other time zone.
*
* <pre>
* FTPClient f = FTPClient();
@@ -295,7 +295,7 @@ public class FTPClientConfig {
private boolean saveUnparseableEntries;
/**
- * Convenience constructor mainly for use in testing. Constructs a UNIX
configuration.
+ * Convenience constructor mainly for use in testing. Constructs a Unix
configuration.
*/
public FTPClientConfig() {
this(SYST_UNIX);
diff --git a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
index e10d5b63..fe80bdb6 100644
--- a/src/main/java/org/apache/commons/net/ftp/FTPFile.java
+++ b/src/main/java/org/apache/commons/net/ftp/FTPFile.java
@@ -391,7 +391,7 @@ public class FTPFile implements Serializable {
}
/**
- * Gets a string representation of the FTPFile information. This currently
mimics the UNIX listing format. This method uses the time zone of the Calendar
+ * Gets a string representation of the FTPFile information. This currently
mimics the Unix listing format. This method uses the time zone of the Calendar
* entry, which is the server time zone (if one was provided) otherwise it
is the local time zone.
* <p>
* Note: if the instance is not valid {@link #isValid()}, no useful
information can be returned. In this case, use {@link #getRawListing()} instead.
@@ -405,7 +405,7 @@ public class FTPFile implements Serializable {
}
/**
- * Gets a string representation of the FTPFile information. This currently
mimics the UNIX listing format. This method allows the Calendar time zone to be
+ * Gets a string representation of the FTPFile information. This currently
mimics the Unix listing format. This method allows the Calendar time zone to be
* overridden.
* <p>
* Note: if the instance is not valid {@link #isValid()}, no useful
information can be returned. In this case, use {@link #getRawListing()} instead.
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
index dd1bbf4c..77d906f9 100644
---
a/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
+++
b/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
@@ -22,7 +22,7 @@ import java.util.Calendar;
import org.apache.commons.net.ftp.FTPFile;
/**
- * Parser for the Connect Enterprise UNIX FTP Server From Sterling Commerce.
Here is a sample of the sort of output line this parser processes:
+ * Parser for the Connect Enterprise Unix FTP Server From Sterling Commerce.
Here is a sample of the sort of output line this parser processes:
*
* <pre>
* "-C--E-----FTP B QUA1I1 18128 41 Aug 12 13:56 QUADTEST"
diff --git
a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 21b6904d..08f270bd 100644
--- a/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -25,7 +25,7 @@ import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
/**
- * Implementation FTPFileEntryParser and FTPFileListParser for standard UNIX
Systems.
+ * Implementation FTPFileEntryParser and FTPFileListParser for standard Unix
Systems.
*
* This class is based on the logic of Daniel Savarese's DefaultFTPListParser,
but adapted to use regular expressions and to fit the new FTPFileEntryParser
* interface.
diff --git
a/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java
b/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java
index 591ed415..18ad60c8 100644
---
a/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java
+++
b/src/test/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactoryTest.java
@@ -80,7 +80,7 @@ public class DefaultFTPFileEntryParserFactoryTest extends
TestCase {
parser = factory.createFileEntryParser("AS/400");
assertInstanceOf(CompositeFileEntryParser.class, parser);
- // Added test to make sure it handles the UNIX systems that were
+ // Added test to make sure it handles the Unix systems that were
// compiled with OS as "UNKNOWN". This test validates that the
// check is case-insensitive.
parser = factory.createFileEntryParser("UNKNOWN Type: L8");
