Merge remote branch 'origin/master'

[monkeysphere.git] / website / bugs / monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn

diff --git a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
index 85f79f1b1292c0eecf3ca7912ace2c7437409936..421587a2f6adbf828ceee4bfd56c2f6b57682e71 100644 (file)
--- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
+++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
@@ -1,17 +1,17 @@
-[[meta title="Monkeysphere should consult keyserver setting in gpg.conf"]]
+[[!meta title="Monkeysphere should consult keyserver setting in gpg.conf"]]
 
 Currently, monkeysphere-ssh-proxycommand checks the following places to
 determine which keyserver to use (in order of priority):
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * default value of subkeys.pgp.net
 
 It would be useful if monkeysphere also consulted ~/.gnupg/gpg.conf, using the
 following order instead:
 
  * environment variable (MONKEYSPHERE_KEYSERVER)
- * KEYSERVER variable in ~/.config/monkeysphere/monkeysphere.conf
+ * KEYSERVER variable in ~/.monkeysphere/monkeysphere.conf
  * keyserver variable in ~/.gnupg/gpg.conf
  * default value of subkeys.pgp.net