--- mkpwd.1.orig	2012-08-02 10:22:13.000000000 -0500
+++ mkpwd.1	2015-08-31 18:06:34.000000000 -0400
@@ -11,7 +11,7 @@
 ]
 .SH INTRODUCTION
 .B mkpwd
-prints a randomly generated password to stdout. If 
+prints a randomly generated password to stdout. If
 .B count
 is provided, mkpwd will generate count-numbers of passwords and
 print them to stdout.
@@ -31,31 +31,31 @@
 .B \-\-help
 Print out short help and exit. All other options are ignored.
 .TP
-.B \-\-min length
+.B \-\-n length
 .B length
 must be an integer number. mkpwd will only generate passwords
 with the given minimum length.
 .TP
-.B \-\-max length
+.B \-m length
 .B length
 must be an integer number. mkpwd will only generate passwords with the
 given maximum length.
 .TP
-.B \-\-uppercase
+.B \-u
 generate password with uppercase characters. This only affects characters
 of the US-alphabet.
 .TP
-.B \-\-lowercase
+.B \-l
 generate password with lowercase characters. This only affects characters
 of the US-alphabet.
 .TP
-.B \-\-crypt salt
+.B \-c salt
 .B salt
 must be a string of two characters. Every generated password is passed to
 the crypt()-function and the result is printed right after the password itself.
 Please read the manpage of crypt(3) for more information.
 .TP
-.B \-\-type X
+.B \-t X
 .B X
 must be an integer value between 1 and 7. It specifies the way passwords
 are created. The following types are defined:
@@ -75,23 +75,23 @@
 .sp
 
 The standard type is 1 (complex). If you use the type "alphanum-readable"
-the password is build of the characters [A-Z] and [a-z]. There is a 10% 
+the password is build of the characters [A-Z] and [a-z]. There is a 10%
 chance per character for it to become a number [0-9].
 The type "alpha-readable" is the same execpt that no numbers get used.
 Both types try to generate a readable password. This is implemented by
 alternatingly using a consonant and a vocal character.
 
 .SH NOTICE
-The gnu getopt() is really anoying. The arguments to options must be 
+The gnu getopt() is really anoying. The arguments to options must be
 supplied by a equal-sign. You can not use something like "--crypt SA".
 Use "--crypt=SA" instead. This is a strange behavior of getopt() while
 processing arguments which may have an argument.
 
 .SH EXAMPLE
-The following generates 10 passwords consisting only of lowercase 
+The following generates 10 passwords consisting only of lowercase
 alphabetic characters:
 
-	mkpwd --lowercase --type 3 10
+	mkpwd -l -t 3 10
 
 .SH AUTHOR
 (c) 1999-2002 by Oliver Schroeder <post@o-schroeder.de>
@@ -99,4 +99,3 @@
 .B mkpwd
 stands under a BSD like license. See the copyright notice in the source
 file for more information.
-