- tidy up SYNOPSIS

- sort options
- sync usage()
- other small tweaks

2 files changed, 15 insertions, 15 deletions

diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index 889db125112..3f89b78f42d 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,28 +1,28 @@
-.\" $OpenBSD: skey.1,v 1.26 2004/06/06 21:23:20 jmc Exp $
+.\" $OpenBSD: skey.1,v 1.27 2005/07/06 21:39:30 jmc Exp $
 .\"	@(#)skey.1	1.1 	10/28/93
 .\"
 .Dd October 28, 1993
 .Dt SKEY 1
 .Os
 .Sh NAME
-.Nm skey, otp-md4, otp-md5, otp-sha1, otp-rmd160
+.Nm skey , otp-md4 , otp-md5 , otp-rmd160 , otp-sha1
 .Nd respond to an OTP challenge
 .Sh SYNOPSIS
 .Nm skey
 .Op Fl x
 .Oo
-.Fl md4 | Fl md5 | Fl sha1 |
-.Fl rmd160
+.Fl md4 | md5 | rmd160 | sha1
 .Oc
 .Op Fl n Ar count
 .Op Fl p Ar passphrase
-<sequence#>[/] key
+.Ao Ar sequence# Ac Op /
+.Ar key
 .Sh DESCRIPTION
 .Nm S/Key
 is a procedure for using one-time passwords to authenticate access to
 computer systems.
 It uses 64 bits of information transformed by the
-MD4, MD5, SHA1, or RIPEMD-160 algorithms.
+MD4, MD5, RIPEMD-160, or SHA1 algorithms.
 The user supplies the 64 bits
 in the form of 6 English words that are generated by a secure computer.
 This implementation of
@@ -48,7 +48,7 @@ will use
 .Ar method
 as the hash function where
 .Ar method
-is currently one of md4, md5, sha1, or rmd160.
+is currently one of md4, md5, rmd160, or sha1.
 .Pp
 If you misspell your secret passphrase while running
 .Nm skey ,
@@ -73,22 +73,22 @@ Uses
 as the secret passphrase.
 Use of this option is discouraged as
 your secret passphrase could be visible in a process listing.
-.It Fl x
-Causes output to be in hexadecimal instead of ASCII.
 .It Fl md4
 Selects MD4 as the hash algorithm.
 .It Fl md5
 Selects MD5 as the hash algorithm.
-.It Fl sha1
-Selects SHA-1 (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
 .It Fl rmd160
 Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
+.It Fl sha1
+Selects SHA-1 (NIST Secure Hash Algorithm Revision 1) as the hash algorithm.
+.It Fl x
+Causes output to be in hexadecimal instead of ASCII.
 .El
 .Sh EXAMPLES
 .Bd -literal -offset indent
 $ skey 99 th91334
 Reminder - Do not use this program while logged in via telnet.
-Enter secret passphrase: <your secret passphrase is entered here>
+Enter secret passphrase: \*(Ltyour secret passphrase is entered here\*(Gt
 OMEN US HORN OMIT BACK AHOY
 $
 .Ed
diff --git a/usr.bin/skey/skey.c b/usr.bin/skey/skey.c
index a3b382c4fd6..f2f0fd5232d 100644
--- a/usr.bin/skey/skey.c
+++ b/usr.bin/skey/skey.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skey.c,v 1.21 2004/12/27 23:37:48 deraadt Exp $	*/
+/*	$OpenBSD: skey.c,v 1.22 2005/07/06 21:39:31 jmc Exp $	*/
 /*
  * OpenBSD S/Key (skey.c)
  *
@@ -150,7 +150,7 @@ void
 usage(char *s)
 {
 	fprintf(stderr,
-	    "Usage: %s [-x] [-md4|-md5|-sha1|-rmd160] [-n count] "
-	    "[-p passphrase] <sequence#>[/] key\n", s);
+	    "Usage: %s [-x] [-md4 | -md5 | -rmd160 | -sha1] [-n count] "
+	    "[-p passphrase]\n\t<sequence#>[/] key\n", s);
 	exit(1);
 }