Merge branch 'master' of ssh://git.ikiwiki.info

[ikiwiki.git] / doc / users / joshtriplett.mdwn

diff --git a/doc/users/joshtriplett.mdwn b/doc/users/joshtriplett.mdwn
index c4661e8adde2d7f1c148a99baeabc4f22dd65f62..29178057c92fbd09337050f9b00f9468edad570e 100644 (file)
--- a/doc/users/joshtriplett.mdwn
+++ b/doc/users/joshtriplett.mdwn
@@ -1,8 +1,16 @@
-[[meta title="Josh Triplett"]]
+[[!meta title="Josh Triplett"]]
 
-Josh Triplett; `josh@{freedesktop.org,kernel.org,psas.pdx.edu}`.
+Email: `josh@{joshtriplett.org,freedesktop.org,kernel.org,psas.pdx.edu}`.
+
+[Josh Triplett's homepage](http://joshtriplett.org)
 
 Proud user of ikiwiki.
 
-Currently working on scripts to convert MoinMoin and TWiki wikis to ikiwikis
-backed by a git repository, including full history.
\ No newline at end of file
+Worked on scripts to convert MoinMoin and TWiki wikis to ikiwikis backed by a
+git repository, including full history.  Used for a couple of wikis, and now no
+longer maintained, but potentially still useful.  Available from the following
+repositories, though not well-documented:
+
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/moin2iki
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/html-wikiconverter
+    git clone git://svcs.cs.pdx.edu/git/wiki2iki/twiki