[git] gnupg-doc - branch, master, updated. 77d707ec8587c9684e9b1897607020fb02d9ea2b

[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 GnuPG website and other docs".

The branch, master has been updated
       via  77d707ec8587c9684e9b1897607020fb02d9ea2b (commit)
      from  813ad5c401e1d2effca419f9687545920bc1ff5c (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 77d707ec8587c9684e9b1897607020fb02d9ea2b
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Apr 3 13:31:58 2015 +0200

    faq: Fixed migration instructions in Whats-new-in-2.1
    
    Reported-by: Peter Lebbing

diff --git a/web/faq/whats-new-in-2.1.org b/web/faq/whats-new-in-2.1.org
index bc312da..1056dd0 100644
--- a/web/faq/whats-new-in-2.1.org
+++ b/web/faq/whats-new-in-2.1.org
@@ -561,7 +561,7 @@ then run import, and finally restore the ownertrust values:
 $ cd ~/.gnupg
 $ gpg --export-ownertrust >otrust.lst
 $ mv pubring.gpg publickeys
-$ gpg2 --import publickeys
+$ gpg2 --import-options import-local-sigs --import publickeys
 $ gpg2 --import-ownertrust otrust.lst
 #+end_example
 

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

Summary of changes:
 web/faq/whats-new-in-2.1.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org