Merge commit 'dkg/master'

diff --git a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
index 7e735d287cff929da3eacf066fd3538ee1788541..51cf57e14e802b0b8d50b8f5bd60aaba67fe7139 100644 (file)
--- a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
+++ b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
@@ -134,4 +134,4 @@ it.
 
 Alternately, we could use `--passwd-fd` and `ssh-agent`, along the
 lines i proposed [for handling passphrase-locked secret
-keys](handle-passphrase-locked-secret-keys).
+keys](/bugs/handle-passphrase-locked-secret-keys).

diff --git a/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn b/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
index 0f6654c6302fc85898ba6cfb1855146061c44292..2dac5798a4df9292e16463714139609694738ac0 100644 (file)
--- a/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
+++ b/website/bugs/monkeysphere-ignores-HashKnownHosts-directive.mdwn
@@ -22,3 +22,12 @@ any ssh or sshd config file.  This will probably need to be delt with
 down the line, but it's not a particular easy task at the moment.
 
 -- Big Jimmy.
+
+---
+
+I've [posted to the `openssh-unix-dev` list to see if there is a
+possibility of openssh making our lives easier
+here](http://marc.info/?l=openssh-unix-dev&m=121804767122918&w=2), but
+i haven't had much of a response yet.
+
+--dkg