Merge remote branch 'mjgoins/master'

73 files changed, 82 insertions, 78 deletions

diff --git a/doc/george/changelog b/doc/george/changelog
index 2767c5d..d15814c 100644
--- a/doc/george/changelog
+++ b/doc/george/changelog
@@ -6,6 +6,10 @@
 *  Please add new entries in reverse chronological order whenever you make   *
 *  changes to this system (first command at top, last at bottom)             *
 ******************************************************************************
+2010-03-08 - mjgoins
+	* Adding self to webmaster's authorized_user_ids
+	* updating ikiwiki to use the version from lenny backports 
+	* changing the ikiwki markup to be appropriate for version 3.2xxx
 
 2010-02-23 - dkg
 	* add lenny-backports repo.
diff --git a/website/advanced-user.mdwn b/website/advanced-user.mdwn
index 7969018..723b161 100644
--- a/website/advanced-user.mdwn
+++ b/website/advanced-user.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Advanced usage of the Monkeysphere"]]
+[[!meta title="Advanced usage of the Monkeysphere"]]
 
 Advanced usage of the monkeysphere
 ==================================
diff --git a/website/archive-key.mdwn b/website/archive-key.mdwn
index eec40d5..6552fde 100644
--- a/website/archive-key.mdwn
+++ b/website/archive-key.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere archive signing key"]]
+[[!meta title="Monkeysphere archive signing key"]]
 [[toc ]]
 
 ## Verifying the key ##
diff --git a/website/bugs.mdwn b/website/bugs.mdwn
index bd437f9..91ff025 100644
--- a/website/bugs.mdwn
+++ b/website/bugs.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Open Bugs"]]
+[[!meta title="Open Bugs"]]
 
 # Bugs #
 
@@ -15,5 +15,5 @@ You can also browse our [completed bugs](done).
 Please feel free to also ask any questions on the [the monkeysphere
 mailing list](/community).
 
