Instructions for converting keyring for 2.1

[Peter Lebbing]

On 31/03/15 23:33, Daniel Kahn Gillmor wrote:
> This doesn't appear to have been updated upstream yet, but i agree with
> Peter Lebbing's suggestion here.  Would presenting the patch in some
> other way (e.g in git format-patch style?) be helpful?

After reading some docs and fiddling with stuff; is this okay?

-- >8 --
Subject: [PATCH] 2.1 FAQ: keyring conversion: add import-local-sigs

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

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
 
-- 
2.1.4

-- 
I use the GNU Privacy Guard (GnuPG) in combination with Enigmail.
You can send me encrypted mail if you want some privacy.
My key is available at <http://digitalbrains.com/2012/openpgp-key-peter>