(no commit message)

[git.ikiwiki.info.git] / doc / users / jon.mdwn

diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 7895a03bf889172bebcd0376a6045a161cae885c..ab71426d5f8135b116e945b4f43fda758f27238e 100644 (file)
--- a/doc/users/jon.mdwn
+++ b/doc/users/jon.mdwn
@@ -4,21 +4,24 @@ team-documentation management system for a small-sized group of UNIX
 sysadmins.
 
 * my edits should appear either as 'Jon' (if I've used
 sysadmins.
 
 * my edits should appear either as 'Jon' (if I've used

-  [[tips/untrusted_git_push]]) or 'jmtd.net' (or once upon a time
-  'alcopop.org/me/openid/' or 'jondowland').
+  [[tips/untrusted_git_push]]); 'jmtd.net', 'jmtd.livejournal.com', 
+  or once upon a time 'alcopop.org/me/openid/' or 'jondowland'.

 * My [homepage](http://jmtd.net/) is powered by ikiwiki
 
 I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual
 * My [homepage](http://jmtd.net/) is powered by ikiwiki
 
 I gave a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual

-[Linux conference](http://www.ukuug.org/events/linux2008/) about organising
-system administrator documentation. Roughly a third of this talk was
-discussing IkiWiki in some technical detail and suggesting it as a good piece
-of software for this task.
+[Linux conference](http://www.ukuug.org/events/linux2008/) in 2008 about
+organising system administrator documentation. Roughly a third of this talk
+was discussing IkiWiki in some technical detail and suggesting it as a good
+piece of software for this task.

 
  * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
 
 I am also working on some ikiwiki hacks:
 
 * [[todo/allow site-wide meta definitions]]
 
  * slides at <http://www.staff.ncl.ac.uk/jon.dowland/unix/docs/>.
 
 I am also working on some ikiwiki hacks:
 
 * [[todo/allow site-wide meta definitions]]

+* Improving the means by which you can migrate from mediawiki to
+  IkiWiki. See [[tips/convert mediawiki to ikiwiki]] and the
+  [[plugins/contrib/mediawiki]] plugin.

 
 I am mostly interested in ikiwiki usability issues:
 
 
 I am mostly interested in ikiwiki usability issues: