[Pkg-gnupg-commit] [gnupg2] 133/160: doc: Update import-export description.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Fri Jul 15 09:36:43 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch upstream
in repository gnupg2.
commit 6cb373f37b21505562665408c15210c5d42bed9d
Author: Werner Koch <wk at gnupg.org>
Date: Tue Jul 12 16:11:20 2016 +0200
doc: Update import-export description.
--
---
doc/gpg.texi | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/gpg.texi b/doc/gpg.texi
index ae860d7..db11061 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2211,8 +2211,10 @@ opposite meaning. The options are:
@item import-export
Run the entire import code but instead of storing the key to the
- local keyring write it to the output. This option can be used to
- remove all invalid parts from a key without the need to store it.
+ local keyring write it to the output. The export options
+ @option{export-pka} and @option{export-dane} affect the output. This
+ option can be used to remove all invalid parts from a key without the
+ need to store it.
@item merge-only
During import, allow key updates to existing keys, but do not allow
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list