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/examples | |
| 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/examples')
| -rw-r--r-- | doc/examples/README | 2 | ||||
| -rw-r--r-- | doc/examples/gpgconf.conf | 5 |
2 files changed, 3 insertions, 4 deletions
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] |