aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/opt-homedir.texi10
-rw-r--r--doc/tools.texi28
-rw-r--r--doc/wks.texi15
3 files changed, 42 insertions, 11 deletions
diff --git a/doc/opt-homedir.texi b/doc/opt-homedir.texi
index 07993d29d..15ae1970d 100644
--- a/doc/opt-homedir.texi
+++ b/doc/opt-homedir.texi
@@ -13,13 +13,3 @@ directory stated through the environment variable @env{GNUPGHOME} or
On Windows systems it is possible to install GnuPG as a portable
application. In this case only this command line option is
considered, all other ways to set a home directory are ignored.
-
-@efindex gpgconf.ctl
-To install GnuPG as a portable application under Windows, create an
-empty file named @file{gpgconf.ctl} in the same directory as the tool
-@file{gpgconf.exe}. The root of the installation is then that
-directory; or, if @file{gpgconf.exe} has been installed directly below
-a directory named @file{bin}, its parent directory. You also need to
-make sure that the following directories exist and are writable:
-@file{ROOT/home} for the GnuPG home and @file{ROOT@value{LOCALCACHEDIR}}
-for internal cache files.
diff --git a/doc/tools.texi b/doc/tools.texi
index a7c141cfc..07a50820b 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1122,10 +1122,36 @@ More fields may be added in future to the output.
@table @file
+@item gpgconf.ctl
+@cindex gpgconf.ctl
+ Under Unix @file{gpgconf.ctl} may be used to change some of the
+ compiled in directories where the GnuPG components are expected. This
+ file is expected in the same directory as @file{gpgconf}. The
+ physical installation directories are evaluated and no symlinks.
+ Blank lines and lines starting with pound sign are ignored in the
+ file. The keywords must be followed by optional white space, an equal
+ sign, optional white space, and the value. Environment variables are
+ substituted in standard shell manner, the final value must start with
+ a slash, trailing slashes are stripped. Valid keywords are
+ @code{rootdir}, @code{sysconfdir}, @code{socketdir}, and
+ @code{.enable}. No errors are printed for unknown keywords. The
+ @code{.enable} keyword is special: if the keyword is used and its
+ value evaluates to true the entire file is ignored.
+
+ Under Windows this file is used to install GnuPG as a portable
+ application. An empty file named @file{gpgconf.ctl} is expected in
+ the same directory as the tool @file{gpgconf.exe}. The root of the
+ installation is then that directory; or, if @file{gpgconf.exe} has
+ been installed directly below a directory named @file{bin}, its parent
+ directory. You also need to make sure that the following directories
+ exist and are writable: @file{ROOT/home} for the GnuPG home and
+ @file{ROOT@value{LOCALCACHEDIR}} for internal cache files.
+
+
@item /etc/gnupg/gpgconf.conf
@cindex gpgconf.conf
If this file exists, it is processed as a global configuration file.
- This is a legacy mechanism which should not be used tigether with
+ This is a legacy mechanism which should not be used together with
the modern global per component configuration files. A commented
example can be found in the @file{examples} directory of the
distribution.
diff --git a/doc/wks.texi b/doc/wks.texi
index 1959151a1..8c5fc557c 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -243,6 +243,21 @@ Display a brief help page and exit.
@end table
+@noindent
+@mansect examples
+@chapheading Examples
+
+To use the services with clients lacking integrated support, the
+mailcap mechanism can be used. Simply put:
+@example
+application/vnd.gnupg.wks; \
+ @value{BINDIR}/gpg-wks-client -v --read --send; \
+ needsterminal; \
+ description=WKS message
+@end example
+into the @file{/etc/mailcap}. This assumes that a /usr/lib/sendmail
+is installed. With this configuration any real mail programs will run
+gpg-wks-client for messages received from a Web Key Service.
@mansect see also
@ifset isman