Sfoglia il codice sorgente

expand explanation of the -k option,

update the command line help and also the man
oz123 11 anni fa
parent
commit
43d0077a29
2 ha cambiato i file con 17 aggiunte e 6 eliminazioni
  1. 13 5
      documentation/man_page/pwman3.1
  2. 4 1
      scripts/pwman3

+ 13 - 5
documentation/man_page/pwman3.1

@@ -1,4 +1,4 @@
-.TH PWMAN3 1 "24 Mai 2013"
+.TH PWMAN3 1 "29 June 2013"
 .SH NAME
 pwman3 \- command line password manager
 .SH SYNOPSIS
@@ -14,16 +14,23 @@ Read the configuration from \fBFILE\fP instead of the default
 
 .TP
 \fB\-e, \-\-encryption\fP ALGORITHM
-Possible options are: AES(default), ARC2, ARC4, Blowfish, CAST, DES, DES3, IDEA, RC5.
+Possible options are: AES(default), ARC2, ARC4, Blowfish, 
+.br
+CAST, DES, DES3, IDEA, RC5.
 
 .TP
 \fB\-d, \-\-database\fP FILE
-When using the default sqlite backend, use \fBFILE\fP to read/store passwords.
+When using the default sqlite backend, use \fBFILE\fP 
+.br 
+to read/store passwords.
 
 
 .TP
 \fB\-k, \-\-convert\fP 
 Convert old DB format to Version >= 0.4. 
+The databse that will be converted is the one found in the 
+.br
+config file, or the one given as command line argument.
 
 .TP
 \fB\-h, \-\-help\fP
@@ -31,5 +38,6 @@ Display help and exit.
 
 .SH AUTHOR
 
-This manpage has been written by Julien Louis <ptitlouis@sysif.net> for the Debian
-GNU/Linux system but may be used by the others.
+This manpage has been written by Julien Louis <ptitlouis@sysif.net> 
+.br
+for the Debian GNU/Linux system but may be used by the others.

+ 4 - 1
scripts/pwman3

@@ -39,7 +39,10 @@ parser.add_argument('-e', '--encryption', dest="algo",
 parser.add_argument('-k', '--convert', dest='dbconvert',
                     action='store_true', default=False,
                     # os.path.expanduser('~/.pwman/pwman.db'),
-                    help="Convert old DB format to Version >= 0.4.",
+                    help="Convert old DB format to Version >= 0.4."
+                         + "The databse that will be converted is the"
+                         + "one found in the config file, or the one given"
+                         + "as command line argument."
                     )
 
 parser.add_argument('-t', '--test',  help="Run pwman from current directory \