Merge commit 'dkg/master'

6 files changed, 21 insertions, 4 deletions

diff --git a/website/bugs/done.mdwn b/website/bugs/done.mdwn
index 97fc82a..282e804 100644
--- a/website/bugs/done.mdwn
+++ b/website/bugs/done.mdwn
@@ -1,5 +1,5 @@
 [[!template id="nav"]]
 
-recently fixed [[bugs]]
+Recently fixed [[bugs]].
 
 [[inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]]
diff --git a/website/bugs/handle-passphrase-locked-secret-keys.mdwn b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
index 2df14eb..bc2a64c 100644
--- a/website/bugs/handle-passphrase-locked-secret-keys.mdwn
+++ b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
@@ -94,3 +94,12 @@ Concerns:
 ---------
 
 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.
diff --git a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
index e2c2682..a144efb 100644
--- a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
+++ b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
@@ -49,3 +49,11 @@ subcommand, which works cleanly in the presence of a
 functionally-patched GnuTLS.
 
 --dkg
+
+---
+
+I'm marking this bug as [[bugs/done]] - I no longer think we should install
+seckey2sshagent in bin now that we have a clean way of accomplishing that task.
+Nice work dkg!
+
+--sjj
diff --git a/website/doc.mdwn b/website/doc.mdwn
index c083669..6a978ce 100644
--- a/website/doc.mdwn
+++ b/website/doc.mdwn
@@ -41,7 +41,7 @@ While ultimately contributing a patch to
 not a bad thing, we hope to be able to better establish the use of a
 PKI without resorting to source modification.
 
-### `openssh-gpg` ###
+### openssh-gpg ###
 
 [openssh-gpg](http://www.red-bean.com/~nemo/openssh-gpg/) is a patch
 against OpenSSH to support OpenPGP certificates.  According to its
diff --git a/website/download.mdwn b/website/download.mdwn
index be26005..b848e2a 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -37,4 +37,4 @@ include the `gnutls` component.  So they'd look like this instead:
 	deb http://monkeysphere.info/debian experimental monkeysphere gnutls
 	deb-src http://monkeysphere.info/debian experimental monkeysphere gnutls
 
-You can [read more about this offering](/news/modified-gnutls-2.4.x-available.mdwn).
+You can [read more about this offering](/news/modified-gnutls-2.4.x-available).
diff --git a/website/local.css b/website/local.css
index 34f376e..61adaba 100644
--- a/website/local.css
+++ b/website/local.css
@@ -1,5 +1,5 @@
 body {
-	font-family:Verdana,Geneva,Arial,Helvetica,sans-serif;
+	font-family: "Liberation Sans",sans-serif;
 	font-size:1em;
 	margin-left: 5%;
 	margin-right:20%;