diff options
| author | Werner Koch <wk@gnupg.org> | 2014-06-03 13:34:24 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-06-25 09:45:56 +0200 |
| commit | f149e05427a370f5985bc3fb142370b043f19924 (patch) | |
| tree | 7db209cedd46fc0d89d08fce22df15d0c61fec64 /doc/gpg.texi | |
| parent | gpg: Allow key-to-card upload for cert-only keys (diff) | |
| download | gnupg2-f149e05427a370f5985bc3fb142370b043f19924.tar.xz gnupg2-f149e05427a370f5985bc3fb142370b043f19924.zip | |
doc: Update for modern makeinfo.
* doc/texi.css: Remove.
* doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.
Diffstat (limited to 'doc/gpg.texi')
| -rw-r--r-- | doc/gpg.texi | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 9a6782a43..9c52282cb 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2330,12 +2330,17 @@ a message that PGP 2.x will not be able to handle. Note that `PGP 2.x' here means `MIT PGP 2.6.2'. There are other versions of PGP 2.x available, but the MIT release is a good common baseline. -This option implies @option{--rfc1991 --disable-mdc ---no-force-v4-certs --escape-from-lines --force-v3-sigs +This option implies +@ifset gpgone +@option{--rfc1991 --disable-mdc --no-force-v4-certs + --escape-from-lines --force-v3-sigs + --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}. +@end ifset @ifclear gpgone ---allow-weak-digest-algos +@option{--rfc1991 --disable-mdc --no-force-v4-certs + --escape-from-lines --force-v3-sigs --allow-weak-digest-algos + --cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}. @end ifclear ---cipher-algo IDEA --digest-algo MD5 --compress-algo ZIP}. It also disables @option{--textmode} when encrypting. @item --pgp6 |