summaryrefslogtreecommitdiffstats
path: root/doc/gnupg.texi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-06-08 19:27:08 +0200
committerWerner Koch <wk@gnupg.org>2015-06-08 19:27:08 +0200
commitabbefdd04d7ee30218506caeae1fd858569c9f0a (patch)
tree582d92a380ee271c35f4b2e607686378e359323c /doc/gnupg.texi
parentConvey envvar INSIDE_EMACS to the pinentry. (diff)
downloadgnupg2-abbefdd04d7ee30218506caeae1fd858569c9f0a.tar.xz
gnupg2-abbefdd04d7ee30218506caeae1fd858569c9f0a.zip
doc: Change the manual source to be only for GnuPG 2.1
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'doc/gnupg.texi')
-rw-r--r--doc/gnupg.texi6
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index b0952309d..2517a50ec 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -52,10 +52,8 @@ section entitled ``Copying''.
* gpg2: (gnupg). OpenPGP encryption and signing tool.
* gpgsm: (gnupg). S/MIME encryption and signing tool.
* gpg-agent: (gnupg). The secret key daemon.
-@ifset gpgtwoone
* dirmngr: (gnupg). X.509 CRL and OCSP server.
* dirmngr-client: (gnupg). X.509 CRL and OCSP client.
-@end ifset
@end direntry
@@ -127,9 +125,7 @@ the administration and the architecture.
* Installation:: A short installation guide.
* Invoking GPG-AGENT:: How to launch the secret key daemon.
-@ifset gpgtwoone
* Invoking DIRMNGR:: How to launch the CRL and OCSP daemon.
-@end ifset
* Invoking GPG:: Using the OpenPGP protocol.
* Invoking GPGSM:: Using the S/MIME protocol.
* Invoking SCDAEMON:: How to handle Smartcards.
@@ -161,9 +157,7 @@ the administration and the architecture.
@include instguide.texi
@include gpg-agent.texi
-@ifset gpgtwoone
@include dirmngr.texi
-@end ifset
@include gpg.texi
@include gpgsm.texi
@include scdaemon.texi