mdoc(7) police:

Properly sort options, spell "file system" correctly, expand contraction.

Catch up to the src/etc/syslog.conf,v 1.23 change: ftpd(8) session logs
are now by default get logged to /var/log/xferlog.

Approved by:	re

1 files changed, 35 insertions, 37 deletions

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 69cf0c7..c044c7c 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -40,12 +40,12 @@
 .Nd Internet File Transfer Protocol server
 .Sh SYNOPSIS
 .Nm
-.Op Fl 46AdDEmMoOrRSUvW
+.Op Fl 46ADdEMmOoRrSUvW
 .Op Fl l Op Fl l
 .Op Fl a Ar address
 .Op Fl p Ar file
-.Op Fl t Ar timeout
 .Op Fl T Ar maxtimeout
+.Op Fl t Ar timeout
 .Op Fl u Ar umask
 .Sh DESCRIPTION
 The
@@ -82,16 +82,13 @@ When
 is specified, accept connections via
 .Dv AF_INET6
 socket.
+.It Fl A
+Allow only anonymous ftp access.
 .It Fl a
 When
 .Fl D
 is specified, accept connections only on the specified
 .Ar address .
-.It Fl A
-Allow only anonymous ftp access.
-.It Fl d
-Debugging information is written to the syslog using
-.Dv LOG_FTP .
 .It Fl D
 With this option set,
 .Nm
@@ -102,6 +99,9 @@ This is lower overhead than starting
 from
 .Xr inetd 8
 and is thus useful on busy servers to reduce load.
+.It Fl d
+Debugging information is written to the syslog using
+.Dv LOG_FTP .
 .It Fl E
 Disable the EPSV command.
 This is useful for servers behind older firewalls.
@@ -113,38 +113,31 @@ session is logged using syslog with a facility of
 If this option is specified twice, the retrieve (get), store (put), append,
 delete, make directory, remove directory and rename operations and
 their filename arguments are also logged.
-Note:
-.Dv LOG_FTP
-messages
-are not displayed by
+By default,
 .Xr syslogd 8
-by default, and may have to be enabled in
-.Xr syslogd 8 Ns 's
-configuration file.
+logs these to
+.Pa /var/log/xferlog .
+.It Fl M
+Prevent anonymous users from creating directories.
 .It Fl m
 Permit anonymous users to overwrite or modify
-existing files if allowed by filesystem permissions.
+existing files if allowed by file system permissions.
 By default, anonymous users cannot modify existing files;
 in particular, files to upload will be created under a unique name.
-.It Fl M
-Prevent anonymous users from creating directories.
-.It Fl o
-Put server in write-only mode.
-RETR is disabled, preventing downloads.
 .It Fl O
 Put server in write-only mode for anonymous users only.
 RETR is disabled for anonymous users, preventing anonymous downloads.
 This has no effect if
 .Fl o
 is also specified.
+.It Fl o
+Put server in write-only mode.
+RETR is disabled, preventing downloads.
 .It Fl p
 When
 .Fl D
 is specified, write the daemon's process ID to
 .Ar file .
-.It Fl r
-Put server in read-only mode.
-All commands which may modify the local filesystem are disabled.
 .It Fl R
 With this option set,
 .Nm
@@ -155,16 +148,15 @@ Currently,
 will only honor PORT commands directed to unprivileged ports on the
 remote user's host (which violates the FTP protocol specification but
 closes some security holes).
+.It Fl r
+Put server in read-only mode.
+All commands which may modify the local file system are disabled.
 .It Fl S
 With this option set,
 .Nm
 logs all anonymous file downloads to the file
 .Pa /var/log/ftpd
 when this file exists.
-.It Fl t
-The inactivity timeout period is set to
-.Ar timeout
-seconds (the default is 15 minutes).
 .It Fl T
 A client may also request a different timeout period;
 the maximum period allowed may be set to
@@ -173,13 +165,10 @@ seconds with the
 .Fl T
 option.
 The default limit is 2 hours.
-.It Fl u
-The default file creation mode mask is set to
-.Ar umask ,
-which is expected to be an octal numeric value.
-Refer to
-.Xr umask 2
-for details.
+.It Fl t
+The inactivity timeout period is set to
+.Ar timeout
+seconds (the default is 15 minutes).
 .It Fl U
 In previous versions of
 .Nm ,
@@ -187,11 +176,18 @@ when a passive mode client requested a data connection to the server,
 the server would use data ports in the range 1024..4999.  Now, by default,
 the server will use data ports in the range 49152..65535.  Specifying this
 option will revert to the old behavior.
+.It Fl u
+The default file creation mode mask is set to
+.Ar umask ,
+which is expected to be an octal numeric value.
+Refer to
+.Xr umask 2
+for details.
 .It Fl v
 A synonym for
 .Fl d .
 .It Fl W
-Don't log FTP sessions to
+Do not log FTP sessions to
 .Pa /var/log/wtmp .
 .El
 .Pp
@@ -269,7 +265,7 @@ is specified.
 .El
 .Pp
 The following non-standard or
-.Tn UNIX
+.Ux
 specific commands are supported
 by the
 SITE request.
@@ -488,7 +484,7 @@ executable need not be placed into the chrooted tree, nor need the
 .Pa ~/bin
 directory exist.
 .Sh FILES
-.Bl -tag -width /etc/ftpwelcome -compact
+.Bl -tag -width ".Pa /var/log/xferlog" -compact
 .It Pa /etc/ftpusers
 List of unwelcome/restricted users.
 .It Pa /etc/ftpchroot
@@ -503,6 +499,8 @@ Welcome notice after login.
 Displayed and access refused.
 .It Pa /var/log/ftpd
 Log file for anonymous transfers.
+.It Pa /var/log/xferlog
+Default place for session logs.
 .El
 .Sh SEE ALSO
 .Xr ftp 1 ,