security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

ifset parts which are not in GnuPG 2.0

Browse Source
This commit is contained in:
Werner Koch 2011-01-13 15:32:11 +01:00
parent 8db3bf8c47
commit 52b9761c88
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/debugging.texi
View File

@ -103,7 +103,7 @@ used. Using the keyserver debug option as in
is thus often helpful. Note that the actual output depends on the is thus often helpful. Note that the actual output depends on the
backend and may change from release to release. backend and may change from release to release.
@ifset gpgtwoone
@item Logging on WindowsCE @item Logging on WindowsCE
For development, the best logging method on WindowsCE is the use of For development, the best logging method on WindowsCE is the use of
@ -113,7 +113,7 @@ on the given port. (@pxref{option watchgnupg --tcp}). For in the field
tests it is better to make use of the logging facility provided by the tests it is better to make use of the logging facility provided by the
@command{gpgcedev} driver (part of libassuan); this is enabled by using @command{gpgcedev} driver (part of libassuan); this is enabled by using
a log file name of @file{GPG2:}. (@pxref{option --log-file}). a log file name of @file{GPG2:}. (@pxref{option --log-file}).
@end ifset
@end itemize @end itemize

8
doc/gnupg.texi
View File

@ -34,7 +34,7 @@ Published by the Free Software Foundation@*
Boston, MA 02110-1301 USA Boston, MA 02110-1301 USA
@end iftex @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 @quotation
Permission is granted to copy, distribute and/or modify this document Permission is granted to copy, distribute and/or modify this document
@ -51,8 +51,10 @@ section entitled ``Copying''.
* gpg2: (gnupg). OpenPGP encryption and signing tool. * gpg2: (gnupg). OpenPGP encryption and signing tool.
* gpgsm: (gnupg). S/MIME encryption and signing tool. * gpgsm: (gnupg). S/MIME encryption and signing tool.
* gpg-agent: (gnupg). The secret key daemon. * gpg-agent: (gnupg). The secret key daemon.
@ifset gpgtwoone
* dirmngr: (gnupg). X.509 CRL and OCSP server. * dirmngr: (gnupg). X.509 CRL and OCSP server.
* dirmngr-client: (gnupg). X.509 CRL and OCSP client. * dirmngr-client: (gnupg). X.509 CRL and OCSP client.
@end ifset
@end direntry @end direntry
@ -124,7 +126,9 @@ the administration and the architecture.
* Installation:: A short installation guide. * Installation:: A short installation guide.
* Invoking GPG-AGENT:: How to launch the secret key daemon. * Invoking GPG-AGENT:: How to launch the secret key daemon.
@ifset gpgtwoone
* Invoking DIRMNGR:: How to launch the CRL and OCSP daemon. * Invoking DIRMNGR:: How to launch the CRL and OCSP daemon.
@end ifset
* Invoking GPG:: Using the OpenPGP protocol. * Invoking GPG:: Using the OpenPGP protocol.
* Invoking GPGSM:: Using the S/MIME protocol. * Invoking GPGSM:: Using the S/MIME protocol.
* Invoking SCDAEMON:: How to handle Smartcards. * Invoking SCDAEMON:: How to handle Smartcards.
@ -156,7 +160,9 @@ the administration and the architecture.
@include instguide.texi @include instguide.texi
@include gpg-agent.texi @include gpg-agent.texi
@ifset gpgtwoone
@include dirmngr.texi @include dirmngr.texi
@end ifset
@include gpg.texi @include gpg.texi
@include gpgsm.texi @include gpgsm.texi
@include scdaemon.texi @include scdaemon.texi

5
doc/tools.texi
View File

@ -16,7 +16,9 @@ GnuPG comes with a couple of smaller tools:
* gpgsm-gencert.sh:: Generate an X.509 certificate request. * gpgsm-gencert.sh:: Generate an X.509 certificate request.
* gpg-preset-passphrase:: Put a passphrase into the cache. * gpg-preset-passphrase:: Put a passphrase into the cache.
* gpg-connect-agent:: Communicate with a running agent. * gpg-connect-agent:: Communicate with a running agent.
@ifset gpgtwoone
* dirmngr-client:: How to use the Dirmngr client tool. * dirmngr-client:: How to use the Dirmngr client tool.
@end ifset
* gpgparsemail:: Parse a mail message into an annotated format * gpgparsemail:: Parse a mail message into an annotated format
* symcryptrun:: Call a simple symmetric encryption tool. * symcryptrun:: Call a simple symmetric encryption tool.
* gpg-zip:: Encrypt or sign files into an archive. * gpg-zip:: Encrypt or sign files into an archive.
@ -1434,6 +1436,7 @@ Print a list of available control commands.
@include see-also-note.texi @include see-also-note.texi
@end ifset @end ifset
@ifset gpgtwoone
@c @c
@c DIRMNGR-CLIENT @c DIRMNGR-CLIENT
@c @c
@ -1594,7 +1597,7 @@ Squid's @option{external_acl_type} option.
@command{gpgsm}(1) @command{gpgsm}(1)
@include see-also-note.texi @include see-also-note.texi
@end ifset @end ifset
@end ifset
@c @c
@c GPGPARSEMAIL @c GPGPARSEMAIL