diff options
author | Werner Koch <wk@gnupg.org> | 2006-10-23 16:02:13 +0200 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2006-10-23 16:02:13 +0200 |
commit | 7b8ea82ab64aa0c298c48ef3edf680102c2b1788 (patch) | |
tree | 3dfca78f29a4bdbd5ae307ca989544b951fe091d /doc | |
parent | Allow importing of web.de generated p12 files (diff) | |
download | gnupg2-7b8ea82ab64aa0c298c48ef3edf680102c2b1788.tar.xz gnupg2-7b8ea82ab64aa0c298c48ef3edf680102c2b1788.zip |
.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/gpg.texi | 11 | ||||
-rw-r--r-- | doc/gpgsm.texi | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 1337cd15c..6849b19ae 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -365,12 +365,13 @@ those of the given name. The new keyring is written to stdout or to the file given with option @option{--output}. Use together with @option{--armor} to mail those keys. -@item --send-keys +@item --send-keys @code{key IDs} @opindex send-keys -Same as @option{--export} but sends the keys to a keyserver. Option -@option{--keyserver} must be used to give the name of this -keyserver. Don't send your complete keyring to a keyserver --- select -only those keys which are new or changed by you. +Similar to @option{--export} but sends the keys to a keyserver. +Fingerprints may be used instead of key IDs. Option @option{--keyserver} +must be used to give the name of this keyserver. Don't send your +complete keyring to a keyserver --- select only those keys which are new +or changed by you. @item --export-secret-keys @itemx --export-secret-subkeys diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index b184634ee..64a662879 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -490,10 +490,19 @@ certificate. @table @gnupgtabopt @item --include-certs @var{n} +@opindex include-certs Using @var{n} of -2 includes all certificate except for the root cert, -1 includes all certs, 0 does not include any certs, 1 includes only the signers cert (this is the default) and all other positive values include up to @var{n} certificates starting with the signer cert. + + +@item --cipher-algo @var{oid} +@opindex cipher-algo +Use the cipher algorithm with the ASN.1 object identifier @var{oid} for +encryption. For convenience the strings @code{3DES}, @code{AES} and +@code{AES256} may be used instead of their OIDs. The default is +@code{3DES} (1.2.840.113549.3.7). @end table |