diff options
| author | Werner Koch <[email protected]> | 2017-10-27 11:56:15 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-10-27 11:56:15 +0000 |
| commit | f6ab97fd9620bb8f512ffb471a66e5f96098a7cc (patch) | |
| tree | 99db33d56ef4f0c05f1d6af6ec7ffaffd9547e1b /doc | |
| parent | agent: Clean up pinentry access locking. (diff) | |
| parent | agent, tests: Support --disable-scdaemon build case. (diff) | |
| download | gnupg-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.tar.gz gnupg-f6ab97fd9620bb8f512ffb471a66e5f96098a7cc.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Resolved Conflicts:
configure.ac - Adjust due to new log_clock otions
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/gpg.texi | 3 | ||||
| -rw-r--r-- | doc/gpgv.texi | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index b14cb371b..bd45b0422 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2306,7 +2306,8 @@ opposite meaning. The options are: Show a listing of the key as imported right before it is stored. This can be combined with the option @option{--dry-run} to only look at keys; the option @option{show-only} is a shortcut for this - combination. + combination. Note that suffixes like '#' for "sec" and "sbb" lines + may or may not be printed. @item import-export Run the entire import code but instead of storing the key to the diff --git a/doc/gpgv.texi b/doc/gpgv.texi index 5336c98db..a05286171 100644 --- a/doc/gpgv.texi +++ b/doc/gpgv.texi @@ -187,6 +187,6 @@ The default keyring with the allowed keys. @end table @mansect see also -@command{gpg2}(1) +@command{gpg}(1) @include see-also-note.texi |