aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gnupg.texi
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/gnupg.texi25
1 files changed, 24 insertions, 1 deletions
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 6f3f0b74e..7bb54af51 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -34,7 +34,7 @@ Published by the Free Software Foundation@*
Boston, MA 02110-1301 USA
@end iftex
-Copyright @copyright{} 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -50,6 +50,11 @@ section entitled ``Copying''.
@direntry
* 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
@@ -121,6 +126,9 @@ 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.
@@ -152,6 +160,9 @@ 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
@@ -194,6 +205,18 @@ the administration and the architecture.
@c Epilogue
@c ---------------------------------------------------------------------
+@c @node History
+@c @unnumbered History
+@c
+@c Here are the notices from the old dirmngr manual:
+@c
+@c @itemize
+@c @item Using DirMngr, 2002, Steffen Hansen, Klar"alvdalens Datakonsult AB.
+@c @item Using DirMngr, 2004, 2005, 2006, 2008 Werner Koch, g10 Code GmbH.
+@c @end itemize
+@c
+
+
@bye