[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-73-g550d94b

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  550d94b0113bfa49d7107171e498d16880deb5b2 (commit)
      from  92e66c70b64283cba2442ee0ca1268abecf7e107 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 550d94b0113bfa49d7107171e498d16880deb5b2
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jul 18 10:38:14 2011 +0200

    Clarify documentation of --keyid-format.
    
    Fixes bug#1354.

diff --git a/doc/gpg.texi b/doc/gpg.texi
index c505e07..1112fa2 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1429,7 +1429,8 @@ required if @code{local} is also used.
 Select how to display key IDs. "short" is the traditional 8-character
 key ID. "long" is the more accurate (but less convenient)
 16-character key ID. Add an "0x" to either to include an "0x" at the
-beginning of the key ID, as in 0x99242560.
+beginning of the key ID, as in 0x99242560.  Note that this option is
+ignored if the option --with-colons is used.
 
 @item --keyserver @code{name}
 Use @code{name} as your keyserver. This is the server that

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org