Description: multiple improvements to man page
Forwarded: no
Author: Christoph Anton Mitterer <calestyo@scientia.net>,
 Xavier Hienne <xhienne@celya.fr>,
 Jens Kubieziel <jens@kubieziel.de>,
 Raphaël Bleuse <raphael.bleuse@imag.fr>
Last-Update: 2016-03-12
Bug-Debian: http://bugs.debian.org/488034,
 http://bugs.debian.org/609837,
 http://bugs.debian.org/764411
--- a/doc/man/apg.1
+++ b/doc/man/apg.1
@@ -36,20 +36,14 @@ implementation described in
 Another algorithm is simple random character generation algorithm, but it
 uses four user-defined symbol sets to produce random password. It means that
 user can choose type of symbols that should appear in password. Symbol sets
-are: numeric symbol set
-.I (0,...,9)
-, capital letters symbol set
-.I (A,...,Z)
-, small letters symbol set
-.I (a,...,z)
-and special symbols symbol set
-.I (#,@,!,...).
+are: numeric symbol set (0,...,9), capital letters symbol set (A,...,Z),
+small letters symbol set (a,...,z) and special symbols symbol set (#,@,!,...).
 .PP
 Built-in pseudo random number generator is an implementation of algorithm
 described in
 .B Appendix C of ANSI X9.17
 or
-.B RFC1750
+.B RFC 1750
 with exception that it uses
 .I CAST
 or
@@ -81,30 +75,30 @@ techniques to check passwords (like patt
 .SS "Password generation modes options"
 .TP
 .B -a algorithm
-use 
+Use
 .B algorithm
 for password generation.
 .RS
 .B 0
-- (default) pronounceable password generation
+- pronounceable password generation (default)
 .br
 .B 1
 - random character password generation
 .RE
 .TP
 .B -n num_of_pass
-generate 
+Generate
 .B num_of_pass
 number of passwords. Default is 6.
 .TP
 .B -m min_pass_len
-generate password with minimum length 
+Generate password with minimum length
 .B min_pass_len.
 If \fBmin_pass_len > max_pass_len\fP then \fBmax_pass_len = min_pass_len\fP.
 Default minimum password length is 8.
 .TP
 .B -x max_pass_len
-generate password with maximum length 
+Generate password with maximum length
 .B max_pass_len.
 If \fBmin_pass_len > max_pass_len\fP then \fBmax_pass_len = min_pass_len\fP.
 Default maximum password length is 10.
@@ -116,33 +110,33 @@ Use symbolsets specified with \fBmode\fP
 .RS
 .TP
 .B S
-generator \fBmust\fP use special symbol set for every generated password.
+Generator \fBmust\fP use special symbol set for every generated password.
 .TP
 .B s
-generator \fBshould\fP use special symbol set for password generation.
+Generator \fBshould\fP use special symbol set for password generation.
 .TP
 .B N
-generator \fBmust\fP use numeral symbol set for every generated password.
+Generator \fBmust\fP use numeral symbol set for every generated password.
 .TP
 .B n
-generator \fBshould\fP use numeral symbol set for password generation.
+Generator \fBshould\fP use numeral symbol set for password generation.
 .TP
 .B C
-generator \fBmust\fP use capital symbol set for every generated password.
+Generator \fBmust\fP use capital symbol set for every generated password.
 .TP
 .B c
-generator \fBshould\fP use capital symbol set for password generation.
+Generator \fBshould\fP use capital symbol set for password generation.
 .TP
 .B L
-generator \fBmust\fP use small letters symbol set for every generated password
+Generator \fBmust\fP use small letters symbol set for every generated password
 (always present if pronounceable password
 generation algorithm is used).
 .TP
 .B l
-generator \fBshould\fP use small letters symbol set for password generation.
+Generator \fBshould\fP use small letters symbol set for password generation.
 .TP
 .B R,r
-not supported any more. Use \fB-E char_string\fP option instead.
+Not supported any more. Use \fB-E char_string\fP option instead.
 .RE
 .RS
 .br
@@ -151,15 +145,19 @@ length.
 .PP
 .B Note:
 .br
-Usage of L, M, N, C will slow down password generation process.
+Usage of L, M, S, C will slow down password generation process.
 .PP
 .B Examples:
 .br
-\fB-M sncl\fP or \fB-M SNCL\fP or \fB-M Cn\fP
+\fB-M sncl\fP
+.br
+\fB-M SNCL\fP
+.br
+\fB-M Cn\fP
 .RE
 .TP
 .B -E char_string
-exclude characters in \fBchar_string\fP from password generation process (in pronounceable
+Exclude characters in \fBchar_string\fP from password generation process (in pronounceable
 password generation mode you can not exclude small letters). To include special symbols that
 can be recognized by shell (apostrophe, quotes, dollar sign, etc.) in \fBchar_string\fP use
 the backslashed versions.
@@ -168,7 +166,7 @@ the backslashed versions.
 .B Examples:
 .PP
 Command \fBapg -a 1 -M n -n 3 -m 8 -E 23456789\fP will generate a set of passwords that
-will look like this
+will look like this:
 .br
 \fB10100110\fP
 .br
@@ -178,7 +176,7 @@ will look like this
 .br
 .PP
 Command \fBapg -a 1 -M nc -n 3 -m 26 -E GHIJKLMNOPQRSTUVWXYZ\fP will generate a set of passwords
-that will look like this
+that will look like this:
 .br
 \fB16A1653CD4DE5E7BD9584A3476\fP
 .br
@@ -190,16 +188,16 @@ that will look like this
 .SS "Password quality control options"
 .TP
 .B -r \fIdictfile\fP
-check generated passwords for their appearance in 
+Check generated passwords for their appearance in
 .I dictfile
 .TP
 .B -b \fIfilter_file\fP
-check generated passwords for their appearance in 
-\fIfilter_file\fP. \fIfilter_file\fP should be created with \fBapgbfm\fP(1)
+Check generated passwords for their appearance in
+\fIfilter_file\fP. \fIfilter_file\fP should be created with the \fBapgbfm\fP(1)
 utility.
 .TP
 .B -p min_substr_len
-this option tells \fBapg\fP(1) to check every substring of the generated
+This option tells \fBapg\fP(1) to check every substring of the generated
 password for appearance in \fIfilter_file\fP. If any of such substrings would
 be found in the \fIfilter_file\fP then generated password would be rejected
 and apg(1) will generate another one.
@@ -208,41 +206,48 @@ This option is active only if \fB-b\fP o
 .SS "Pseudo random number generator options"
 .TP
 .B -s
-ask user for random sequence for password generation
+Ask user for random sequence for password generation
 .TP
 .B -c cl_seed
-use
+Use
 .B cl_seed
 as a random seed for password generation. I use it when i have to generate
 passwords in a shell script.
+.RS
+.B Examples:
+.br
+\fB-c /dev/urandom\fP
+.br
+\fB-c /tmp/seed_file\fP
+.RE
 .SS "Password output options"
 .br
 .TP
 .B -d
-do NOT use any delimiters between generated passwords. I use it when i have to generate
+Do NOT use any delimiters between generated passwords. I use it when i have to generate
 passwords in a shell script.
 .TP
 .B -y
-print generated passwords and crypted passwords (see man \fBcrypt\fP(3))
+Print generated passwords and crypted passwords (see \fBcrypt\fP(3))
 .TP
 .B -q
-quiet mode (do not print warnings)
+Quiet mode (do not print warnings)
 .TP
 .B -l
-spell genetated passwords. Useful when you want to read generated password by telephone.
+Spell generated passwords. Useful when you want to read generated password by telephone.
 .RS
 .B WARNING:
 Think twice before read your password by phone.
 .RE
 .TP
 .B -t
-print pronunciation for generated pronounceable password
+Print pronunciation for generated pronounceable password. Ignored if \fB-a 1\fP is set.
 .TP
 .B -h
-print help information and exit
+Print help information and exit
 .TP
 .B -v
-print version information and exit
+Print version information and exit
 .SH "DEFAULT OPTIONS"
 \fBapg -a 0 -M sncl -n 6 -x 10 -m 8\fP (new style)
 .PP
--- a/doc/man/apgbfm.1
+++ b/doc/man/apgbfm.1
@@ -35,12 +35,12 @@ apgbfm
 .SH DESCRIPTION
 .B apgbfm
 is used to manage Bloom filter that is used to restrict password generation
-in \fBAPG\fP pasword generation software. Usage of the Bloom filter allows to speed
+in \fBAPG\fP password generation software. Usage of the Bloom filter allows one to speed
 up password check for large dictionaries and has some other benefits.
 .PP
 The idea to use Bloom filter for that purpose is came from the description of
 the \fBOPUS\fP project \fBOPUS: Preventing Weak Password Choices\fP
-\fIPurdue Technical Report CSD-TR 92-028\fP writen by \fIEugene H. Spafford\fP.
+\fIPurdue Technical Report CSD-TR 92-028\fP written by \fIEugene H. Spafford\fP.
 .PP
 You can obtain this article from:
 .br
--- a/doc/man/wapgbfm.txt
+++ b/doc/man/wapgbfm.txt
@@ -19,13 +19,13 @@ SYNOPSIS
 
 DESCRIPTION
        WAPGBFM is used to manage Bloom filter that is used to restrict password
-       generation in WAPG pasword generation software. Usage of the Bloom  fil-
+       generation in WAPG password generation software. Usage of the Bloom  fil-
        ter  allows  to  speed up password check for large dictionaries and has
        some other benefits.
 
        The idea to use Bloom filter for that purpose is came from the descrip-
        tion  of the OPUS project OPUS: Preventing Weak Password Choices Purdue
-       Technical Report CSD-TR 92-028 writen by Eugene H. Spafford.
+       Technical Report CSD-TR 92-028 written by Eugene H. Spafford.
 
        You can obtain this article from:
        http://www.cerias.purdue.edu/homes/spaf/tech-reps/9128.ps