-[[inline pages="./bugs/* and !./bugs/done and !link(done) 
+[[!inline pages="./bugs/* and !./bugs/done and !link(done) 
 and !*/Discussion" actions=yes postform=yes show=0]]
diff --git a/website/bugs/add-man-pages-to-website.mdwn b/website/bugs/add-man-pages-to-website.mdwn
index 399438a..0aaee21 100644
--- a/website/bugs/add-man-pages-to-website.mdwn
+++ b/website/bugs/add-man-pages-to-website.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Add man pages to web site"]]
+[[!meta title="Add man pages to web site"]]
 
 We should publish the various monkeysphere man pages in browsable form
 somewhere under http://web.monkeysphere.info/.  Ideally, this would be
diff --git a/website/bugs/allow-publishing-to-public-keyservers.mdwn b/website/bugs/allow-publishing-to-public-keyservers.mdwn
index 1548775..5d4ce4c 100644
--- a/website/bugs/allow-publishing-to-public-keyservers.mdwn
+++ b/website/bugs/allow-publishing-to-public-keyservers.mdwn
@@ -1,4 +1,4 @@
-[[meta title="monkeysphere-server publish-key does not work"]]
+[[!meta title="monkeysphere-server publish-key does not work"]]
 
 Currently, if you try to run `monkeysphere-server publish-key`, you
 can get the following output:
diff --git a/website/bugs/authorized_keys-options.mdwn b/website/bugs/authorized_keys-options.mdwn
index 4e7a838..69e62fa 100644
--- a/website/bugs/authorized_keys-options.mdwn
+++ b/website/bugs/authorized_keys-options.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere support for options in authorized_keys"]]
+[[!meta title="Monkeysphere support for options in authorized_keys"]]
 
 OpenSSH [allows users to control the capabilities granted to remote
 key-based
diff --git a/website/bugs/authorized_keys_not_cleared.mdwn b/website/bugs/authorized_keys_not_cleared.mdwn
index 4ba347b..0c4dbb6 100644
--- a/website/bugs/authorized_keys_not_cleared.mdwn
+++ b/website/bugs/authorized_keys_not_cleared.mdwn
@@ -1,4 +1,4 @@
-[[meta title="users with missing or empty authorized keys and User IDs should have MS-generated keys cleared" ]]
+[[!meta title="users with missing or empty authorized keys and User IDs should have MS-generated keys cleared" ]]
 
 I had a user who had a bunch of entries in
 `~/.monkeysphere/authorized_user_ids`, and a bunch of raw keys in
diff --git a/website/bugs/cssh-connection-timeout.mdwn b/website/bugs/cssh-connection-timeout.mdwn
index 046ca12..343d5af 100644
--- a/website/bugs/cssh-connection-timeout.mdwn
+++ b/website/bugs/cssh-connection-timeout.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere interferes with clusterssh"]]
+[[!meta title="Monkeysphere interferes with clusterssh"]]
 
 clusterssh is a package that allows you to control multiple ssh xterm
 sessions at the same time.
diff --git a/website/bugs/done.mdwn b/website/bugs/done.mdwn
index dc331f9..e29587c 100644
--- a/website/bugs/done.mdwn
+++ b/website/bugs/done.mdwn
@@ -1,5 +1,5 @@
-[[meta title="Completed Bugs"]]
+[[!meta title="Completed Bugs"]]
 
 Recently fixed [[bugs]].
 
-[[inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]]
+[[!inline pages="./* and link(./done) and !*/Discussion" sort=mtime show=10]]
diff --git a/website/bugs/genericize-filesystem-locations-for-testsuite.mdwn b/website/bugs/genericize-filesystem-locations-for-testsuite.mdwn
index d52908e..6cc3773 100644
--- a/website/bugs/genericize-filesystem-locations-for-testsuite.mdwn
+++ b/website/bugs/genericize-filesystem-locations-for-testsuite.mdwn
@@ -1,4 +1,4 @@
-[[meta title="genericize all filesystem locations to enable test suite:" ]]
+[[!meta title="genericize all filesystem locations to enable test suite:" ]]
 
 I'm in the process of writing a testsuite for the monkeysphere so that
 we can verify that it actually performs all the basic expected duties
diff --git a/website/bugs/handle-passphrase-locked-secret-keys.mdwn b/website/bugs/handle-passphrase-locked-secret-keys.mdwn
index b58650e..5143db6 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 can't deal with passphrase-locked primary keys"]]
+[[!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
diff --git a/website/bugs/headless-servers-take-too-long-to-generate-host-key.mdwn b/website/bugs/headless-servers-take-too-long-to-generate-host-key.mdwn
index 8f1da5a..c7912de 100644
--- a/website/bugs/headless-servers-take-too-long-to-generate-host-key.mdwn
+++ b/website/bugs/headless-servers-take-too-long-to-generate-host-key.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Running `monkeysphere gen-key` on a headless server takes way too long"]]
+[[!meta title="Running `monkeysphere gen-key` on a headless server takes way too long"]]
 
 When i try to generate a key on a headless machine (no kbd, no mouse,
 no Human Input Device (HID) at all), `monkeysphere gen-key` hangs for
diff --git a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
index a144efb..04322a4 100644
--- a/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
+++ b/website/bugs/install-seckey2sshagent-in-usr-bin.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Install seckey2sshagent in /usr/bin/"]]
+[[!meta title="Install seckey2sshagent in /usr/bin/"]]
 
 I know it's a hack - but installing seckey2sshagent in /usr/bin/ would make it
 much easier for people to use. 
diff --git a/website/bugs/list-id-certifiers-should-run-non-priv.mdwn b/website/bugs/list-id-certifiers-should-run-non-priv.mdwn
index 2a3d533..32116c0 100644
--- a/website/bugs/list-id-certifiers-should-run-non-priv.mdwn
+++ b/website/bugs/list-id-certifiers-should-run-non-priv.mdwn
@@ -1,4 +1,4 @@
-[[meta title="list-identity-certfiers should run as the non-privileged user"]]
+[[!meta title="list-identity-certfiers should run as the non-privileged user"]]
 
 Right now, `monkeysphere-server list-identity-certifiers` runs as the
 superuser, and just lists the keys in the host's keyring.  This might
diff --git a/website/bugs/make-tarball-is-not-idempotent.mdwn b/website/bugs/make-tarball-is-not-idempotent.mdwn
index 03779c5..8e207e4 100644
--- a/website/bugs/make-tarball-is-not-idempotent.mdwn
+++ b/website/bugs/make-tarball-is-not-idempotent.mdwn
@@ -1,4 +1,4 @@
-[[meta title="make tarball is not idempotent" ]]
+[[!meta title="make tarball is not idempotent" ]]
 
 The current monkeysphere Makefile has a "tarball" target, which
 produces the "upstream tarball".  Unfortunately, it is not idempotent.
diff --git a/website/bugs/missing-known_hosts-causes-error.mdwn b/website/bugs/missing-known_hosts-causes-error.mdwn
index 4a5cf99..5be0a44 100644
--- a/website/bugs/missing-known_hosts-causes-error.mdwn
+++ b/website/bugs/missing-known_hosts-causes-error.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Missing `~/.ssh/known_hosts` file causes errors from monkeysphere-ssh-proxycommand"]]
+[[!meta title="Missing `~/.ssh/known_hosts` file causes errors from monkeysphere-ssh-proxycommand"]]
 
 As a user, if you don't have a `~/.ssh/known_hosts` file,
 `monkeysphere-ssh-proxycommand` produces some bogus output, like:
diff --git a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn b/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
index d9d0fbe..0cab051 100644
--- a/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
+++ b/website/bugs/monkeysphere-gen-key-should-guess-KeyID.mdwn
@@ -1,4 +1,4 @@
-[[meta title="`monkeysphere gen-key` should guess at KeyID if none provided"]]
+[[!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:
diff --git a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
index e97b49c..1e33439 100644
--- a/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
+++ b/website/bugs/monkeysphere-gen-subkey-fails-without-agent.mdwn
@@ -1,4 +1,4 @@
-[[meta title="monkeysphere --gen-subkey seems to fail if no gpg-agent is running"]]
+[[!meta title="monkeysphere --gen-subkey seems to fail if no gpg-agent is running"]]
 
 Consider the following transcript of a user who starts with no OpenPGP
 key in the first place:
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 0630cc4..421587a 100644
--- a/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
+++ b/website/bugs/monkeysphere-should-respect-keyserver-settings-in-gpg.mdwn
@@ -1,4 +1,4 @@
-[[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):
diff --git a/website/bugs/multiple-hostnames.mdwn b/website/bugs/multiple-hostnames.mdwn
index f4920fd..9189ba8 100644
--- a/website/bugs/multiple-hostnames.mdwn
+++ b/website/bugs/multiple-hostnames.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Support multiple host names for monkeysphere-enabled servers"]]
+[[!meta title="Support multiple host names for monkeysphere-enabled servers"]]
 
 Some monkeysphere-enabled hosts answer to multiple host names, but the
 current `monkeysphere-server` only generates a single User ID
diff --git a/website/bugs/postinst-clobbers-gpg.conf-settings.mdwn b/website/bugs/postinst-clobbers-gpg.conf-settings.mdwn
index 1463ebd..f7f2137 100644
--- a/website/bugs/postinst-clobbers-gpg.conf-settings.mdwn
+++ b/website/bugs/postinst-clobbers-gpg.conf-settings.mdwn
@@ -1,4 +1,4 @@
-[[meta title="debian packaging postinst script clobbers gpg.conf settings in /var/lib/monkeysphere" ]]
+[[!meta title="debian packaging postinst script clobbers gpg.conf settings in /var/lib/monkeysphere" ]]
 
 Do we want to allow the system administrator to make adjustments to
 the `gpg.conf` config files found in `/var/lib/monkeysphere`?  At the
diff --git a/website/bugs/problems-with-root-owned-gpg-keyrings.mdwn b/website/bugs/problems-with-root-owned-gpg-keyrings.mdwn
index 67bc9d2..02e23e5 100644
--- a/website/bugs/problems-with-root-owned-gpg-keyrings.mdwn
+++ b/website/bugs/problems-with-root-owned-gpg-keyrings.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Problems with root-owned gpg keyrings"]]
+[[!meta title="Problems with root-owned gpg keyrings"]]
 
 `/var/lib/monkeysphere/gnupg-host/` is root-owned, and the public
 keyring in that directory is controlled by the superuser.
diff --git a/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn b/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
index ad66dd5..c29a6f1 100644
--- a/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
+++ b/website/bugs/reorganize-monkeysphere-server-shortcuts.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Reorganize monkeysphere-server shortcuts"]]
+[[!meta title="Reorganize monkeysphere-server shortcuts"]]
 
 Currently, `monkeysphere-server` supports three subcommands to adjust
 the "identity certifiers":
diff --git a/website/bugs/revoke-hostname-revoking-wrong-userid.mdwn b/website/bugs/revoke-hostname-revoking-wrong-userid.mdwn
index f785a9d..33224db 100644
--- a/website/bugs/revoke-hostname-revoking-wrong-userid.mdwn
+++ b/website/bugs/revoke-hostname-revoking-wrong-userid.mdwn
@@ -1,4 +1,4 @@
-[[meta title="revoke-hostname function revokes wrong hostname user ID"]]
+[[!meta title="revoke-hostname function revokes wrong hostname user ID"]]
 
 It appears that the monkeysphere-server revoke-hostname function will
 occasionaly revoke the wrong hostname.  I say occasionally, but it
diff --git a/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn b/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
index a074d9e..99c6149 100644
--- a/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
+++ b/website/bugs/setup-subcommand-for-monkeysphere-server.mdwn
@@ -1,4 +1,4 @@
-[[meta title="proposed new monkeysphere-server subcommand: setup" ]]
+[[!meta title="proposed new monkeysphere-server subcommand: setup" ]]
 
 What if everything that's done in the package post-installation
 scripts (aside from maybe the creation of the monkeysphere user
diff --git a/website/bugs/setup-test-server-for-public.mdwn b/website/bugs/setup-test-server-for-public.mdwn
index 65fa893..6df1fbf 100644
--- a/website/bugs/setup-test-server-for-public.mdwn
+++ b/website/bugs/setup-test-server-for-public.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Setup test public server/gpg key"]]
+[[!meta title="Setup test public server/gpg key"]]
 
 It would be really useful for people trying out the monkeysphere to be able to
 test it with a participating server as soon as they've finished setting things
diff --git a/website/community.mdwn b/website/community.mdwn
index 492703b..13e9900 100644
--- a/website/community.mdwn
+++ b/website/community.mdwn
@@ -1,4 +1,4 @@
-[[meta title="The Monkeysphere Community"]]
+[[!meta title="The Monkeysphere Community"]]
 
 # The Monkeysphere Community #
 
diff --git a/website/doc.mdwn b/website/doc.mdwn
index 47b173a..3960893 100644
--- a/website/doc.mdwn
+++ b/website/doc.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Documentation"]]
+[[!meta title="Documentation"]]
 
 # Documentation #
 
diff --git a/website/download.mdwn b/website/download.mdwn
index d41c3a7..119c42a 100644
--- a/website/download.mdwn
+++ b/website/download.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Download"]]
+[[!meta title="Download"]]
 
 # Downloading and Installing #
 
diff --git a/website/expansion.mdwn b/website/expansion.mdwn
index 13f368a..662be86 100644
--- a/website/expansion.mdwn
+++ b/website/expansion.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Expanding the Monkeysphere"]]
+[[!meta title="Expanding the Monkeysphere"]]
 
 # Expanding the Monkeysphere #
 
diff --git a/website/features.mdwn b/website/features.mdwn
index 1aabda1..f676d1e 100644
--- a/website/features.mdwn
+++ b/website/features.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Features"]]
+[[!meta title="Features"]]
 
 # Features #
 
diff --git a/website/index.mdwn b/website/index.mdwn
index ba121a2..42d75f7 100644
--- a/website/index.mdwn
+++ b/website/index.mdwn
@@ -1,6 +1,6 @@
-[[meta title="The Monkeysphere Project"]]
-[[meta license="Unless otherwise noted, all content on this web site is licensed under the GPL version 3 or later"]]
-[[meta copyright="All content on this web site is copyright by the author of that content. [Look in the revision control system](community) for details about who authored a particular piece of content."]]
+[[!meta title="The Monkeysphere Project"]]
+[[!meta license="Unless otherwise noted, all content on this web site is licensed under the GPL version 3 or later"]]
+[[!meta copyright="All content on this web site is copyright by the author of that content. [Look in the revision control system](community) for details about who authored a particular piece of content."]]
 
 # The Monkeysphere Project #
 
diff --git a/website/mirrors.mdwn b/website/mirrors.mdwn
index 5fcc347..74d30c3 100644
--- a/website/mirrors.mdwn
+++ b/website/mirrors.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Mirroring the Monkeysphere web site"]]
+[[!meta title="Mirroring the Monkeysphere web site"]]
 
 # Mirroring the Monkeysphere web site #
 
diff --git a/website/news.mdwn b/website/news.mdwn
index 1af56a4..87fc861 100644
--- a/website/news.mdwn
+++ b/website/news.mdwn
@@ -1,7 +1,7 @@
-[[meta title="News"]]
+[[!meta title="News"]]
 
 # News #
 
 Here are the latest announcements about the Monkeysphere.
 
-[[inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]
+[[!inline pages="./news/* and !*/Discussion" rootpage="news" show="30"]]
diff --git a/website/news/0.24-accepted-in-Debian-testing.mdwn b/website/news/0.24-accepted-in-Debian-testing.mdwn
index 4222493..dd3fcdd 100644
--- a/website/news/0.24-accepted-in-Debian-testing.mdwn
+++ b/website/news/0.24-accepted-in-Debian-testing.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.24 accepted in Debian testing"]]
+[[!meta title="Monkeysphere 0.24 accepted in Debian testing"]]
 
 [Monkeysphere 0.24 is now available in the Debian testing distribution
 ("squeeze")](http://packages.debian.org/testing/monkeysphere).
diff --git a/website/news/0.24-available-in-Backports-org.mdwn b/website/news/0.24-available-in-Backports-org.mdwn
index e56af89..989bb12 100644
--- a/website/news/0.24-available-in-Backports-org.mdwn
+++ b/website/news/0.24-available-in-Backports-org.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.24 accepted as a Debian Backport"]]
+[[!meta title="Monkeysphere 0.24 accepted as a Debian Backport"]]
 
 [Monkeysphere 0.24 is now available at [Backports.org](http://backports.org).
 If you are running Debian stable ("Lenny"), you can install this version
diff --git a/website/news/FreeBSD-0.24-port-accepted.mdwn b/website/news/FreeBSD-0.24-port-accepted.mdwn
index bdd5655..1681cc5 100644
--- a/website/news/FreeBSD-0.24-port-accepted.mdwn
+++ b/website/news/FreeBSD-0.24-port-accepted.mdwn
@@ -1,4 +1,4 @@
-[[meta title="FreeBSD 0.24 port accepted"]]
+[[!meta title="FreeBSD 0.24 port accepted"]]
 
 FreeBSD's ports tree now contains [a port of the
 Monkeysphere](http://www.freebsd.org/cgi/ports.cgi?query=monkeysphere),
diff --git a/website/news/FreeBSD-port-available.mdwn b/website/news/FreeBSD-port-available.mdwn
index fde2b47..08d28c5 100644
--- a/website/news/FreeBSD-port-available.mdwn
+++ b/website/news/FreeBSD-port-available.mdwn
@@ -1,4 +1,4 @@
-[[meta title="FreeBSD port available"]]
+[[!meta title="FreeBSD port available"]]
 
 Update: [FreeBSD's official ports tree now contains monkeysphere
 0.24](FreeBSD-0.24-port-accepted).
diff --git a/website/news/Monkeysphere-in-Debian.mdwn b/website/news/Monkeysphere-in-Debian.mdwn
index edad432..04843df 100644
--- a/website/news/Monkeysphere-in-Debian.mdwn
+++ b/website/news/Monkeysphere-in-Debian.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere now in Debian!"]]
+[[!meta title="Monkeysphere now in Debian!"]]
 
 [The Monkeysphere has made it into
 Debian!](http://packages.debian.org/sid/monkeysphere)
diff --git a/website/news/apt-repo-moved.mdwn b/website/news/apt-repo-moved.mdwn
index 501cc23..a56dccf 100644
--- a/website/news/apt-repo-moved.mdwn
+++ b/website/news/apt-repo-moved.mdwn
@@ -1,4 +1,4 @@
-[[meta title="APT repository moved"]]
+[[!meta title="APT repository moved"]]
 
 The monkeysphere APT repository has been moved from
 `http://monkeysphere.info/debian` to
diff --git a/website/news/git-repo-moved.mdwn b/website/news/git-repo-moved.mdwn
index c2755d1..e4fa2f5 100644
--- a/website/news/git-repo-moved.mdwn
+++ b/website/news/git-repo-moved.mdwn
@@ -1,4 +1,4 @@
-[[meta title="git repository moved"]]
+[[!meta title="git repository moved"]]
 
 The monkeysphere git repository has been moved from
 `git://monkeysphere.info/monkeysphere` to
diff --git a/website/news/gnutls-2.6-enables-monkeysphere.mdwn b/website/news/gnutls-2.6-enables-monkeysphere.mdwn
index 6de2f6a..756bc9e 100644
--- a/website/news/gnutls-2.6-enables-monkeysphere.mdwn
+++ b/website/news/gnutls-2.6-enables-monkeysphere.mdwn
@@ -1,4 +1,4 @@
-[[meta title="GnuTLS 2.6.x enables Monkeysphere to read authentication subkeys"]]
+[[!meta title="GnuTLS 2.6.x enables Monkeysphere to read authentication subkeys"]]
 
 -----
 
diff --git a/website/news/modified-gnutls-2.4.x-available.mdwn b/website/news/modified-gnutls-2.4.x-available.mdwn
index 36cfbfc..4d481d7 100644
--- a/website/news/modified-gnutls-2.4.x-available.mdwn
+++ b/website/news/modified-gnutls-2.4.x-available.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Modified GnuTLS 2.4.x available"]]
+[[!meta title="Modified GnuTLS 2.4.x available"]]
 
 -----
 
diff --git a/website/news/plans-for-the-bezoar.mdwn b/website/news/plans-for-the-bezoar.mdwn
index 0fb2c5b..ce061ee 100644
--- a/website/news/plans-for-the-bezoar.mdwn
+++ b/website/news/plans-for-the-bezoar.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Plans for The Golden Bezoar"]]
+[[!meta title="Plans for The Golden Bezoar"]]
 
 A workday with several Monkeysphere contributors on 2009-01-31
 resulted in a significant reorganization of the project in several
diff --git a/website/news/release-0.10-1.mdwn b/website/news/release-0.10-1.mdwn
index c159fa6..e70b0a8 100644
--- a/website/news/release-0.10-1.mdwn
+++ b/website/news/release-0.10-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.10-1 released!"]]
+[[!meta title="MonkeySphere 0.10-1 released!"]]
 
 # MonkeySphere 0.10-1 released! #
 
diff --git a/website/news/release-0.11-1.mdwn b/website/news/release-0.11-1.mdwn
index 5e04bc3..9fff82b 100644
--- a/website/news/release-0.11-1.mdwn
+++ b/website/news/release-0.11-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.11-1 released!"]]
+[[!meta title="MonkeySphere 0.11-1 released!"]]
 
 # MonkeySphere 0.11-1 released! #
 
diff --git a/website/news/release-0.12-1.mdwn b/website/news/release-0.12-1.mdwn
index ed1ecbb..33dd033 100644
--- a/website/news/release-0.12-1.mdwn
+++ b/website/news/release-0.12-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.12-1 released!"]]
+[[!meta title="MonkeySphere 0.12-1 released!"]]
 
 # MonkeySphere 0.12-1 released! #
 
diff --git a/website/news/release-0.13-1.mdwn b/website/news/release-0.13-1.mdwn
index 4ae5226..732eb0a 100644
--- a/website/news/release-0.13-1.mdwn
+++ b/website/news/release-0.13-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.13-1 released!"]]
+[[!meta title="MonkeySphere 0.13-1 released!"]]
 
 # MonkeySphere 0.13-1 released! #
 
diff --git a/website/news/release-0.14-1.mdwn b/website/news/release-0.14-1.mdwn
index 9d691e8..2b93c64 100644
--- a/website/news/release-0.14-1.mdwn
+++ b/website/news/release-0.14-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.14-1 released!"]]
+[[!meta title="MonkeySphere 0.14-1 released!"]]
 
 # MonkeySphere 0.14-1 released! #
 
diff --git a/website/news/release-0.15-1.mdwn b/website/news/release-0.15-1.mdwn
index 5a36ba1..8124f55 100644
--- a/website/news/release-0.15-1.mdwn
+++ b/website/news/release-0.15-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.15-1 released!"]]
+[[!meta title="MonkeySphere 0.15-1 released!"]]
 
 # MonkeySphere 0.15-1 released! #
 
diff --git a/website/news/release-0.16-1.mdwn b/website/news/release-0.16-1.mdwn
index 7354521..3e177df 100644
--- a/website/news/release-0.16-1.mdwn
+++ b/website/news/release-0.16-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.16-1 released!"]]
+[[!meta title="Monkeysphere 0.16-1 released!"]]
 
 # Monkeysphere 0.16-1 released! #
 
diff --git a/website/news/release-0.17-1.mdwn b/website/news/release-0.17-1.mdwn
index ec847fb..ae3e742 100644
--- a/website/news/release-0.17-1.mdwn
+++ b/website/news/release-0.17-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.17-1 released!"]]
+[[!meta title="Monkeysphere 0.17-1 released!"]]
 
 # Monkeysphere 0.17-1 released! #
 
diff --git a/website/news/release-0.18-1.mdwn b/website/news/release-0.18-1.mdwn
index b434360..bacb8a4 100644
--- a/website/news/release-0.18-1.mdwn
+++ b/website/news/release-0.18-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.18-1 released!"]]
+[[!meta title="Monkeysphere 0.18-1 released!"]]
 
 # Monkeysphere 0.18-1 released! #
 
diff --git a/website/news/release-0.19-1.mdwn b/website/news/release-0.19-1.mdwn
index f3336da..eb340c9 100644
--- a/website/news/release-0.19-1.mdwn
+++ b/website/news/release-0.19-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.19-1 released!"]]
+[[!meta title="Monkeysphere 0.19-1 released!"]]
 
 # Monkeysphere 0.19-1 released! #
 
diff --git a/website/news/release-0.20-1.mdwn b/website/news/release-0.20-1.mdwn
index 841369d..0279b7c 100644
--- a/website/news/release-0.20-1.mdwn
+++ b/website/news/release-0.20-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.20-1 released!"]]
+[[!meta title="Monkeysphere 0.20-1 released!"]]
 
 Monkeysphere 0.20-1 has been released.  
 
diff --git a/website/news/release-0.21-1.mdwn b/website/news/release-0.21-1.mdwn
index e807775..2577f2a 100644
--- a/website/news/release-0.21-1.mdwn
+++ b/website/news/release-0.21-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.21-1 released!"]]
+[[!meta title="Monkeysphere 0.21-1 released!"]]
 
 Monkeysphere 0.21-1 has been released.  
 
diff --git a/website/news/release-0.22-1.mdwn b/website/news/release-0.22-1.mdwn
index 078b605..70fe7bd 100644
--- a/website/news/release-0.22-1.mdwn
+++ b/website/news/release-0.22-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.22-1 released!"]]
+[[!meta title="Monkeysphere 0.22-1 released!"]]
 
 Monkeysphere 0.22-1 has been released.  
 
diff --git a/website/news/release-0.23-1.mdwn b/website/news/release-0.23-1.mdwn
index cb52c8f..83f8456 100644
--- a/website/news/release-0.23-1.mdwn
+++ b/website/news/release-0.23-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.23-1 released!"]]
+[[!meta title="Monkeysphere 0.23-1 released!"]]
 
 Monkeysphere 0.23-1 has been released.  
 
diff --git a/website/news/release-0.23.1-1.mdwn b/website/news/release-0.23.1-1.mdwn
index 79b3c05..493d366 100644
--- a/website/news/release-0.23.1-1.mdwn
+++ b/website/news/release-0.23.1-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.23.1-1 released!"]]
+[[!meta title="Monkeysphere 0.23.1-1 released!"]]
 
 Monkeysphere 0.23.1-1 has been released.  
 
diff --git a/website/news/release-0.24-1.mdwn b/website/news/release-0.24-1.mdwn
index 733df25..340a706 100644
--- a/website/news/release-0.24-1.mdwn
+++ b/website/news/release-0.24-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.24-1 released!"]]
+[[!meta title="Monkeysphere 0.24-1 released!"]]
 
 Monkeysphere 0.24-1 has been released.  
 
diff --git a/website/news/release-0.25-1.mdwn b/website/news/release-0.25-1.mdwn
index d041576..c88dba6 100644
--- a/website/news/release-0.25-1.mdwn
+++ b/website/news/release-0.25-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.25-1 released!"]]
+[[!meta title="Monkeysphere 0.25-1 released!"]]
 
 Monkeysphere 0.25-1 has been released.  
 
diff --git a/website/news/release-0.26-1.mdwn b/website/news/release-0.26-1.mdwn
index d21997f..ba196fc 100644
--- a/website/news/release-0.26-1.mdwn
+++ b/website/news/release-0.26-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.26-1 released!"]]
+[[!meta title="Monkeysphere 0.26-1 released!"]]
 
 Monkeysphere 0.26-1 has been released.  
 
diff --git a/website/news/release-0.27-1.mdwn b/website/news/release-0.27-1.mdwn
index 7c71ad1..f9c94ed 100644
--- a/website/news/release-0.27-1.mdwn
+++ b/website/news/release-0.27-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.27-1 released!"]]
+[[!meta title="Monkeysphere 0.27-1 released!"]]
 
 Monkeysphere 0.27-1 has been released.  
 
diff --git a/website/news/release-0.28.mdwn b/website/news/release-0.28.mdwn
index a77fc03..b18b6a6 100644
--- a/website/news/release-0.28.mdwn
+++ b/website/news/release-0.28.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Monkeysphere 0.28 released!"]]
+[[!meta title="Monkeysphere 0.28 released!"]]
 
 Monkeysphere 0.28 has been released.  
 
diff --git a/website/news/release-0.8-1.mdwn b/website/news/release-0.8-1.mdwn
index ed4ed7d..ff95b0e 100644
--- a/website/news/release-0.8-1.mdwn
+++ b/website/news/release-0.8-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.8-1 released!"]]
+[[!meta title="MonkeySphere 0.8-1 released!"]]
 
 MonkeySphere 0.8-1 has been released.  This release contains bugfixes,
 some UI re-arrangement, and new features for `monkeysphere-server`,
diff --git a/website/news/release-0.9-1.mdwn b/website/news/release-0.9-1.mdwn
index 8a51f42..b4ce4dc 100644
--- a/website/news/release-0.9-1.mdwn
+++ b/website/news/release-0.9-1.mdwn
@@ -1,4 +1,4 @@
-[[meta title="MonkeySphere 0.9-1 released!"]]
+[[!meta title="MonkeySphere 0.9-1 released!"]]
 
 # MonkeySphere 0.9-1 released! #
 
diff --git a/website/screenshots.mdwn b/website/screenshots.mdwn
index 921d467..96ca630 100644
--- a/website/screenshots.mdwn
+++ b/website/screenshots.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Screenshots"]]
+[[!meta title="Screenshots"]]
 
 # Screenshots #
 
diff --git a/website/similar.mdwn b/website/similar.mdwn
index 44ef04f..aef9c6f 100644
--- a/website/similar.mdwn
+++ b/website/similar.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Similar Projects"]]
+[[!meta title="Similar Projects"]]
 
 The monkeysphere isn't the only project intending to implement a PKI
 for OpenSSH.  We provide links to these other projects because they're
diff --git a/website/technical-details.mdwn b/website/technical-details.mdwn
index 902e356..08198b1 100644
--- a/website/technical-details.mdwn
+++ b/website/technical-details.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Technical Details"]]
+[[!meta title="Technical Details"]]
 
 # Technical Details #
 
diff --git a/website/trust-models.mdwn b/website/trust-models.mdwn
index 789e3a3..37928eb 100644
--- a/website/trust-models.mdwn
+++ b/website/trust-models.mdwn
@@ -1,4 +1,4 @@
-[[meta title="OpenPGP Trust Models"]]
+[[!meta title="OpenPGP Trust Models"]]
 
 # OpenPGP Trust Models #
 
@@ -133,7 +133,7 @@ formally public by publishing the trust signature to any keyserver.
 
 If you trust my judgement in this area ([the
 spec](http://tools.ietf.org/html/rfc4880#section-5.2.3.13) calls my
-role in this scenario a "meta introducer"), then you should be able to
+role in this scenario a "!meta introducer"), then you should be able to
 automatically accept certifications made by my sister by creating a
 level 2 trust signature on my key.  You can choose whether to publish
 this trust signature or not, but as long as your `gpg` instance knows
diff --git a/website/vision.mdwn b/website/vision.mdwn
index 35261be..2580c7d 100644
--- a/website/vision.mdwn
+++ b/website/vision.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Our vision for the future of the monkeysphere"]]
+[[!meta title="Our vision for the future of the monkeysphere"]]
 
 ## External Validation Agent ##
 
diff --git a/website/why.mdwn b/website/why.mdwn
index 5c060a5..d1c15c2 100644
--- a/website/why.mdwn
+++ b/website/why.mdwn
@@ -1,4 +1,4 @@
-[[meta title="Why should you be interested in the Monkeysphere?"]]
+[[!meta title="Why should you be interested in the Monkeysphere?"]]
 
 # Why should you be interested in the Monkeysphere? #