diff --git a/robots.txt b/robots.txt
index 3fd531a..8d1a913 100644
--- a/robots.txt
+++ b/robots.txt
@@ -12,3 +12,4 @@ Disallow: /2006/fragments/demo/
 Disallow: /2008/ikiwiki/demo
 Disallow: /templates/
 Disallow: /ikiwiki/
+Disallow: /ikiwiki.cgi

diff --git a/src/gfcombinefs.mdwn b/src/gfcombinefs.mdwn
index 302cbe3..657dc59 100644
--- a/src/gfcombinefs.mdwn
+++ b/src/gfcombinefs.mdwn
@@ -1,6 +1,18 @@
 [[!meta title="gfcombinefs - a filesystem for n-of-m secret sharing"]]
 [[!tag software]]
 
+gfcombinefs combines several "shares" of a secret file previously split using
+Shamir secret sharing, to produce the original secret, and presents it as
+a file in a FUSE filesystem.
+
+So far, there have been no releases.
+[Current source code](http://git.pseudorandom.co.uk/gfcombinefs.git) is
+available.
+
+The contents of the README follow.
+
+--------------------------
+
     ######################### WARNING ################################
     # So far, gfcombinefs is experimental and mostly untested.       #
     # No real release has been made yet. I suggest not trusting it.  #

diff --git a/2003/opensource.mdwn b/2003/opensource.mdwn
index 0e16da2..81b4482 100644
--- a/2003/opensource.mdwn
+++ b/2003/opensource.mdwn
@@ -1,21 +1,25 @@
 [[!meta title="Software"]]
-[[!meta copyright="Copyright © 2008 Simon McVittie"]]
+[[!meta copyright="Copyright © 2003-2009 Simon McVittie"]]
 
 ## Work
 
 I currently work for [Collabora] on various open-source projects. The main
-one is [Telepathy], an instant messaging and voice/video over IP framework
-based on D-Bus, used on the Nokia 770/N800/N810 and on the
-[One Laptop Per Child] laptops, as well as in mainstream Linux desktop apps.
-I've worked on most parts of the Telepathy stack, mainly the reference
-connection manager (Gabble, a connection manager using XMPP/Jabber which
-interoperates with Google Talk), the specification, and the GLib, Python
-and Qt 4 bindings.
+one is [Telepathy], a presence, messaging and voice/video over IP framework
+based on D-Bus; it's used on Nokia's [Maemo] devices (notably the [N900],
+which even uses it for phone calls), on the GNOME desktop (via Empathy),
+on [One Laptop Per Child], and elsewhere.
+
+I mainly work on the API specification, Mission Control (the reference
+implementation of an account manager and channel dispatcher), and
+the GObject binding telepathy-glib; I've also contributed to the Qt4 and
+Python bindings and to most of the connection managers.
 
 I'm also the maintainer of [dbus-python], and part of the [pkg-telepathy] team
 that maintains Telepathy in Debian.
 
 [Collabora]: http://www.collabora.co.uk/
+[Maemo]: http://maemo.org/
+[N900]: http://maemo.nokia.com/n900/
 [One Laptop per Child]: http://www.laptop.org/
 [Telepathy]: http://telepathy.freedesktop.org/
 [dbus-python]: http://www.freedesktop.org/Software/DBusBindings
@@ -23,22 +27,22 @@ that maintains Telepathy in Debian.
 
 ## Current personal projects
 
-I've recently (as of late 2008) been developing various plugins for
-[IkiWiki](http://ikiwiki.info/) and trying to get Debian 5.0 released.
+I sporadically contribute to [IkiWiki], the wiki compiler used by this website
+(including various plugins and some significant performance improvements),
+and do various QA work in [Debian] (fixing
+release-critical bugs and asking for the removal of redundant packages).
 
-## Game modifications and utilities
+[IkiWiki]: http://ikiwiki.info/
+[Debian]: http://www.debian.org/
 
-[[UT System Config|/2000/paradox/utsc]],
-[[Marginally Enhanced UT|/2002/paradox/ut/marginal]], and my
-[[quick fix|/2002/paradox/ut/reconfix]] for Gotham/UDS's Recon Force and
-Desert Agent models are all properly open-source.
-[[Advanced Model Support|/2001/paradox/ams]] is under a license which
-approaches open source, although it's not quite. See the
-[[Paradox Productions|/2003/paradox]] section for more
-details.
+I've also written [[src/gfcombinefs]], a filesystem to reconstitute secrets
+shared with [libgfshare](http://www.digital-scurf.org/software/libgfshare).
 
 ## Various old projects
 
+The [[Paradox Productions|/2003/paradox]] section contains some old game
+modifications, some with source code.
+
 [[/2002/Pseudosite]] and [[/2004/Pseudoweb]] were two attempts at a website
 generation framework.
 
diff --git a/src/gfcombinefs.mdwn b/src/gfcombinefs.mdwn
new file mode 100644
index 0000000..302cbe3
--- /dev/null
+++ b/src/gfcombinefs.mdwn
@@ -0,0 +1,190 @@
+[[!meta title="gfcombinefs - a filesystem for n-of-m secret sharing"]]
+[[!tag software]]
+
+    ######################### WARNING ################################
+    # So far, gfcombinefs is experimental and mostly untested.       #
+    # No real release has been made yet. I suggest not trusting it.  #
+    ##################################################################
+
+gfcombinefs combines several "shares" of a secret file previously split using
+Shamir secret sharing, to produce the original secret, and presents it as
+a file in a FUSE filesystem.
+
+The idea is that the secret file (probably a GnuPG secret keyring, i.e.
+secring.gpg) is split into (say) 6 shares (of the same length in bytes
+as the secret), of which 4 are needed to reconstitute the original secret
+(that would be a "4-of-6" share). Thanks to the algorithm used, having fewer
+than the required number of shares gives no information whatsoever about the
+secret's contents.
+
+For the actual mathematics, gfcombinefs uses libgfshare, written by Daniel
+Silverstone - see libgfshare's documentation for more about the algorithm.
+
+gfcombinefs is primarily designed for use with GnuPG secret keyrings, which
+has various consequences:
+
+* it locks itself into memory to stop the secret from being paged out
+* the secret can be removed, which should be done prior to suspend-to-disk
+  (hibernate), again to prevent it from being paged out
+* when not enough parts have been provided, the file exists but has zero
+  length (this stops gpg from complaining about it)
+
+Requirements
+------------
+
+At runtime:
+
+* FUSE library, tools and kernel module <http://fuse.sourceforge.net/>
+* libgfshare <http://www.digital-scurf.org/software/libgfshare>
+
+For compilation:
+
+* pkg-config <http://pkg-config.freedesktop.org/>
+* GNU make <http://www.gnu.org/software/make/>
+
+Usage
+-----
+
+The filesystem currently has one file in the root directory, called "secret".
+There's only one secret per mountpoint so far.
+
+The only normal operations supported are:
+
+* list the root directory (it contains "secret", "." and "..")
+* read from "secret"
+* get the attributes of "secret" (its permissions are 0400, i.e. r--------)
+* unlink "secret", e.g. with `rm -f $mountpoint/secret` - this doesn't actually
+  remove it, but it discards all its data (by clearing the relevant memory),
+  then truncates it to be an empty file
+
+In addition, you can provide shares. This is done by setting an XFS-style
+extended attribute on the secret, whose name is "user." plus the share number
+in ASCII, for instance:
+
+    rm -f $mountpoint/secret
+    attr -q -s user.023 $mountpoint/secret < secring.gpg.023
+    attr -q -s user.042 $mountpoint/secret < secring.gpg.042
+    attr -q -s user.111 $mountpoint/secret < /media/usbdisk/secring.gpg.111
+    attr -q -s user.123 $mountpoint/secret < /media/usbdisk/secring.gpg.123
+
+When enough shares have been provided (currently the filesystem is hard-coded
+to expect exactly 4 shares), the secret file's size will change from 0 to the
+real size (which is equal to the size of each share), and its contents will
+change from empty to the real secret.
+
+Example
+-------
+
+For instance, you could do a 4-of-6 share and put two shares on your laptop,
+two on a USB stick in your pocket, and two backup shares kept in safe
+places.
+
+If you have both the laptop and the USB stick, you can get your secret keyring
+and do GnuPG things, but if either your laptop or your USB stick are lost
+or stolen (but not both devices at the same time!) you don't need to revoke
+your key: just take the remaining device and the two backup shares, combine
+them to get the secret, re-split the secret into a new set of shares, and
+securely destroy the old shares (to guarantee that they cannot be obtained by
+the same person as the lost device, and used to recover the secret).
+
+The lost device contains only two shares, which isn't enough to recover the
+secret (you can make sure they're entirely useless by destroying the other
+shares in that set).
+
+Many other sharing schemes are possible; the author of libgfshare suggests
+a 3-of-5 share, with two shares on a USB stick and one each on three
+computers. You can adjust the number of shares, and their distribution
+between various locations, as necessary, but at the moment the number of shares
+expected is hard-coded in gfcombinefs.
+
+For shares stored on large storage devices (like the laptop's hard disk), I
+recommend making a small partition (or LVM logical volume) to contain them -
+that way, you can wipe the whole partition with wipe(1) without it taking too
+long, and be reasonably sure that the old shares are unrecoverable.
+
+Limitations
+-----------
+
+gfcombinefs is a read-only filesystem - you'll have to split the secret
+yourself, probably using gfsplit(1). Supporting writing would be problematic -
+splitting the new secret wouldn't be a problem, but it wouldn't be possible
+to copy the new shares from gfcombinefs to their various locations
+automatically (the backup shares shouldn't even be present most of the time).
+
+Luckily, gpg can usually operate well with a read-only secret keyring; you'll
+usually only have to alter the secret keyring (and hence re-split) if you add
+uids or subkeys to a key, or create a whole new key.
+
+In particular, you can encrypt data, sign data, certify (sign keys), and so on
+with the secret keyring on a read-only filesystem like gfcombinefs.
+
+gfcombinefs doesn't help you to do the actual splitting. This is probably
+best done with a temporary GNUPGHOME in a tmpfs, with swap disabled (so the

(Diff truncated)

diff --git a/2007/sbuild.mdwn b/2007/sbuild.mdwn
index e92d797..96231ce 100644
--- a/2007/sbuild.mdwn
+++ b/2007/sbuild.mdwn
@@ -19,13 +19,6 @@ to upgrade it.
 I use this configuration on [Collabora]'s build box, and also on my
 laptop.
 
-[Updated 2007-12-10: better instructions for making chroots,
-avoiding Recommends being installed]
-
-[Updated 2008-04-13: updated hook scripts to the ones I actually use.
-Search for "2008-04-13". See also:
-[[Using sbuild as a Debian maintainer|/2008/sbuild-dm]]]
-
 The naive thing to do would be to allocate a logical volume for each chroot.
 However, each LV needs enough space to hold a minimal base system, plus
 the largest package build you ever want to do (including its build
@@ -44,22 +37,21 @@ another, you can share the base system using some schroot hooks I describe
 later. For instance, I don't have a base for Debian experimental - I just
 construct it as needed, by upgrading from unstable.
 
-On [Collabora]'s x86-64 build box the base chroots currently occupy 1.6 GiB of
-a 5 GiB LV, with the following sizes (just after an apt-get clean):
+Some rather outdated statistics: on [Collabora]'s x86-64 build box, the base
+chroots at one point occupied 1.6 GiB of a 5 GiB LV, with the following sizes
+(just after an apt-get clean):
 
 * Debian etch i386: 213M
 * Debian etch x86-64: 216M
 * Debian sid i386: 216M
 * Debian sid x86-64: 221M
-
-and for Ubuntu builds:
-
 * Ubuntu dapper i386: 207M
 * Ubuntu edgy i386: 196M
 * Ubuntu edgy x86-64: 154M
 
-On my laptop I allocated 3 GiB for the base system, which should in practice
-be plenty for an i386-only environment.
+On my laptop I originally allocated 3 GiB for the base system, which should in
+practice be plenty for an i386-only environment. I now use 5 GiB, since I have
+plenty of disk.
 
 You'll also need some free space in the same volume group - the maximum you
 can theoretically need is the free space on your base LV, plus the size of the
@@ -70,10 +62,10 @@ away with rather less than that.
 ## Setting up the logical volumes
 
 Having decided how much space you want in the base, set up an LV for your
-base system (here I use 3 GiB in the volume group "vg", naming the
+base system (here I use 5 GiB in the volume group "vg", naming the
 resulting LV "/dev/vg/schroot"):
 
-    sudo lvcreate -L3G -nschroot vg
+    sudo lvcreate -L5G -nschroot vg
 
 format it:
 
@@ -92,35 +84,13 @@ For use on a laptop with potentially wobbly networking, you probably want
 to cache installed packages with a local instance of [approx], in which case
 replace *MIRROR* with `localhost:9999`.
 
-    cd /mnt
-    sudo cdebootstrap --flavour=build sarge sarge http://MIRROR/debian
-    sudo cdebootstrap --flavour=build etch etch http://MIRROR/debian
-    sudo cdebootstrap --flavour=build sid sid http://MIRROR/debian
-
-## Setting up Ubuntu or Debian base systems with `debootstrap`
-
-`debootstrap` was the shell script that inspired `cdebootstrap`.
-It's likely to be more fragile, but the version shipped in Ubuntu supports
-making Ubuntu as well as Debian chroots, which `cdebootstrap` doesn't.
-
-As an alternative to the `cdebootstrap` commands above, you could use:
+If you have a Debian mirror on your LAN, giving it the DNS alias `mirror` is
+extremely convenient.
 
     cd /mnt
-    sudo debootstrap --variant=buildd sarge sarge http://MIRROR/debian
-    sudo debootstrap --variant=buildd etch etch http://MIRROR/debian
-    sudo debootstrap --variant=buildd sid sid http://MIRROR/debian
-
-To get Ubuntu chroots on a Debian system, you'll have to fetch the
-`debootstrap` source tarball from <http://packages.ubuntu.com/debootstrap>.
-Untar it somewhere (I used ~/tmp) and use:
-
-    cd /mnt
-    sudo debootstrap dapper dapper http://MIRROR/ubuntu \
-            ~/tmp/debootstrap-0.3.3.2ubuntu3/dapper
-    sudo debootstrap edgy edgy http://MIRROR/ubuntu \
-            ~/tmp/debootstrap-0.3.3.2ubuntu3/edgy
-    sudo debootstrap feisty feisty http://MIRROR/ubuntu \
-            ~/tmp/debootstrap-0.3.3.2ubuntu3/feisty
+    sudo cdebootstrap --flavour=build lenny lenny http://MIRROR/debian
+    sudo cdebootstrap --flavour=build squeeze squeeze http://MIRROR/debian
+    sudo cdebootstrap --flavour=build sid sid http://MIRROR/debian
 
 ## Very basic chroot configuration
 
@@ -139,7 +109,7 @@ After that, unmount `/mnt` before continuing.
 
 ## Configuring `schroot`
 
-Here's what to put in `/etc/schroot/schroot.conf` for each chroot:
+Here's what to put in `/etc/schroot/chroot.d/NAME` for each chroot:
 
     [sid]
     # Optional. The chroot with alias 'default' is used if you just type
@@ -182,48 +152,47 @@ Put this in `/etc/schroot/setup.d/60append-apt-sources`:
 
     #!/bin/sh
     # /etc/schroot/setup.d/60append-apt-sources
-    # Updated 2008-04-13 to support replacing /etc/apt/preferences
-
-    if [ "z$1" = "zsetup-start" ] || [ "z$1" = "zsetup-recover" ]; then
-
+    
+    if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then
+    
       NAME=$(echo "${CHROOT_NAME}" | sed -e 's/-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9]-[a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9][a-z0-9]//g')
-
+    
       EXTRA_APT_SOURCES="/etc/schroot/sources.list.d/${NAME}.sources.list"
       APT_PREFS="/etc/schroot/sources.list.d/${NAME}.preferences"
-
+    
       if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-        echo "Checking for auxiliary apt sources in $EXTRA_APT_SOURCES"
+        echo "Checking for auxiliary apt sources in $EXTRA_APT_SOURCES" >&2
       fi
       if [ -e "$EXTRA_APT_SOURCES" ]; then
         if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-          echo "... extra apt sources found"
+          echo "... extra apt sources found" >&2
         fi
         cat "$EXTRA_APT_SOURCES" >> "${CHROOT_PATH}/etc/apt/sources.list"
       fi
-
+    
       if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-        echo "Checking for apt preferences in $APT_PREFS"
+        echo "Checking for apt preferences in $APT_PREFS" >&2
       fi
       if [ -e "$APT_PREFS" ]; then
         if [ "$AUTH_VERBOSITY" = "verbose" ]; then
-          echo "... apt preferences found"
+          echo "... apt preferences found" >&2
         fi
         install -m644 "$APT_PREFS" "${CHROOT_PATH}/etc/apt/preferences"
       fi
+    
     fi
 
 and this in /etc/schroot/setup.d/80apt-get-update:
 
     #!/bin/sh
     # /etc/schroot/setup.d/80apt-get-update
-    # Updated 2008-04-13 to never output to stdout
-
-    if [ "z$1" = "zsetup-start" ]; then
-        if [ "z$AUTH_VERBOSITY" = "zverbose" ]; then
-            chroot "${CHROOT_PATH}" apt-get update >&2 || true
-        else
-            chroot "${CHROOT_PATH}" apt-get update >/dev/null || true
-        fi
+    
+    if [ $1 = "setup-start" ]; then
+	    if : || [ "$AUTH_VERBOSITY" = "verbose" ]; then
+		    chroot "${CHROOT_PATH}" apt-get update >&2 || true
+	    else
+		    chroot "${CHROOT_PATH}" apt-get update >/dev/null || true
+	    fi
     fi
 
 `chmod` them both to be executable.
@@ -236,9 +205,10 @@ after a chroot, with `.sources.list` appended. For instance, in
 
     # /etc/schroot/sources.list.d/experimental.sources.list
     deb http://MIRROR/debian experimental main
+    deb-src http://MIRROR/debian experimental main
 
-with MIRROR replaced as above. Now that sources.list fragment will be appended
-to `/etc/apt/sources.list` in `[experimental]` chroots only. `apt`'s
+with *MIRROR* replaced as above. Now that sources.list fragment will be
+appended to `/etc/apt/sources.list` in `[experimental]` chroots only. `apt`'s
 default pinning behaviour means the experimental packages will only be used
 where selected by a versioned dependency.
 
@@ -283,14 +253,6 @@ Enter a snapshot with a command like:
 
 Any changes you make will be lost after the snapshot is closed.
 
-Build a package in a single-use snapshot with:
-
-    sbuild foo-1.2.3.dsc
-
-or to override the distribution in the .dsc file,
-

(Diff truncated)

diff --git a/tags/debian.mdwn b/tags/debian.mdwn
index 87ffac9..07ff237 100644
--- a/tags/debian.mdwn
+++ b/tags/debian.mdwn
@@ -1,4 +1,7 @@
 [[!meta title="Debian-related"]]
 
+See also:
+[blog posts tagged as Debian](http://smcv.pseudorandom.co.uk/tags/debian/)
+
 [[!inline pages="link(/tags/debian)" archive="yes" feeds="no"
   timeformat="%B %Y"]]

diff --git a/index.mdwn b/index.mdwn
index 53daf98..7191433 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,7 +1,8 @@
 [[!meta copyright="Copyright © 1999-2009 Simon McVittie"]]
 [[!meta title="pseudorandom.co.uk"]]
 
-[[!pagestats pages="tags/* and !tags/abandoned"]]
+[[!pagestats pages="tags/* and !tags/abandoned
+  and !tags/smcv.pseudorandom.co.uk"]]
 
 <dl>
 <dt><a href="http://smcv.pseudorandom.co.uk/">smcv.pseudorandom.co.uk</a></dt>

diff --git a/index.mdwn b/index.mdwn
index 006b748..53daf98 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,4 +1,4 @@
-[[!meta copyright="Copyright © 1999-2008 Simon McVittie"]]
+[[!meta copyright="Copyright © 1999-2009 Simon McVittie"]]
 [[!meta title="pseudorandom.co.uk"]]
 
 [[!pagestats pages="tags/* and !tags/abandoned"]]

diff --git a/robots.txt b/robots.txt
index 912efad..3fd531a 100644
--- a/robots.txt
+++ b/robots.txt
@@ -10,3 +10,5 @@ Disallow: /2007/_
 Disallow: /2008/_
 Disallow: /2006/fragments/demo/
 Disallow: /2008/ikiwiki/demo
+Disallow: /templates/
+Disallow: /ikiwiki/

diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000..912efad
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,12 @@
+User-agent: *
+# Temporary directories start with _ or ~
+Disallow: /_
+Disallow: /~
+Disallow: /2004/pseudoweb/darcs/
+Disallow: /2004/
+Disallow: /2005/_
+Disallow: /2006/_
+Disallow: /2007/_
+Disallow: /2008/_
+Disallow: /2006/fragments/demo/
+Disallow: /2008/ikiwiki/demo

diff --git a/2008/04/16/tp-svc.mdwn b/2008/04/16/tp-svc.mdwn
index 8f42764..2c8bbf2 100644
--- a/2008/04/16/tp-svc.mdwn
+++ b/2008/04/16/tp-svc.mdwn
@@ -9,9 +9,10 @@
 *(Part 1 of an ongoing series: shiny things in telepathy-glib)*
 
 > `16:46 < epmf> tp-glib is made of magic`
+>
 > -- `#telepathy`, 2008-04-15
 
-Rob_ pointed out today that I'd been promising to blog about
+[Rob] pointed out today that I'd been promising to blog about
 [telepathy-glib] for several months and still haven't done so. I think
 there's too much to cover in one blog post, so I'll start with the
 oldest part - implementing a service (typically a Telepathy connection

diff --git a/2004/pseudoweb.mdwn b/2004/pseudoweb.mdwn
new file mode 100644
index 0000000..cc3e945
--- /dev/null
+++ b/2004/pseudoweb.mdwn
@@ -0,0 +1,24 @@
+[[!meta title="Pseudoweb 0.4.0"]]
+[[!meta copyright="Copyright © 2003-2008 Simon McVittie"]]
+[[!meta date="2003-03-06"]]
+[[!tag abandoned software]]
+
+Pseudoweb is another program formerly used to maintain pseudorandom.co.uk.
+It compiles XHTML pages from XHTML source conforming to a (fairly ad-hoc)
+profile, uses RDF metadata throughout and is as awkward to use in practice
+as you'd expect from that description...
+
+Pseudoweb copyright © 2004 Simon McVittie. Some rights reserved.
+Released under the same BSD-style license as zlib/libpng: see COPYING.txt
+for details.
+
+* [[Download version 0.4.0|/2004/pseudoweb/0.4.0/pseudoweb-0.4.0.zip]]
+
+(As of 2008 I've taken down the old [Darcs] repository. If you really want the
+change history, you can get [a repository tarball]. It unpacks into a darcs
+repository from which the working tree has been deleted - you can use
+`darcs revert -a` to get it back.)
+
+[a repository tarball]: /2005/pseudoweb.darcs.tar.bz2
+
+[Darcs]: http://www.abridgegame.org/darcs/
diff --git a/2004/pseudoweb.rst b/2004/pseudoweb.rst
deleted file mode 100644
index e8b1529..0000000
--- a/2004/pseudoweb.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-[[!meta title="Pseudoweb 0.4.0"]]
-[[!meta copyright="Copyright © 2003-2008 Simon McVittie"]]
-[[!meta date="2003-03-06"]]
-[[!tag abandoned software]]
-
-Pseudoweb is another program formerly used to maintain pseudorandom.co.uk.
-It compiles XHTML pages from XHTML source conforming to a (fairly ad-hoc)
-profile, uses RDF metadata throughout and is as awkward to use in practice
-as you'd expect from that description...
-
-Pseudoweb copyright © 2004 Simon McVittie. Some rights reserved.
-Released under the same BSD-style license as zlib/libpng: see COPYING.txt
-for details.
-
-* `Download version 0.4.0`__
-
-__ /2004/pseudoweb/0.4.0/pseudoweb-0.4.0.zip
-
-(As of 2008 I've taken down the old Darcs_ repository. If you really want the
-change history, you can `get a repository tarball`__. It unpacks into a darcs
-repository from which the working tree has been deleted - you can use
-``darcs revert -a`` to get it back.)
-
-__ /2005/pseudoweb.darcs.tar.bz2
-
-.. _Darcs: http://www.abridgegame.org/darcs/
-.. _Python: http://www.python.org/
-.. _libxml2: http://xmlsoft.org/
-.. _rdflib: http://rdflib.net/
diff --git a/2006/fragments.mdwn b/2006/fragments.mdwn
new file mode 100644
index 0000000..c2797fc
--- /dev/null
+++ b/2006/fragments.mdwn
@@ -0,0 +1,8 @@
+[[!meta title="fragments"]]
+[[!meta copyright="Copyright © 2008 Simon McVittie"]]
+[[!tag abandoned software]]
+
+`fragments` was going to be a collection of reusable [Django] components.
+It turns out they weren't (reusable, that is).
+
+[Django]: http://www.djangoproject.com/
diff --git a/2006/fragments.rst b/2006/fragments.rst
deleted file mode 100644
index 04f6838..0000000
--- a/2006/fragments.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!meta title="fragments"]]
-[[!meta copyright="Copyright © 2008 Simon McVittie"]]
-[[!tag abandoned software]]
-
-``fragments`` was going to be a collection of reusable Django_ components.
-It turns out they weren't (reusable, that is).
-
-.. _Django: http://www.djangoproject.com/
diff --git a/2006/fragments/gallery.mdwn b/2006/fragments/gallery.mdwn
new file mode 100644
index 0000000..5ab8f6f
--- /dev/null
+++ b/2006/fragments/gallery.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="fragments.gallery"]]
+[[!meta copyright="Copyright © 2008 Simon McVittie"]]
+[[!tag abandoned software]]
+
+`fragments` was going to be a collection of reusable [Django] components.
+It turns out they weren't.
+
+`fragments.gallery` was a simple photo gallery,
+using the filesystem as the authoritative source of information and the
+database as a cache.
+
+[Django]: http://www.djangoproject.com/
diff --git a/2006/fragments/gallery.rst b/2006/fragments/gallery.rst
deleted file mode 100644
index bc153d8..0000000
--- a/2006/fragments/gallery.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-[[!meta title="fragments.gallery"]]
-[[!meta copyright="Copyright © 2008 Simon McVittie"]]
-[[!tag abandoned software]]
-
-``fragments`` was going to be a collection of reusable Django_ components.
-It turns out they weren't.
-
-``fragments.gallery`` was a simple photo gallery,
-using the filesystem as the authoritative source of information and the
-database as a cache.
-
-.. _Django: http://www.djangoproject.com/
diff --git a/2006/mailserver.mdwn b/2006/mailserver.mdwn
new file mode 100644
index 0000000..c8c95fa
--- /dev/null
+++ b/2006/mailserver.mdwn
@@ -0,0 +1,300 @@
+[[!meta title="Mailserver configuration with Debian, Exim, ClamAV & dspam"]]
+[[!meta description="""
+    Mailserver configuration fragments similar to those previously used by
+    pseudorandom.co.uk, including virus rejection, spam filtering and
+    greylisting"""]]
+[[!meta guid="urn:uuid:7e41fe55-caf3-427f-b788-44f66917b97f"]]
+[[!meta date="2006-10-15T16:39:58Z"]]
+[[!meta copyright="Copyright © 2006-2008 Simon McVittie"]]
+[[!tag debian howto]]
+
+This document no longer describes a live configuration; I'll hopefully
+write up my current Postfix setup at some point.
+
+## Assumptions
+
+This is a slightly anonymized version of pseudorandom.co.uk's mail
+configuration, in which I'll pretend I'm configuring a host whose real name
+is colo.example.com, which hosts domains example.com, example.org
+and subdomain.example.com. You can find out what those names are pseudonyms for
+if you spend 5 minutes doing DNS lookups ;-)
+
+In my configuration, only real system users in /etc/passwd receive mail;
+for each user, e.g. "fred", there is a "real" address `fred@colo.example.com`.
+There are also hosted virtual domains like example.com, example.org and
+subdomain.example.com - each address at one of these domains either gets
+delivered to one or more system users, or rejected as unknown. You can do
+catch-all delivery too, but I don't, for spam reasons.
+
+I'm not using databases for configuration, for simplicity - I don't host
+many domains.
+
+## Simple Exim 4 virtual hosting
+
+    apt-get install exim4-daemon-heavy exim4
+
+I used the `-heavy` rather than `-light` variant so I could have
+content scanning using `clamav`, which is configured later.
+
+When `exim4-config` prompts you, select:
+
+- Internet site
+- Use split configuration
+- Local hostnames are e.g. `colo.example.com`, `colo` and
+  `spam.example.com` (there's no need to include your virtual hosts,
+  we'll set that up in a moment). `spam.example.com` is for dspam support,
+  which I'll configure later on. Depending which version of Debian
+  you're using, you may need to separate the hostnames with colons
+  `:` or with semicolons `;` - pay attention to the debconf
+  prompt.
+
+Create an empty directory `/etc/exim4/virtual`.
+
+If you want users' mail delivered into a Maildir (for use with Courier
+or Dovecot IMAP) by default, edit /etc/exim4/update-exim4.conf.conf to
+include
+
+    dc_localdelivery='maildir_home'
+
+To add all your virtual hosts to the list of local hostnames, edit
+`/etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs` and add
+`dsearch;/etc/exim4/virtual` to the line that defines local_domains,
+so it looks something like::
+
+    local_domains = MAIN_LOCAL_DOMAINS : dsearch;/etc/exim4/virtual
+

(Diff truncated)

diff --git a/2003/about.mdwn b/2003/about.mdwn
new file mode 100644
index 0000000..eb3f456
--- /dev/null
+++ b/2003/about.mdwn
@@ -0,0 +1,30 @@
+[[!meta title="About pseudorandom"]]
+[[!meta description="About this site and its author"]]
+[[!meta copyright="Copyright © 1999-2008 Simon McVittie"]]
+
+pseudorandom is Simon McVittie's personal website.
+
+## About smcv
+
+I'm a programmer at [Collabora], mostly in C and Python. See
+[[Software|/2003/opensource]] for stuff I've worked on.
+I'm also a [Debian] [developer].
+
+[Debian]: http://www.debian.org/
+[developer]: http://qa.debian.org/developer.php?login=smcv@debian.org
+[Collabora]: http://www.collabora.co.uk/
+
+Site history
+============
+
+This site started off mostly hosting game modifications
+([[Paradox Productions|/2003/paradox]]), but most recent stuff is related to
+Debian, Linux and free software development. New things are now linked from
+[my blog].
+
+[my blog]: http://smcv.pseudorandom.co.uk/
+
+Legalese
+========
+
+[[Copyright, disclaimer of responsibility and privacy statement|/2003/legal]]
diff --git a/2003/about.rst b/2003/about.rst
deleted file mode 100644
index 4256b01..0000000
--- a/2003/about.rst
+++ /dev/null
@@ -1,31 +0,0 @@
-[[!meta title="About pseudorandom"]]
-[[!meta description="About this site and its author"]]
-[[!meta copyright="Copyright © 1999-2008 Simon McVittie"]]
-
-pseudorandom is Simon McVittie's personal website.
-
-About smcv
-==========
-
-I'm a programmer at Collabora_, mostly in C and Python. See
-Software_ for stuff I've worked on. I'm also a Debian_ developer_.
-
-.. _Software: /2003/opensource/
-.. _Debian: http://www.debian.org/
-.. _developer: http://qa.debian.org/developer.php?login=smcv@debian.org
-.. _Collabora: http://www.collabora.co.uk/
-
-Site history
-============
-
-This site started off mostly hosting game modifications
-(`Paradox Productions`_), but most recent stuff is related to Debian,
-Linux and free software development. New things are now linked from `my blog`_.
-
-.. _Paradox Productions: /2003/paradox/
-.. _my blog: http://smcv.pseudorandom.co.uk/
-
-Legalese
-========
-
-`Copyright, disclaimer of responsibility and privacy statement </2003/legal/>`__
diff --git a/2003/legal.mdwn b/2003/legal.mdwn
new file mode 100644
index 0000000..fc2957f
--- /dev/null
+++ b/2003/legal.mdwn
@@ -0,0 +1,29 @@
+[[!meta title="Legal information"]]
+[[!meta copyright="Copyright © 1999-2008 Simon McVittie"]]
+
+## Copyright
+
+This website copyright © 1999-2008 Simon McVittie except where stated
+otherwise. Redistribution of content is not permitted unless stated
+otherwise.
+
+## Disclaimer of all responsibility
+
+Content on this site is offered "as-is" with no guarantee or warranty,
+express or implied.
+
+I make no guarantees and/or warranties that information contained herein
+is accurate, reliable, sensible, plausible, or legible. You exist entirely
+at your own risk and I accept no responsibility for anything.
+
+Opinions expressed on this site are not those of my employer.
+
+## Privacy
+
+I live in Europe, so you have data protection law on your side. :-)
+
+This site is run by an individual who has no interest in spying on you or
+covering your browser in ads. If you see ad banners on pseudorandom.co.uk,
+I have nothing to do with them; try checking for spyware on your computer.
+I do keep access logs, which I use to see
+which pages are visited and which browsers the visitors use.
diff --git a/2003/legal.rst b/2003/legal.rst
deleted file mode 100644
index 96947ab..0000000
--- a/2003/legal.rst
+++ /dev/null
@@ -1,35 +0,0 @@
-[[!meta title="Legal information"]]
-[[!meta copyright="Copyright © 1999-2008 Simon McVittie"]]
-
-Copyright
-=========
-
-This website copyright © 1999-2008 Simon McVittie except where stated
-otherwise. Redistribution of content is not permitted unless stated
-otherwise.
-
-Disclaimer of all responsibility
-================================
-
-Content on this site is offered "as-is" with no guarantee or warranty,
-express or implied.
-
-I make no guarantees and/or warranties that information contained herein
-is accurate, reliable, sensible, plausible, or legible. You exist entirely
-at your own risk and I accept no responsibility for anything.
-
-Opinions expressed on this site are not those of my employer.
-
-Privacy
-=======
-
-I live in Europe, so you have data protection law on your side. :-)
-
-This site is run by an individual who has no interest in spying on you or
-covering your browser in ads. If you see ad banners on pseudorandom.co.uk,
-I have nothing to do with them; try checking for spyware on your computer.
-I do keep access logs, which I use to see
-which pages are visited and which browsers the visitors use.
-
-At the time of writing I don't use cookies; if I do in future, I'll use
-them sparingly.
diff --git a/2003/opensource.mdwn b/2003/opensource.mdwn
new file mode 100644
index 0000000..0e16da2
--- /dev/null
+++ b/2003/opensource.mdwn
@@ -0,0 +1,51 @@
+[[!meta title="Software"]]
+[[!meta copyright="Copyright © 2008 Simon McVittie"]]
+
+## Work
+
+I currently work for [Collabora] on various open-source projects. The main
+one is [Telepathy], an instant messaging and voice/video over IP framework
+based on D-Bus, used on the Nokia 770/N800/N810 and on the
+[One Laptop Per Child] laptops, as well as in mainstream Linux desktop apps.
+I've worked on most parts of the Telepathy stack, mainly the reference
+connection manager (Gabble, a connection manager using XMPP/Jabber which
+interoperates with Google Talk), the specification, and the GLib, Python
+and Qt 4 bindings.
+
+I'm also the maintainer of [dbus-python], and part of the [pkg-telepathy] team
+that maintains Telepathy in Debian.
+
+[Collabora]: http://www.collabora.co.uk/
+[One Laptop per Child]: http://www.laptop.org/
+[Telepathy]: http://telepathy.freedesktop.org/
+[dbus-python]: http://www.freedesktop.org/Software/DBusBindings
+[pkg-telepathy]: http://alioth.debian.org/projects/pkg-telepathy/
+
+## Current personal projects
+
+I've recently (as of late 2008) been developing various plugins for
+[IkiWiki](http://ikiwiki.info/) and trying to get Debian 5.0 released.
+
+## Game modifications and utilities
+
+[[UT System Config|/2000/paradox/utsc]],
+[[Marginally Enhanced UT|/2002/paradox/ut/marginal]], and my
+[[quick fix|/2002/paradox/ut/reconfix]] for Gotham/UDS's Recon Force and
+Desert Agent models are all properly open-source.
+[[Advanced Model Support|/2001/paradox/ams]] is under a license which
+approaches open source, although it's not quite. See the
+[[Paradox Productions|/2003/paradox]] section for more
+details.
+
+## Various old projects
+
+[[/2002/Pseudosite]] and [[/2004/Pseudoweb]] were two attempts at a website
+generation framework.
+
+Other old projects include

(Diff truncated)

diff --git a/2003/contact.html b/2003/contact.html
index 9d224c8..30cab02 100644
--- a/2003/contact.html
+++ b/2003/contact.html
@@ -21,7 +21,7 @@ avoid spammers' address harvesting)</p>
 </div>
 <div class="section"><h2><a name="quickmail" id="quickmail">Quick e-mail</a></h2>
 
-<form method="post" action="/2003/contact/form-impl.cgi" enctype="application/x-www-form-urlencoded">
+<form method="post" action="/cgi-bin/contact-form.cgi" enctype="application/x-www-form-urlencoded">
 <div><input type="hidden" name="to" value="Webmaster" /></div>
 <p><label for="email">Your email address</label><br /><input id="email" class="textentry" type="text" name="email" value="" /></p>
 <p><label for="name">Your name, alias, screen-name or pseudonym</label><br /><input id="name" class="textentry" type="text" name="name" value="" /></p>

diff --git a/2007/sbuild.rst b/2007/sbuild.rst
index 0671911..001bd56 100644
--- a/2007/sbuild.rst
+++ b/2007/sbuild.rst
@@ -235,9 +235,9 @@ and this in /etc/schroot/setup.d/80apt-get-update::
 
         if [ "z$1" = "zsetup-start" ]; then
             if [ "z$AUTH_VERBOSITY" = "zverbose" ]; then
-                chroot "${CHROOT_PATH}" apt-get-update >&2 || true
+                chroot "${CHROOT_PATH}" apt-get update >&2 || true
             else
-                chroot "${CHROOT_PATH}" apt-get-update >/dev/null || true
+                chroot "${CHROOT_PATH}" apt-get update >/dev/null || true
             fi
         fi
 

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b84c806
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/.ikiwiki
+/recentchanges
diff --git a/2000.mdwn b/2000.mdwn
new file mode 100644
index 0000000..229361c
--- /dev/null
+++ b/2000.mdwn
@@ -0,0 +1,3 @@
+[[!meta title="Content first published in or before 2000"]]
+[[!meta copyright="Copyright © 2008 Simon McVittie"]]
+[[!map pages="copyright(*) and 2000/*" show="title"]]
diff --git a/2000.rst b/2000.rst
deleted file mode 100644
index 9bf1325..0000000
--- a/2000.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-Content first published in or before 2000
-=========================================
-
-.. metalink::
-	:rel=up: /
-
-.. meta::
-	:copyright: Copyright © 2003 Simon McVittie
-
-.. class:: auto-synopses
-
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-	`.`__
-		.
-
-__ /2000/news/
-__ /2000/paradox/fpsctls/
-__ /2000/paradox/sctghost/
-__ /2000/paradox/utsc/
-__ /2000/paradox/ut-obscure/
-__ /2000/paradox/xvt/
-__ /2000/paradox/xwa/
-__ /2000/gen2/
-__ /2000/maths/inequal/
diff --git a/2000/gen2.html b/2000/gen2.html
new file mode 100644
index 0000000..1a43b59
--- /dev/null
+++ b/2000/gen2.html
@@ -0,0 +1,33 @@
+<div>
+[[!meta title="Genesis II fractal landscapes"]]
+[[!meta copyright="Copyright © 2000 Simon McVittie"]]
+[[!meta date="2000-01-01"]]
+[[!meta description="Landscape images generated by Geomantics' 'Genesis II'"]]
+
+<p>These were generated with Genesis 2, a Windows program by Scottish company
+<a href="http://www.geomantics.com/">Geomantics</a>. They're not of real
+places (I used Geomantics' fractal landscape plugin) but look fairly
+impressive.</p>
+<dl>
+<dt>Forested hillside (71 KB)</dt>
+<dd><a href="/2000/gen2/forest.jpg">
+<img src="/2000/gen2/thumbs/forest.jpg" alt="Forest" /></a>
+</dd>
+<dt>Mountain lake (92 KB)</dt>
+<dd><a href="/2000/gen2/lake1.jpg">
+<img src="/2000/gen2/thumbs/lake1.jpg" alt="Mountain lake" /></a>
+</dd>
+<dt>Sunset (80 KB)</dt>
+<dd><a href="/2000/gen2/sunset.jpg">
+<img src="/2000/gen2/thumbs/sunset.jpg" alt="Sunset" /></a>
+</dd>
+<dt>Mistscape (49 KB)</dt>
+<dd><a href="/2000/gen2/mistscape.jpg">
+<img src="/2000/gen2/thumbs/mistscape.jpg" alt="Mist" /></a>
+</dd>
+<dt>Tranquil lake (42 KB)</dt>
+<dd><a href="/2000/gen2/lake2.jpg">
+<img src="/2000/gen2/thumbs/lake2.jpg" alt="Lake" /></a>
+</dd>
+</dl>
+</div>
diff --git a/2000/gen2.xhtml b/2000/gen2.xhtml
deleted file mode 100644
index 66761f3..0000000
--- a/2000/gen2.xhtml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
-  <head>
-
-    <title>Genesis II fractal landscapes</title>
-    <meta name="copyright" content="Copyright © 2000 Simon McVittie" />
-    <link rel="up" href="/2003/other/"/>
-    <meta name="dcterms.created" content="2000" />
-    <meta name="description" content="Landscape images generated by Geomantics' 'Genesis II'" />
-  </head>
-  <body>
-    <div class="content" id="pse-content">
-<p>These were generated with Genesis 2, a Windows program by Scottish company
-<a href="http://www.geomantics.com/">Geomantics</a>. They're not of real
-places (I used Geomantics' fractal landscape plugin) but look fairly
-impressive.</p>
-<dl>
-<dt>Forested hillside (71 KB)</dt>
-<dd><a href="/2000/gen2/forest.jpg">
-<img src="/2000/gen2/thumbs/forest.jpg" alt="Forest" /></a>
-</dd>
-<dt>Mountain lake (92 KB)</dt>
-<dd><a href="/2000/gen2/lake1.jpg">
-<img src="/2000/gen2/thumbs/lake1.jpg" alt="Mountain lake" /></a>
-</dd>
-<dt>Sunset (80 KB)</dt>
-<dd><a href="/2000/gen2/sunset.jpg">
-<img src="/2000/gen2/thumbs/sunset.jpg" alt="Sunset" /></a>
-</dd>
-<dt>Mistscape (49 KB)</dt>
-<dd><a href="/2000/gen2/mistscape.jpg">
-<img src="/2000/gen2/thumbs/mistscape.jpg" alt="Mist" /></a>
-</dd>
-<dt>Tranquil lake (42 KB)</dt>
-<dd><a href="/2000/gen2/lake2.jpg">
-<img src="/2000/gen2/thumbs/lake2.jpg" alt="Lake" /></a>
-</dd>
-</dl>
-</div>
-  </body>
-</html>
diff --git a/2000/maths.mdwn b/2000/maths.mdwn
new file mode 100644
index 0000000..e69de29
diff --git a/2000/maths/inequal.html b/2000/maths/inequal.html
new file mode 100644
index 0000000..c718dcb
--- /dev/null
+++ b/2000/maths/inequal.html
@@ -0,0 +1,28 @@
+<div>
+[[!meta title="Geometric proof: (a+b)&#247;2 &#8805; &#8730;(ab)"]]
+[[!meta description="An alternative proof of the arithmetic/geometric mean inequality; this is not the usual proof, or the best proof"]]
+[[!meta copyright="Copyright © 2000 Simon McVittie"]]
+[[!tag maths]]
+[[!meta date="2000-03-01"]]
+
+<div class="section"><h2>Introduction</h2>
+<p>This is a fairly random proof of a simple special case of the
+arithmetic/geometric mean inequality (which is basically that the sum of a set
+of <i>n</i> positive real numbers, divided by <i>n</i>, is at least as large as the <i>n</i>th root
+of the product of the same <i>n</i> positive real numbers). It's not a very
+useful proof, because it doesn't add anything to your understanding of the
+problem and can't be extended to more than 2 numbers, but it has weird looking
+diagrams :-)</p>
+</div>
+<div class="section"><h2>Geometric proof that (<i>a</i>+<i>b</i>)&#247;2 &#8805; &#8730;<i>ab</i> (<i>a</i>, <i>b</i> &#8712; <b>R</b><sup>+</sup>)</h2>
+<p> <img src="/2000/maths/inequal/image004.gif" alt="The same diagram with some sides labelled" /> Fig.1</p>
+<p>Consider a triangle inscribed in a semicircle as shown (Fig.1), with its longest side the semicircle's diameter <i>d</i>, and its shorter sides &#8730;<i>a</i> and &#8730;<i>b</i>. Let the angles adjacent to this side be <i>&#945;</i> and <i>&#946;</i>. The angle opposite the diameter, <i>d</i>, is 90&#176;, because the angle subtended at the circumference is half the angle subtended at the centre (in this case, 180&#176;). This implies that <i>&#945;</i>+<i>&#946;</i>=90&#176;. Also, by Pythagoras' Theorem (as d is a right angle),</p>
+<p><img src="/2000/maths/inequal/image006.gif" alt="d squared = (sqrt(a)) squared + (sqrt(b)) squared; d squared = a + b; d = sqrt(a+b)" /></p>
+<p>The area of the triangle is &#189; &#215; base &#215; perpendicular height and, as d is a right angle, <i>A<sub>triangle</sub></i> = &#189; &#8730;<i>a</i>&#8730;<i>b =</i> &#189; &#8730;(<i>ab)</i>.</p>
+<p> <img src="/2000/maths/inequal/image008.gif" alt="Four semicircle/triangle sets with the hypotenuses forming the sides of a square, and everything else inside that square; the bottom and right triangles are emphasised with thicker lines" /> Fig.2</p>
+<p>Consider four of these arrangements, placed together as shown (Fig.2), such that the hypotenuses of the triangles form a square of side <i>d</i>=&#8730;(<i>a</i>+<i>b</i>), which therefore has area (<i>a</i>+<i>b</i>). The triangles touch but do not overlap at each side, as <i>&#945;</i>+<i>&#946;</i>=90&#176;. This means that, in any pair of adjacent triangles (one such pair is shown with thicker lines in Fig.2), the triangles do not overlap at any point.</p>
+<p> <img src="/2000/maths/inequal/image010.gif" alt="Same as Fig.2, but this time the top and bottom semicircles are emphasised" /> Fig.3</p>
+<p>As the square has height and width <i>d</i>=2 radii, the semicircles in which opposite triangles are inscribed (highlighted in Fig.3) touch at the centre (i.e. have a common tangent) but do not overlap. The triangles lie entirely within these semicircles and therefore cannot overlap either, although they will touch at the centre of the square when <i>&#945;</i>=<i>&#946;</i>=45&#176;.</p>
+<p>As there is no overlap between any triangles in this arrangement,</p>
+<p> <img src="/2000/maths/inequal/image012.gif" alt="A(square) is at least 4A(triangle), so a+b is at least 4 x 1/2 x sqrt(ab), so (a+b)/2 is at least sqrt(ab) for all positive real a, b. QED." /></p>
+</div></div>
diff --git a/2000/maths/inequal.xhtml b/2000/maths/inequal.xhtml
deleted file mode 100644
index 51af309..0000000
--- a/2000/maths/inequal.xhtml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
-  <head>
-
-    <title>Geometric proof: (a+b)&#247;2 &#8805; &#8730;(ab)</title>
-    <meta name="description" content="An alternative proof of the arithmetic/geometric mean inequality; this is not the usual proof, or the best proof" />
-    <meta name="copyright" content="Copyright &#169; 2000 Simon McVittie" />
-    <link rel="up" href="/2003/other/" />
-    <meta name="dcterms.created" content="2000" />

(Diff truncated)

diff --git a/2000.rst b/2000.rst
new file mode 100644
index 0000000..9bf1325
--- /dev/null
+++ b/2000.rst
@@ -0,0 +1,39 @@
+Content first published in or before 2000
+=========================================
+
+.. metalink::
+	:rel=up: /
+
+.. meta::
+	:copyright: Copyright © 2003 Simon McVittie
+
+.. class:: auto-synopses
+
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+	`.`__
+		.
+
+__ /2000/news/
+__ /2000/paradox/fpsctls/
+__ /2000/paradox/sctghost/
+__ /2000/paradox/utsc/
+__ /2000/paradox/ut-obscure/
+__ /2000/paradox/xvt/
+__ /2000/paradox/xwa/
+__ /2000/gen2/
+__ /2000/maths/inequal/
diff --git a/2000/gen2.xhtml b/2000/gen2.xhtml
new file mode 100644
index 0000000..66761f3
--- /dev/null
+++ b/2000/gen2.xhtml
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+  <head>
+
+    <title>Genesis II fractal landscapes</title>
+    <meta name="copyright" content="Copyright © 2000 Simon McVittie" />
+    <link rel="up" href="/2003/other/"/>
+    <meta name="dcterms.created" content="2000" />
+    <meta name="description" content="Landscape images generated by Geomantics' 'Genesis II'" />
+  </head>
+  <body>
+    <div class="content" id="pse-content">
+<p>These were generated with Genesis 2, a Windows program by Scottish company
+<a href="http://www.geomantics.com/">Geomantics</a>. They're not of real
+places (I used Geomantics' fractal landscape plugin) but look fairly
+impressive.</p>
+<dl>
+<dt>Forested hillside (71 KB)</dt>
+<dd><a href="/2000/gen2/forest.jpg">
+<img src="/2000/gen2/thumbs/forest.jpg" alt="Forest" /></a>
+</dd>
+<dt>Mountain lake (92 KB)</dt>
+<dd><a href="/2000/gen2/lake1.jpg">
+<img src="/2000/gen2/thumbs/lake1.jpg" alt="Mountain lake" /></a>
+</dd>
+<dt>Sunset (80 KB)</dt>
+<dd><a href="/2000/gen2/sunset.jpg">
+<img src="/2000/gen2/thumbs/sunset.jpg" alt="Sunset" /></a>
+</dd>
+<dt>Mistscape (49 KB)</dt>
+<dd><a href="/2000/gen2/mistscape.jpg">
+<img src="/2000/gen2/thumbs/mistscape.jpg" alt="Mist" /></a>
+</dd>
+<dt>Tranquil lake (42 KB)</dt>
+<dd><a href="/2000/gen2/lake2.jpg">
+<img src="/2000/gen2/thumbs/lake2.jpg" alt="Lake" /></a>
+</dd>
+</dl>
+</div>
+  </body>
+</html>
diff --git a/2000/maths/inequal.xhtml b/2000/maths/inequal.xhtml
new file mode 100644
index 0000000..51af309
--- /dev/null
+++ b/2000/maths/inequal.xhtml
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+  <head>
+
+    <title>Geometric proof: (a+b)&#247;2 &#8805; &#8730;(ab)</title>
+    <meta name="description" content="An alternative proof of the arithmetic/geometric mean inequality; this is not the usual proof, or the best proof" />
+    <meta name="copyright" content="Copyright &#169; 2000 Simon McVittie" />
+    <link rel="up" href="/2003/other/" />
+    <meta name="dcterms.created" content="2000" />
+  </head>
+  <body>
+    <div class="content" id="pse-content">
+<div class="section"><h2>Introduction</h2>
+<p>This is a fairly random proof of a simple special case of the
+arithmetic/geometric mean inequality (which is basically that the sum of a set
+of <i>n</i> positive real numbers, divided by <i>n</i>, is at least as large as the <i>n</i>th root
+of the product of the same <i>n</i> positive real numbers). It's not a very
+useful proof, because it doesn't add anything to your understanding of the
+problem and can't be extended to more than 2 numbers, but it has weird looking
+diagrams :-)</p>
+</div>
+<div class="section"><h2>Geometric proof that (<i>a</i>+<i>b</i>)&#247;2 &#8805; &#8730;<i>ab</i> (<i>a</i>, <i>b</i> &#8712; <b>R</b><sup>+</sup>)</h2>
+<p> <img src="/2000/maths/inequal/image004.gif" alt="The same diagram with some sides labelled" /> Fig.1</p>
+<p>Consider a triangle inscribed in a semicircle as shown (Fig.1), with its longest side the semicircle's diameter <i>d</i>, and its shorter sides &#8730;<i>a</i> and &#8730;<i>b</i>. Let the angles adjacent to this side be <i>&#945;</i> and <i>&#946;</i>. The angle opposite the diameter, <i>d</i>, is 90&#176;, because the angle subtended at the circumference is half the angle subtended at the centre (in this case, 180&#176;). This implies that <i>&#945;</i>+<i>&#946;</i>=90&#176;. Also, by Pythagoras' Theorem (as d is a right angle),</p>
+<p><img src="/2000/maths/inequal/image006.gif" alt="d squared = (sqrt(a)) squared + (sqrt(b)) squared; d squared = a + b; d = sqrt(a+b)" /></p>
+<p>The area of the triangle is &#189; &#215; base &#215; perpendicular height and, as d is a right angle, <i>A<sub>triangle</sub></i> = &#189; &#8730;<i>a</i>&#8730;<i>b =</i> &#189; &#8730;(<i>ab)</i>.</p>
+<p> <img src="/2000/maths/inequal/image008.gif" alt="Four semicircle/triangle sets with the hypotenuses forming the sides of a square, and everything else inside that square; the bottom and right triangles are emphasised with thicker lines" /> Fig.2</p>
+<p>Consider four of these arrangements, placed together as shown (Fig.2), such that the hypotenuses of the triangles form a square of side <i>d</i>=&#8730;(<i>a</i>+<i>b</i>), which therefore has area (<i>a</i>+<i>b</i>). The triangles touch but do not overlap at each side, as <i>&#945;</i>+<i>&#946;</i>=90&#176;. This means that, in any pair of adjacent triangles (one such pair is shown with thicker lines in Fig.2), the triangles do not overlap at any point.</p>
+<p> <img src="/2000/maths/inequal/image010.gif" alt="Same as Fig.2, but this time the top and bottom semicircles are emphasised" /> Fig.3</p>
+<p>As the square has height and width <i>d</i>=2 radii, the semicircles in which opposite triangles are inscribed (highlighted in Fig.3) touch at the centre (i.e. have a common tangent) but do not overlap. The triangles lie entirely within these semicircles and therefore cannot overlap either, although they will touch at the centre of the square when <i>&#945;</i>=<i>&#946;</i>=45&#176;.</p>
+<p>As there is no overlap between any triangles in this arrangement,</p>
+<p> <img src="/2000/maths/inequal/image012.gif" alt="A(square) is at least 4A(triangle), so a+b is at least 4 x 1/2 x sqrt(ab), so (a+b)/2 is at least sqrt(ab) for all positive real a, b. QED." /></p>
+</div></div>
+  </body>
+</html>
diff --git a/2000/news/_0416.xhtml b/2000/news/_0416.xhtml
new file mode 100644
index 0000000..8d7f528
--- /dev/null
+++ b/2000/news/_0416.xhtml
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+  <head>
+
+    <title>Terran Ghost</title>
+    <meta name="dc.date" content="2000-04-16"/>
+    <link rel="up" href="/2000/news/"/>
+    <meta name="copyright" content="Copyright © 2000-2004 Simon McVittie" />
+    <link rel="generates" href="/2000/news/#news0416"/>
+  </head>
+  <body>
+    <div class="content" id="pse-content">
+    
+<p>Changed some colour schemes around and added a skin to the Unreal Tournament
+section. The skin is a Terran Ghost from the RTS game Starcraft, for UT's Male
+Commando model.</p>
+<p><em>[Link-rot removal update, late 2002:
+<a href="/2000/paradox/sctghost/">the skin is archived here</a>]</em></p>
+</div>
+  </body>
+</html>
diff --git a/2000/news/_0521.xhtml b/2000/news/_0521.xhtml
new file mode 100644
index 0000000..540ded1
--- /dev/null
+++ b/2000/news/_0521.xhtml
@@ -0,0 +1,27 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB">
+  <head>
+
+    <title>Site move</title>
+    <meta name="dc.date" content="2000-05-21"/>
+    <link rel="up" href="/2000/news/"/>
+    <meta name="copyright" content="Copyright © 2000-2004 Simon McVittie" />
+    <link rel="generates" href="/2000/news/#news0521"/>
+  </head>
+  <body>
+    <div class="content" id="pse-content">
+    
+<p>Finally got round to uploading some Half-Life decals Rebel sent me a while ago,
+and moved the entire site to f9 (File Not Found's ISP) in the interests of
+avoiding ad banners.</p>
+<p>News update: I've been doing a bit of mapping in UnrealEd [the map might be
+finished by next year :-)]. I've also been trying to get UT running under
+Linux - I'll put up instructions if I can get it working. Finally, Veers
+over at unreal.gameobserver.net is making a new default face for my Starcraft
+Terran Ghost skin to replace my Executioner face - I'll release a modified
+version, with a few detail improvements and so on, when this is finished.</p>
+
+<p><em>[Link-rot removal update, late 2002: the new face never happened]</em></p>
+</div>
+  </body>
+</html>
diff --git a/2000/news/_0618.xhtml b/2000/news/_0618.xhtml
new file mode 100644
index 0000000..681c662
--- /dev/null
+++ b/2000/news/_0618.xhtml
@@ -0,0 +1,19 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

(Diff truncated)