Update doc. This time also the included files.

5 files changed, 53 insertions, 19 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index feb13aa52..131c26dff 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,11 @@
+2009-08-18  Werner Koch  <[email protected]>
+
+	* Makefile.am (sources_from_trunk): New.
+	(update-source-from-gnupg-2): New.  Run it.  Fixes bug#917
+
 2009-08-13  Werner Koch  <[email protected]>
 
-	* gpgv.texi, gpg.texi: Udpate from GnuPG-2.
+	* gpgv.texi, gpg.texi: Update from GnuPG-2.
 
 2008-04-30  David Shaw  <[email protected]>
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2d95e7126..5a9538034 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -22,9 +22,14 @@ EXTRA_DIST = DETAILS faq.raw FAQ faq.html \
              gpg.texi gpgv.texi specify-user-id.texi see-also-note.texi \
 	     opt-homedir.texi texi.css yat2m.c gpl.texi gpg-zip.1
 
+
 myman_sources = gpg.texi gpgv.texi
 myman_pages   = gpg.1 gpgv.1
 
+
+sources_from_trunk = $(myman_sources) \
+                     opt-homedir.texi specify-user-id.texi see-also-note.texi
+
 info_TEXINFOS = gnupg1.texi
 
 man_MANS = $(myman_pages) gnupg.7 gpg.ru.1 gpg-zip.1
@@ -105,3 +110,14 @@ endif
 dist-hook:
 	@if test "`wc -c < gpg.1`" -lt 200; then \
 	    echo 'ERROR: dummy man page'; false; fi
+
+# Helper to update some source files.
+update-source-from-gnupg-2:
+	@set -e; \
+	 if test -d ../../gnupg/scd; then dir="../../gnupg"; \
+	 else exit 1; \
+	 fi; \
+	 for i in $(sources_from_trunk); do \
+           cp $$dir/doc/$$i $$i; echo $$i; \
+	 done ;\
+	 echo "Please remember to update the ChangeLog!"
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 94616ee32..84aa799a9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1429,11 +1429,11 @@ keyserver each time you use it.
 
 @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 @@ Turn on debug output in the keyserver helper program.  Note that the
 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).
+
+@item check-cert
+Enable certificate checking if the keyserver presents one (for hkps or
+ldaps).  Defaults to on.
+
+@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}
@@ -1958,17 +1968,19 @@ message modification attack.
 Set the list of personal cipher preferences to @code{string}.  Use
 @command{@gpgname --version} to get a list of available algorithms,
 and use @code{none} to set no preference at all.  This allows the user
-to factor in their own preferred algorithms when algorithms are chosen
-via recipient key preferences.  The most highly ranked cipher in this
-list is also used for the @option{--symmetric} encryption command.
+to safely override the algorithm chosen by the recipient key
+preferences, as GPG will only select an algorithm that is usable by
+all recipients.  The most highly ranked cipher in this list is also
+used for the @option{--symmetric} encryption command.
 
 @item --personal-digest-preferences @code{string}
 Set the list of personal digest preferences to @code{string}.  Use
 @command{@gpgname --version} to get a list of available algorithms,
 and use @code{none} to set no preference at all.  This allows the user
-to factor in their own preferred algorithms when algorithms are chosen
-via recipient key preferences.  The most highly ranked digest
-algorithm in this list is also used when signing without encryption
+to safely override the algorithm chosen by the recipient key
+preferences, as GPG will only select an algorithm that is usable by
+all recipients.  The most highly ranked digest algorithm in this list
+is also used when signing without encryption
 (e.g. @option{--clearsign} or @option{--sign}). The default value is
 SHA-1.
 
@@ -1976,10 +1988,11 @@ SHA-1.
 Set the list of personal compression preferences to @code{string}.
 Use @command{@gpgname --version} to get a list of available
 algorithms, and use @code{none} to set no preference at all.  This
-allows the user to factor in their own preferred algorithms when
-algorithms are chosen via recipient key preferences.  The most highly
-ranked compression algorithm in this list is also used when there are
-no recipient keys to consider (e.g. @option{--symmetric}).
+allows the user to safely override the algorithm chosen by the
+recipient key preferences, as GPG will only select an algorithm that
+is usable by all recipients.  The most highly ranked compression
+algorithm in this list is also used when there are no recipient keys
+to consider (e.g. @option{--symmetric}).
 
 @item --s2k-cipher-algo @code{name}
 Use @code{name} as the cipher algorithm used to protect secret keys.
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
index 739c442da..e382f6368 100644
--- a/doc/opt-homedir.texi
+++ b/doc/opt-homedir.texi
@@ -1,10 +1,10 @@
 @c This option is included at several places.
 @item --homedir @var{dir}
 @opindex homedir
-Set the name of the home directory to @var{dir}. If his option is not
+Set the name of the home directory to @var{dir}. If this option is not
 used, the home directory defaults to @file{~/.gnupg}.  It is only
 recognized when given on the command line.  It also overrides any home
 directory stated through the environment variable @env{GNUPGHOME} or
-(on W32 systems) by means on the Registry entry
+(on W32 systems) by means of the Registry entry
 @var{HKCU\Software\GNU\GnuPG:HomeDir}.
 
diff --git a/doc/see-also-note.texi b/doc/see-also-note.texi
index c0563fe97..b18efc3eb 100644
--- a/doc/see-also-note.texi
+++ b/doc/see-also-note.texi
@@ -6,7 +6,7 @@ If GnuPG and the info program are properly installed at your site, the
 command
 
 @example
-info gnupg1
+info gnupg
 @end example
 
 should give you access to the complete manual including a menu structure