[svn] GnuPG - r5428 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2010-09-28 18:04:47 +0200 (Tue, 28 Sep 2010)
New Revision: 5428

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
Clarify that --force-v3-sigs disables (not enables) v4 options

Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-09-28 15:55:24 UTC (rev 5427)
+++ trunk/doc/ChangeLog	2010-09-28 16:04:47 UTC (rev 5428)
@@ -1,3 +1,9 @@
+2010-09-28  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi (OpenPGP Options): Clarify that --force-v3-sigs
+	disables (not enables) v4 options.  --force-v3-sigs defaults to
+	no.
+
 2010-08-18  Werner Koch  <wk at g10code.com>
 
 	* tools.texi (watchgnupg): Add examples section.
@@ -796,7 +802,7 @@
 
 	* Makefile.am, gpgsm.texi: New.
 	
- Copyright 2002, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright 2002, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2010-09-28 15:55:24 UTC (rev 5427)
+++ trunk/doc/gpg.texi	2010-09-28 16:04:47 UTC (rev 5428)
@@ -1,5 +1,5 @@
 @c Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- at c               2008, 2009 Free Software Foundation, Inc.
+ at c               2008, 2009, 2010 Free Software Foundation, Inc.
 @c This is part of the GnuPG manual.
 @c For copying conditions, see the file gnupg.texi.
 
@@ -1964,10 +1964,11 @@
 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 implies @option{--ask-sig-expire},
+Note that this option implies @option{--no-ask-sig-expire}, and unsets
 @option{--sig-policy-url}, @option{--sig-notation}, and
 @option{--sig-keyserver-url}, as these features cannot be used with v3
 signatures.  @option{--no-force-v3-sigs} disables this option.
+Defaults to no.
 
 @item --force-v4-certs
 @itemx --no-force-v4-certs
@@ -2541,10 +2542,7 @@
 When making a data signature, prompt for an expiration time. If this
 option is not specified, the expiration time set via
 @option{--default-sig-expire} is used. @option{--no-ask-sig-expire}
-disables this option. Note that by default, @option{--force-v3-sigs} is
-set which also disables this option. If you want signature expiration,
-you must set @option{--no-force-v3-sigs} as well as turning
- at option{--ask-sig-expire} on.
+disables this option.
 
 @item --default-sig-expire
 The default expiration time to use for signature expiration. Valid