[svn] GnuPG - r5118 - trunk/doc

[svn author dshaw]

Author: dshaw
Date: 2009-08-14 21:43:26 +0200 (Fri, 14 Aug 2009)
New Revision: 5118

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gpg.texi
Log:
* gpg.texi (GPG Configuration Options): Document keyserver options
check-cert and ca-cert-file.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2009-08-13 15:41:32 UTC (rev 5117)
+++ trunk/doc/ChangeLog	2009-08-14 19:43:26 UTC (rev 5118)
@@ -1,3 +1,8 @@
+2009-08-14  David Shaw  <dshaw at jabberwocky.com>
+
+	* gpg.texi (GPG Configuration Options): Document keyserver options
+	check-cert and ca-cert-file.
+
 2009-08-06  Werner Koch  <wk at g10code.com>
 
 	* DETAILS: Describe the new INV_SNDR and NO_SNDR..

Modified: trunk/doc/gpg.texi
===================================================================
--- trunk/doc/gpg.texi	2009-08-13 15:41:32 UTC (rev 5117)
+++ trunk/doc/gpg.texi	2009-08-14 19:43:26 UTC (rev 5118)
@@ -1429,11 +1429,11 @@
 
 @item --keyserver-options @code{name=value1 }
 This is a space or comma delimited string that gives options for the
-keyserver. Options can be prepended with a `no-' to give the opposite
-meaning. Valid import-options or export-options may be used here as well
-to apply to importing (@option{--recv-key}) or exporting
-(@option{--send-key}) a key from a keyserver. While not all options are
-available for all keyserver types, some common options are:
+keyserver. Options can be prefixed with a `no-' to give the opposite
+meaning. Valid import-options or export-options may be used here as
+well to apply to importing (@option{--recv-key}) or exporting
+(@option{--send-key}) a key from a keyserver. While not all options
+are available for all keyserver types, some common options are:
 
 @table @asis
 
@@ -1515,6 +1515,16 @@
 details of debug output depends on which keyserver helper program is
 being used, and in turn, on any libraries that the keyserver helper
 program uses internally (libcurl, openldap, etc).
+
+ at item check-cert
+Enable certificate checking if the keyserver presents one (for hkps or
+ldaps).  Defaults to on.
+
+ at item ca-cert-file
+Provide a certificate file to override the system default.  Only
+necessary if check-cert is enabled, and the keyserver is using a
+certificate that is not present in a system default certificate list.
+
 @end table
 
 @item --completes-needed @code{n}