Instructions for converting keyring for 2.1

[Daniel Kahn Gillmor]

On Sun 2015-03-29 13:36:02 -0400, Peter Lebbing wrote:
> I just followed the instructions on [1] for converting your pubring.gpg to the
> new keybox format. I discovered I needed --import-options import-local-sigs on
> the import command to also import my local signatures, which obviously is very
> desirable when converting your public keyring... it's a bit lossy otherwise :S.
>
> Here's a diff for the gnupg-doc git:
>
> 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

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?

        --dkg