diff --git a/doc/gpg.texi b/doc/gpg.texi index 23636e9cb..cde27a5a5 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2504,9 +2504,9 @@ protected by the signature. @opindex emit-version Force inclusion of the version string in ASCII armored output. If given once only the name of the program and the major number is -emitted (default), given twice the minor is also emitted, given triple +emitted, given twice the minor is also emitted, given triple the micro is added, and given quad an operating system identification -is also emitted. @option{--no-emit-version} disables the version +is also emitted. @option{--no-emit-version} (default) disables the version line. @item --sig-notation @code{name=value} diff --git a/g10/gpg.c b/g10/gpg.c index 3a7dc3802..a757fe33b 100644 --- a/g10/gpg.c +++ b/g10/gpg.c @@ -2018,7 +2018,7 @@ main (int argc, char **argv) opt.def_cert_expire="0"; set_homedir ( default_homedir () ); opt.passphrase_repeat=1; - opt.emit_version = 1; /* Limit to the major number. */ + opt.emit_version = 0; opt.list_options |= LIST_SHOW_UID_VALIDITY; opt.verify_options |= LIST_SHOW_UID_VALIDITY;