diff options
| author | Werner Koch <wk@gnupg.org> | 2007-04-13 13:45:05 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2007-04-13 13:45:05 +0200 |
| commit | 6ae6e18d5fc677d72aad050fd6bb8323836dd929 (patch) | |
| tree | bcb900b825a7a6f36ebb69858fd6ad8ce80ab27a /doc | |
| parent | * parse-packet.c (parse_marker): New. Enforce that the marker (diff) | |
| download | gnupg2-6ae6e18d5fc677d72aad050fd6bb8323836dd929.tar.xz gnupg2-6ae6e18d5fc677d72aad050fd6bb8323836dd929.zip | |
g10/ and sm/
* call-agent.c (start_agent): Don't use log_error when using the
fallback hack to start the agent. This is bug 782.
scripts/
* mail-to-translators: Copied from 1.4. and adjusted.
tools/
* gpgconf-comp.c: Allow changing of --allow-mark-trusted.
* gpg-connect-agent.c (main): New option --decode and commands
decode and undecode.
(read_and_print_response): Implement option.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | doc/examples/README | 2 | ||||
| -rw-r--r-- | doc/examples/gpgconf.conf | 5 | ||||
| -rw-r--r-- | doc/gpg.texi | 22 |
5 files changed, 31 insertions, 5 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index db0c5bae1..5120d1ff4 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2007-04-10 Werner Koch <wk@g10code.com> + + * gpg.texi (GPG Configuration Options): Document --batch, no-tty, + --yes and --no. + 2007-03-08 Werner Koch <wk@g10code.com> * gnupg-logo.png, gnupg-logo.eps, gnupg-logo.pdf: New. diff --git a/doc/Makefile.am b/doc/Makefile.am index b1e903934..5d25c828a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -23,7 +23,7 @@ examples = examples/README examples/scd-event examples/trustlist.txt \ examples/gpgconf.conf EXTRA_DIST = DETAILS HACKING TRANSLATE OpenPGP KEYSERVER samplekeys.asc \ - gnupg-logo.eps gnupg-logo.jpg gnupg-logo.pdf \ + gnupg-logo.eps gnupg-logo.pdf \ gnupg-card-architecture.eps gnupg-card-architecture.png \ gnupg-card-architecture.pdf \ faq.raw FAQ faq.html gnupg7.texi \ diff --git a/doc/examples/README b/doc/examples/README index 341dda88a..344482283 100644 --- a/doc/examples/README +++ b/doc/examples/README @@ -6,4 +6,4 @@ scd-event A handler script used with scdaemon trustlist.txt A list of trustworthy root certificates (Please check yourself whether you actually trust them) - +gpgconf.conf A sample configuration file for gpgconf. diff --git a/doc/examples/gpgconf.conf b/doc/examples/gpgconf.conf index 194ed7938..c9012137d 100644 --- a/doc/examples/gpgconf.conf +++ b/doc/examples/gpgconf.conf @@ -52,8 +52,7 @@ #------------------------------------------------------------------- -# Allow all users to change the allow-mark-trusted option. -# (This was the default prior to gnupg 2.0.3) -* gpg-agent allow-mark-trusted [change] +# Deny all users to change the allow-mark-trusted option. +* gpg-agent allow-mark-trusted [no-change] diff --git a/doc/gpg.texi b/doc/gpg.texi index e70c32341..6d8ad2f7a 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -908,6 +908,28 @@ Reset verbose level to 0. @opindex quiet Try to be as quiet as possible. +@item --batch +@itemx --no-batch +@opindex batch +@opindex no-batch +Use batch mode. Never ask, do not allow interactive commands. +@option{--no-batch} disables this option. + +@item --no-tty +@opindex no-tty +Make sure that the TTY (terminal) is never used for any output. +This option is needed in some cases because GnuPG sometimes prints +warnings to the TTY even if @option{--batch} is used. + +@item --yes +@opindex yes +Assume "yes" on most questions. + +@item --no +@opindex no +Assume "no" on most questions. + + @item --list-options @code{parameters} @opindex list-options This is a space or comma delimited string that gives options used when |