uppercase `FTP' when talking about the protocol rather than the

ftp(1) binary...this is in line with what ftp(1) already does...

1 files changed, 14 insertions, 16 deletions

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index d98322ae71f..e2d23775c17 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ftpd.8,v 1.63 2004/11/28 19:16:04 henning Exp $
+.\"	$OpenBSD: ftpd.8,v 1.64 2005/09/09 23:12:37 jmc Exp $
 .\"	$NetBSD: ftpd.8,v 1.8 1996/01/14 20:55:23 thorpej Exp $
 .\"
 .\" Copyright (c) 1985, 1988, 1991, 1993
@@ -68,7 +68,7 @@ is specified, forces
 .Nm
 to use IPv6 addresses only.
 .It Fl A
-Permit only anonymous ftp connections
+Permit only anonymous FTP connections
 (unless the
 .Fl n
 option is specified),
@@ -93,8 +93,7 @@ Debugging information is written to the syslog using
 .Dv LOG_FTP .
 .It Fl l
 Each successful and failed
-.Xr ftp 1
-session is logged using syslog with a facility of
+FTP session is logged using syslog with a facility of
 .Dv LOG_FTP .
 If this option is specified twice, the retrieve (get), store (put), append,
 delete, make directory, remove directory and rename operations and
@@ -108,7 +107,7 @@ the IP number the client connected to, and located inside
 .Pa ~ftp ,
 is used instead.
 .It Fl n
-Do not permit anonymous ftp logins.
+Do not permit anonymous FTP logins.
 Normally they are permitted.
 .It Fl P
 Permit illegal port numbers or addresses for PORT command initiated connects.
@@ -138,8 +137,7 @@ The inactivity timeout period is set to
 seconds (the default is 15 minutes).
 .It Fl U
 Each concurrent
-.Xr ftp 1
-session is logged to the file
+FTP session is logged to the file
 .Pa /var/run/utmp ,
 making them visible to commands such as
 .Xr who 1 .
@@ -154,7 +152,7 @@ Also disallows chmod.
 .Pp
 The file
 .Pa /etc/nologin
-can be used to disable ftp access.
+can be used to disable FTP access.
 If the file exists,
 .Nm
 displays it and exits.
@@ -181,7 +179,7 @@ exists in a directory,
 .Nm
 prints it when that directory is entered.
 .Pp
-The ftp server currently supports the following ftp requests.
+The FTP server currently supports the following FTP requests.
 The case of the requests is ignored.
 .Bl -column "Request" -offset indent
 .It Sy Request Ta Sy Description
@@ -244,12 +242,12 @@ SITE request:
 .It UMASK Ta "change umask, e.g., SITE UMASK 002"
 .El
 .Pp
-The remaining ftp requests specified in Internet RFC 959 are recognized,
+The remaining FTP requests specified in Internet RFC 959 are recognized,
 but not implemented.
 MDTM and SIZE are not specified in RFC 959,
 but will appear in the next updated FTP RFC.
 .Pp
-The ftp server will abort an active file transfer only when the
+The FTP server will abort an active file transfer only when the
 ABOR
 command is preceded by a Telnet "Interrupt Process" (IP)
 signal and a Telnet "Synch" signal in the command Telnet stream,
@@ -319,7 +317,7 @@ If the user name is
 or
 .Dq ftp ,
 an
-anonymous ftp account must be present in the password
+anonymous FTP account must be present in the password
 file (user
 .Dq ftp ) .
 In this case the user is allowed
@@ -354,7 +352,7 @@ For example (the line is broken to fit the page):
 	username class service
 .Ed
 .Pp
-When the user logs in to the anonymous ftp account,
+When the user logs in to the anonymous FTP account,
 .Nm
 takes special measures to restrict the client's access privileges.
 The server performs a
@@ -376,7 +374,7 @@ Make this directory owned by
 .Dq root
 and unwritable by anyone (mode 511).
 This directory is optional unless you have commands you wish
-the anonymous ftp user to be able to run (the
+the anonymous FTP user to be able to run (the
 .Xr ls 1
 command exists as a built-in).
 Any programs in this directory should be mode 111 (executable only).
@@ -421,7 +419,7 @@ The remote host (or IP number).
 .It bytes
 The number of bytes transferred.
 .It path
-The full path (relative to the ftp chroot space) of the file transferred.
+The full path (relative to the FTP chroot space) of the file transferred.
 .It type
 The type of transfer; either
 .Sq a
@@ -466,7 +464,7 @@ implementations.
 .Sh LOGIN.CONF VARIABLES
 The
 .Nm
-daemon uses the following ftp specific parameters:
+daemon uses the following FTP-specific parameters:
 .Bl -tag -width ftp-chroot
 .It Pa auth-ftp
 The list of authentication types available to this class.