Merge remote branch 'mjgoins/master'

Conflicts:
	doc/george/changelog

1 files changed, 0 insertions, 25 deletions

diff --git a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn b/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
deleted file mode 100644
index 0cab051..0000000
--- a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
+++ /dev/null
@@ -1,25 +0,0 @@
-[[!meta title="`monkeysphere gen-key` should guess at KeyID if none provided"]]
-
-Currently, if you have a single private key in your GnuPG keyring, and
-you call:
-
-	monkeysphere gen-key
-
-(with no additional arguments), it will report an error.
-
-It would be more user-friendly if we could guess which key to use.  I
-suggest:
-
-* If the user only has no GPG secret keys at all, it should fail, and
-  suggest that the user create a key first, then re-run `monkeysphere
-  gen-key`.  (`monkeysphere` could actually invoke `gpg --gen-key` for
-  the user directly, if the user wants that)
-
-* If the user only has one GPG secret key, it should use that key.
-
-* If the user has more than one GPG secret key, `monkeysphere` should
-  fail, and report the different key IDs that they user might want to
-  select (reporting which keys already have authorization subkeys or
-  the authorization capability on the primary key would be useful too)
-
-[[bugs/done]] completed 2008-08-08 09:40:33-0400 (to be released in 0.8-1)