Merge commit 'dkg/master'

4 files changed, 28 insertions, 5 deletions

diff --git a/website/bugs/done.mdwn b/website/bugs/done.mdwn
index 282e804..dc331f9 100644
--- a/website/bugs/done.mdwn
+++ b/website/bugs/done.mdwn
@@ -1,4 +1,4 @@
-[[!template id="nav"]]
+[[meta title="Completed Bugs"]]
 
 Recently fixed [[bugs]].
 
diff --git a/website/bugs/handle-passphrase-locked-secret-keys.mdwn b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
index bc2a64c..b58650e 100644
--- a/website/bugs/handle-passphrase-locked-secret-keys.mdwn
+++ b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere needs to be able to cleanly export passphrase-locked secret keys from the GPG keyring"]]
+[[meta title="MonkeySphere can't deal with passphrase-locked primary keys"]]
 
 At the moment, the only tool we have to export passphrase-locked
 secret keys from the GPG keyring is `gpg` itself (and `gpg2`, which
@@ -100,6 +100,18 @@ Other alternatives?
 Can this bug be closed? dkg [reported in a comment for a related
 bug](/bugs/install-seckey2sshagent-in-usr-bin/):
 
-		Version 0.11-1 now has the monkeysphere subkey-to-ssh-agent
-		subcommand, which works cleanly in the presence of a
-		functionally-patched GnuTLS.
+	Version 0.11-1 now has the monkeysphere subkey-to-ssh-agent
+	subcommand, which works cleanly in the presence of a
+	functionally-patched GnuTLS.
+
+--------
+
+Even with the patched GnuTLS, monkeysphere currently can't currently
+deal with passphrase-locked primary keys.  I've changed the title of
+this bug, but i'd like to keep it open until we are able to deal with
+that.  The other comments here seem still quite relevant to that
+need.
+
+I've changed the title of this bug to reflect the narrowed scope.
+
+       --dkg
diff --git a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
index 4070d0a..b814d35 100644
--- a/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
+++ b/website/bugs/monkeysphere-ssh-proxycommand-quiet-option.mdwn
@@ -245,3 +245,7 @@ I'll leave the bug open for a bit until it get more tested and 0.12
 gets pushed out.
 
 -- BJ
+
+---
+
+I think this is [[/bugs/done]] as of version 0.12-1.
diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn
index c926dc6..5b05759 100644
--- a/website/bugs/setup-test-server-for-public.mdwn
+++ b/website/bugs/setup-test-server-for-public.mdwn
@@ -75,3 +75,10 @@ and I'm not really willing to maintain it myself, but if someone else
 wants to handle that, that would be fine with me.
 
 -- jgr
+
+---
+
+i'm not really willing to maintain anything extra either, so i'm
+closing this ticket as [[bugs/done]].
+
+--dkg