Do the best we can with respect to fixing command-line option disorder

in the SYNOPSIS and DESCRIPTION.

Note that -l remains an ugly exception, to which no known rules apply,
since the specification of a single option multiple times isn't normal
standards-compliant CLI behaviour.

While here, mark AF_INET* and LOG_* defined values up with Dv.

1 files changed, 62 insertions, 62 deletions

diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8
index 157403c..d3f8c45 100644
--- a/libexec/ftpd/ftpd.8
+++ b/libexec/ftpd/ftpd.8
@@ -40,23 +40,12 @@
 .Nd Internet File Transfer Protocol server
 .Sh SYNOPSIS
 .Nm
-.Op Fl 4
-.Op Fl 6
-.Op Fl d
+.Op Fl 46ADEORSUdro
 .Op Fl l Op Fl l
-.Op Fl A
-.Op Fl D
-.Op Fl R
-.Op Fl S
-.Op Fl U
-.Op Fl r
-.Op Fl o
-.Op Fl O
-.Op Fl E
 .Op Fl T Ar maxtimeout
-.Op Fl t Ar timeout
 .Op Fl a Ar address
 .Op Fl p Ar file
+.Op Fl t Ar timeout
 .Sh DESCRIPTION
 .Nm Ftpd
 is the
@@ -71,20 +60,28 @@ service specification; see
 .Pp
 Available options:
 .Bl -tag -width indent
-.It Fl d
-Debugging information is written to the syslog using LOG_FTP.
-.It Fl l
-Each successful and failed
-.Xr ftp 1
-session is logged using syslog with a facility of LOG_FTP.
-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: LOG_FTP messages
-are not displayed by
-.Xr syslogd 8
-by default, and may have to be enabled in
-.Xr syslogd 8 Ns 's
-configuration file.
+.It Fl 4
+When
+.Fl D
+is specified, accept IPv4 connections.
+When
+.Fl 6
+is also specified, accept IPv4 connection via
+.Dv AF_INET6
+socket.
+When
+.Fl 6
+is not specified, accept IPv4 connection via
+.Dv AF_INET
+socket.
+.It Fl 6
+When
+.Fl D
+is specified, accept connections via
+.Dv AF_INET6
+socket.
+.It Fl A
+Allow only anonymous ftp access.
 .It Fl D
 With this option set,
 .Nm
@@ -95,6 +92,15 @@ This is lower overhead than starting
 from
 .Xr inetd 8
 and is thus useful on busy servers to reduce load.
+.It Fl E
+Disable the EPSV command.
+This is useful for servers behind older firewalls.
+.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 R
 With this option set,
 .Nm
@@ -118,6 +124,31 @@ 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 d
+Debugging information is written to the syslog using
+.Dv LOG_FTP .
+.It Fl r
+Put server in read-only mode.
+All commands which may modify the local filesystem are disabled.
+.It Fl o
+Put server in write-only mode.
+RETR is disabled, preventing downloads.
+.It Fl l
+Each successful and failed
+.Xr ftp 1
+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
+their filename arguments are also logged.
+Note:
+.Dv LOG_FTP
+messages
+are not displayed by
+.Xr syslogd 8
+by default, and may have to be enabled in
+.Xr syslogd 8 Ns 's
+configuration file.
 .It Fl T
 A client may also request a different timeout period;
 the maximum period allowed may be set to
@@ -126,10 +157,6 @@ seconds with the
 .Fl T
 option.
 The default limit is 2 hours.
-.It Fl t
-The inactivity timeout period is set to
-.Ar timeout
-seconds (the default is 15 minutes).
 .It Fl a
 When
 .Fl D
@@ -140,37 +167,10 @@ When
 .Fl D
 is specified, write the daemon's process ID to
 .Ar file .
-.It Fl 6
-When
-.Fl D
-is specified, accept connections via AF_INET6 socket.
-.It Fl 4
-When
-.Fl D
-is specified, accept IPv4 connections.
-When
-.Fl 6
-is also specified, accept IPv4 connection via AF_INET6 socket.
-When
-.Fl 6
-is not specified, accept IPv4 connection via AF_INET socket.
-.It Fl A
-Allow only anonymous ftp access.
-.It Fl r
-Put server in read-only mode.
-All commands which may modify the local filesystem are disabled.
-.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 E
-Disable the EPSV command.
-This is useful for servers behind older firewalls.
+.It Fl t
+The inactivity timeout period is set to
+.Ar timeout
+seconds (the default is 15 minutes).
 .El
 .Pp
 The file