- sort options

- sync usage()

2 files changed, 19 insertions, 19 deletions

diff --git a/usr.sbin/ppp/pppctl/pppctl.8 b/usr.sbin/ppp/pppctl/pppctl.8
index 33d40e85f7f..e6c1a0fea74 100644
--- a/usr.sbin/ppp/pppctl/pppctl.8
+++ b/usr.sbin/ppp/pppctl/pppctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pppctl.8,v 1.13 2004/03/16 21:21:16 jmc Exp $
+.\"	$OpenBSD: pppctl.8,v 1.14 2004/05/24 09:30:11 jmc Exp $
 .\"
 .\" Copyright (c) 1997 Brian Somers <brian@Awfulhak.org>
 .\" All rights reserved.
@@ -34,10 +34,10 @@
 .Nm pppctl
 .Bk -words
 .Op Fl v
-.Op Fl t Ar n
 .Op Fl p Ar passwd
+.Op Fl t Ar n
 .Xo
-.Oo Ar host Ns : Oc Ar port No \&|
+.Oo Ar host : Oc Ar port No \&|
 .Ar LocalSocket
 .Xc
 .Op Ar command Op ; Ns Ar command ...
@@ -107,29 +107,29 @@ defining editing behaviour).
 The history size defaults to 20 lines.
 .Pp
 The following command line options are available:
-.Bl -tag -width Ds
-.It Fl v
-Display all data sent to and received from the
+.Bl -tag -width "-p passwd  "
+.It Fl p Ar passwd
+Specify the password required by the
 .Xr ppp 8
 daemon.
-Normally,
+If this switch is not used,
 .Nm
-displays only non-prompt lines received.
-This option is ignored in interactive mode.
+will prompt for a password once it has successfully connected to
+.Xr ppp 8 .
 .It Fl t Ar n
 Use a timeout of
 .Ar n
 instead of the default 2 seconds when connecting.
 This may be required
 if you wish to control a daemon over a slow (or even a dialup) link.
-.It Fl p Ar passwd
-Specify the password required by the
+.It Fl v
+Display all data sent to and received from the
 .Xr ppp 8
 daemon.
-If this switch is not used,
+Normally,
 .Nm
-will prompt for a password once it has successfully connected to
-.Xr ppp 8 .
+displays only non-prompt lines received.
+This option is ignored in interactive mode.
 .El
 .Sh ENVIRONMENT
 The following environment variables are understood by
diff --git a/usr.sbin/ppp/pppctl/pppctl.c b/usr.sbin/ppp/pppctl/pppctl.c
index 011028d73ac..be93958e259 100644
--- a/usr.sbin/ppp/pppctl/pppctl.c
+++ b/usr.sbin/ppp/pppctl/pppctl.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: pppctl.c,v 1.16 2003/11/15 00:21:23 tedu Exp $
+ *	$Id: pppctl.c,v 1.17 2004/05/24 09:30:11 jmc Exp $
  */
 
 #include <sys/types.h>
@@ -56,13 +56,13 @@ static char Buffer[LINELEN], Command[LINELEN];
 static int
 usage()
 {
-    fprintf(stderr, "usage: pppctl [-v] [-t n] [-p passwd] "
+    fprintf(stderr, "usage: pppctl [-v] [-p passwd] [-t n] "
             "Port|LocalSock [command[;command]...]\n");
-    fprintf(stderr, "              -v tells pppctl to output all"
-            " conversation\n");
+    fprintf(stderr, "              -p passwd specifies your password\n");
     fprintf(stderr, "              -t n specifies a timeout of n"
             " seconds when connecting (default 2)\n");
-    fprintf(stderr, "              -p passwd specifies your password\n");
+    fprintf(stderr, "              -v tells pppctl to output all"
+            " conversation\n");
     exit(1);
 }