aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README.W323
-rw-r--r--doc/gpg.sgml11
2 files changed, 14 insertions, 0 deletions
diff --git a/doc/README.W32 b/doc/README.W32
index a82e63861..659c885ec 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -19,6 +19,9 @@ Directory". The installer does not change the PATH environment
variable to include this directory. You might want to do this
manually.
+Note, that this registry entry is also used to locate the keyserver
+helper programs (e.g. gpgkeys_ldap).
+
Below the Installation directory, you will find directories named
"Doc", "gnupg.nls" and "Src". The latter will be used for distributed
patched, if any, and to store the source file if they have been
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 9cd593177..3cf4da293 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1478,6 +1478,15 @@ exported if the user IDs are not usable. This is the same as running
the --edit-key command "clean uids" before export. Defaults to no.
</para></listitem></varlistentry>
+<varlistentry>
+<term>export-reset-subkey-passwd</term>
+<listitem><para>
+When using the "--export-secret-subkeys" command, this option resets
+the passphrases for all exported subkeys to empty. This is useful
+when the exported subkey is to be used on an unattended amchine where
+a passphrase won't make sense. Defaults to no.
+</para></listitem></varlistentry>
+
</variablelist>
</para></listitem></varlistentry>
@@ -1657,6 +1666,8 @@ Sets a list of directories to search for photo viewers and keyserver
helpers. If not provided, keyserver helpers use the compiled-in
default directory, and photo viewers use the $PATH environment
variable.
+Note, that on W32 system this value is ignored when searching for
+keyserver helpers.
</para></listitem></varlistentry>
<varlistentry>