diff options
| author | Werner Koch <[email protected]> | 2009-05-08 15:08:37 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2009-05-08 15:08:37 +0000 |
| commit | 8e7e6f124b3c1ece196edd53133dc5ae7ce8da31 (patch) | |
| tree | 89cfa23b5f3bb5188a3896e29dbb7f68b0084479 | |
| parent | More support for Netkey cards. (diff) | |
| download | gnupg-8e7e6f124b3c1ece196edd53133dc5ae7ce8da31.tar.gz gnupg-8e7e6f124b3c1ece196edd53133dc5ae7ce8da31.zip | |
Doc fixes.
| -rw-r--r-- | doc/gpg.texi | 4 | ||||
| -rw-r--r-- | jnlib/dotlock.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 6b1e7360f..9e40e74c1 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1949,7 +1949,7 @@ Set the list of personal digest preferences to @code{string}. Use and use @code{none} to set no preference at all. This allows the user to factor in their own preferred algorithms when algorithms are chosen via recipient key preferences. The most highly ranked digest -algorithm in this list is algo used when signing without encryption +algorithm in this list is also used when signing without encryption (e.g. @option{--clearsign} or @option{--sign}). The default value is SHA-1. @@ -1959,7 +1959,7 @@ Use @command{@gpgname --version} to get a list of available algorithms, and use @code{none} to set no preference at all. This allows the user to factor in their own preferred algorithms when algorithms are chosen via recipient key preferences. The most highly -ranked compression algorithm in this list is algo used when there are +ranked compression algorithm in this list is also used when there are no recipient keys to consider (e.g. @option{--symmetric}). @item --s2k-cipher-algo @code{name} diff --git a/jnlib/dotlock.c b/jnlib/dotlock.c index 53a43244d..96041c0ce 100644 --- a/jnlib/dotlock.c +++ b/jnlib/dotlock.c @@ -165,7 +165,6 @@ create_dotlock (const char *file_to_lock) */ snprintf (pidstr, sizeof pidstr, "%10d\n", (int)getpid() ); - /* fixme: add the hostname to the second line (FQDN or IP addr?) */ /* Create a temporary file. */ if ( uname ( &utsbuf ) ) |