- sort options

- add -46 to usage() and sync w/ SYNOPSIS

2 files changed, 12 insertions, 13 deletions

diff --git a/usr.sbin/popa3d/popa3d.8 b/usr.sbin/popa3d/popa3d.8
index 8ecab7e0dd1..6d70b7023f2 100644
--- a/usr.sbin/popa3d/popa3d.8
+++ b/usr.sbin/popa3d/popa3d.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: popa3d.8,v 1.9 2004/06/20 20:46:27 itojun Exp $
+.\"	$OpenBSD: popa3d.8,v 1.10 2004/06/26 10:46:55 jmc Exp $
 .\"
 .\" Copyright (c) 2001-2003 Camiel Dobbelaar (cd@sentia.nl)
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .Nd "Post Office Protocol (POP3) server"
 .Sh SYNOPSIS
 .Nm
-.Op Fl DV46
+.Op Fl 46DV
 .Sh DESCRIPTION
 .Nm
 is a POP3 server.
@@ -60,6 +60,14 @@ To send mail, the SMTP protocol is commonly used; see
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
+.It Fl 4
+In standalone mode
+.Pq Fl D ,
+listen to IPv4 only.
+.It Fl 6
+In standalone mode
+.Pq Fl D ,
+listen to IPv6 only.
 .It Fl D
 With this option set,
 .Nm
@@ -77,15 +85,6 @@ also does quite a few checks to significantly reduce the impact of
 connection flood attacks.
 .It Fl V
 Show version information and exit.
-.It Fl 4
-In standalone mode
-.Pq Fl D ,
-listen to IPv4 only.
-.It Fl 6
-In standalone mode
-.Pq Fl D ,
-listen to IPv6 only.
-.Pp
 .El
 .Pp
 Alternatively,
diff --git a/usr.sbin/popa3d/startup.c b/usr.sbin/popa3d/startup.c
index 6b93e36a909..206fd41f955 100644
--- a/usr.sbin/popa3d/startup.c
+++ b/usr.sbin/popa3d/startup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startup.c,v 1.3 2004/06/20 20:46:27 itojun Exp $ */
+/* $OpenBSD: startup.c,v 1.4 2004/06/26 10:46:55 jmc Exp $ */
 
 /*
  * Command line option parsing.
@@ -36,7 +36,7 @@ int af = PF_UNSPEC;
 
 static void usage(void)
 {
-	fprintf(stderr, "Usage: %s [-D] [-V]\n", progname);
+	fprintf(stderr, "Usage: %s [-46DV]\n", progname);
 	exit(1);
 }