[svn] GnuPG - r4611 - branches/STABLE-BRANCH-1-4/doc

[svn author dshaw]

Author: dshaw
Date: 2007-10-27 17:52:02 +0200 (Sat, 27 Oct 2007)
New Revision: 4611

Modified:
   branches/STABLE-BRANCH-1-4/doc/ChangeLog
   branches/STABLE-BRANCH-1-4/doc/gpg.texi
Log:
* gpg.texi: Update from gnupg-2.


Modified: branches/STABLE-BRANCH-1-4/doc/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/ChangeLog	2007-10-27 14:09:36 UTC (rev 4610)
+++ branches/STABLE-BRANCH-1-4/doc/ChangeLog	2007-10-27 15:52:02 UTC (rev 4611)
@@ -1,3 +1,7 @@
+2007-10-27  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi: Update from gnupg-2.
+
 2007-10-23  Werner Koch  <wk at g10code.com>
 
 	* gpg.texi: Updated from gnupg-2.

Modified: branches/STABLE-BRANCH-1-4/doc/gpg.texi
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/gpg.texi	2007-10-27 14:09:36 UTC (rev 4610)
+++ branches/STABLE-BRANCH-1-4/doc/gpg.texi	2007-10-27 15:52:02 UTC (rev 4611)
@@ -1845,16 +1845,15 @@
 the type of the signature.
 @end ifset
 
-
-
 @item --force-v3-sigs
 @itemx --no-force-v3-sigs
 OpenPGP states that an implementation should generate v4 signatures
 but PGP versions 5 through 7 only recognize v4 signatures on key
 material. This option forces v3 signatures for signatures on data.
-Note that this option overrides @option{--ask-sig-expire}, as v3 signatures
-cannot have expiration dates. @option{--no-force-v3-sigs} disables this
-option.
+Note that this option implies @option{--ask-sig-expire},
+ at option{--sig-policy-url}, @option{--sig-notation}, and
+ at option{--sig-keyserver-url}, as these features cannot be used with v3
+signatures.  @option{--no-force-v3-sigs} disables this option.
 
 @item --force-v4-certs
 @itemx --no-force-v4-certs
@@ -1953,15 +1952,20 @@
 @opindex openpgp
 Reset all packet, cipher and digest options to strict OpenPGP
 behavior. Use this option to reset all previous options like
- at option{--rfc1991}, @option{--force-v3-sigs}, @option{--s2k-*},
- at option{--cipher-algo}, @option{--digest-algo} and
+ at option{--s2k-*}, @option{--cipher-algo}, @option{--digest-algo} and
 @option{--compress-algo} to OpenPGP compliant values. All PGP
 workarounds are disabled.
 
+ at item --rfc4880
+ at opindex rfc4880
+Reset all packet, cipher and digest options to strict RFC-4880
+behavior. Note that this is currently the same thing as
+ at option{--openpgp}.
+
 @item --rfc2440
 @opindex rfc2440
 Reset all packet, cipher and digest options to strict RFC-2440
-behavior. Note that this is currently the same thing as @option{--openpgp}.
+behavior.
 
 @item --rfc1991
 @opindex rfc1991
@@ -1975,11 +1979,10 @@
 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
---no-sk-comment --escape-from-lines --force-v3-sigs --no-ask-sig-expire
---no-ask-cert-expire --cipher-algo IDEA --digest-algo MD5
---compress-algo 1}. It also disables @option{--textmode} when
-encrypting.
+This option implies @option{--rfc1991 --disable-mdc
+--no-force-v4-certs --no-sk-comment --escape-from-lines
+--force-v3-sigs --cipher-algo IDEA --digest-algo MD5 --compress-algo
+ZIP}. It also disables @option{--textmode} when encrypting.
 
 @item --pgp6
 @opindex pgp6
@@ -1991,7 +1994,7 @@
 does not understand signatures made by signing subkeys.
 
 This option implies @option{--disable-mdc --no-sk-comment
---escape-from-lines --force-v3-sigs --no-ask-sig-expire}.
+--escape-from-lines --force-v3-sigs}.
 
 @item --pgp7
 @opindex pgp7
@@ -2709,10 +2712,11 @@
 of the standard, such as the SHA-512 hash, and the ZLIB and BZIP2
 compression algorithms. It is important to be aware that not all
 OpenPGP programs implement these optional algorithms and that by
-forcing their use via the @option{--cipher-algo}, @option{--digest-algo},
- at option{--cert-digest-algo}, or @option{--compress-algo} options in GnuPG, it is
-possible to create a perfectly valid OpenPGP message, but one that
-cannot be read by the intended recipient.
+forcing their use via the @option{--cipher-algo},
+ at option{--digest-algo}, @option{--cert-digest-algo}, or
+ at option{--compress-algo} options in GnuPG, it is possible to create a
+perfectly valid OpenPGP message, but one that cannot be read by the
+intended recipient.
 
 There are dozens of variations of OpenPGP programs available, and each
 supports a slightly different subset of these optional algorithms.