diff options
| author | David Shaw <[email protected]> | 2002-05-08 03:38:35 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-05-08 03:38:35 +0000 |
| commit | a2dcc1471020a01f6051efc6aeee8e43096a5ba6 (patch) | |
| tree | 47a9fb1a1d52f715b36e0597901158ee97007c6f | |
| parent | * options.h, g10.c (main), getkey.c (finish_lookup), pkclist.c (diff) | |
| download | gnupg-a2dcc1471020a01f6051efc6aeee8e43096a5ba6.tar.gz gnupg-a2dcc1471020a01f6051efc6aeee8e43096a5ba6.zip | |
* gpg.sgml: Add entries for --sk-comments, --no-sk-comments, --pgp7, and
--no-pgp7. Fix --pgp2 and --pgp6: the proper name is --escape-from-lines
and not --escape-from.
| -rw-r--r-- | doc/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/gpg.sgml | 37 |
2 files changed, 38 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 4a9c4bf28..513d54f2e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2002-05-07 David Shaw <[email protected]> + + * gpg.sgml: Add entries for --sk-comments, --no-sk-comments, + --pgp7, and --no-pgp7. Fix --pgp2 and --pgp6: the proper name is + --escape-from-lines and not --escape-from. + 2002-04-30 Timo Schulz <[email protected]> * gpg.sgml: Add an entry for --encrypt-files and --decrypt-files. diff --git a/doc/gpg.sgml b/doc/gpg.sgml index ecf6aa422..dfda887df 100644 --- a/doc/gpg.sgml +++ b/doc/gpg.sgml @@ -1172,11 +1172,24 @@ Write log output to file descriptor &ParmN; and not to stderr. <varlistentry> +<term>--sk-comments</term> +<listitem><para> +Include secret key comment packets when exporting secret keys. This +is a GnuPG extension to the OpenPGP standard, and is off by default. +Please note that this has nothing to do with the comments in clear +text signatures or armor headers. +</para></listitem></varlistentry> + +<varlistentry> +<term>--no-sk-comments</term> +<listitem><para> +Resets the --sk-comments option. +</para></listitem></varlistentry> + +<varlistentry> <term>--no-comment</term> <listitem><para> -Do not write comment packets. This option affects only -the generation of secret keys. Please note, that this has nothing -to do with the comments in clear text signatures. +See --sk-comments. This option is deprecated and may be removed soon. </para></listitem></varlistentry> @@ -1531,7 +1544,7 @@ a message that PGP 2.x will not be able to handle. Note that `PGP available, but the MIT release is a good common baseline. </para><para> This option implies `--rfc1991 --no-openpgp --disable-mdc ---no-force-v4-certs --no-comment --escape-from --force-v3-sigs +--no-force-v4-certs --no-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire --no-ask-cert-expire --cipher-algo IDEA --digest-algo MD5 --compress-algo 1' </para></listitem></varlistentry> @@ -1552,7 +1565,7 @@ compression algorithms none and ZIP. This also disables making signatures with signing subkeys as PGP 6 does not understand signatures made by signing subkeys. </para><para> -This option implies `--disable-mdc --no-comment --escape-from +This option implies `--disable-mdc --no-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire --compress-algo 1' </para></listitem></varlistentry> @@ -1563,6 +1576,20 @@ Resets the --pgp6 option. </para></listitem></varlistentry> <varlistentry> +<term>--pgp7</term> +<listitem><para> +Set up all options to be as PGP 7 compliant as possible. This is +identical to --pgp6 except that the list of allowable ciphers is +expanded to add AES128, AES192, AES256, and TWOFISH. +</para></listitem></varlistentry> + +<varlistentry> +<term>--no-pgp7</term> +<listitem><para> +Resets the --pgp7 option. +</para></listitem></varlistentry> + +<varlistentry> <term>--openpgp</term> <listitem><para> Reset all packet, cipher and digest options to OpenPGP |