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

7 files changed, 52 insertions, 11 deletions

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index f6ab34653..eb998851a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -47,6 +47,7 @@ Projects & Organizations
 * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch)
 * [MIT Student Information Processing Board](http://sipb.mit.edu/)
 * [Tinc VPN](http://tinc-vpn.org/)
+* [The XCB library](http://xcb.freedesktop.org/)
 
 Personal sites and blogs
 ========================
diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn
index 7bf1ba0df..13c2d04b2 100644
--- a/doc/plugins/contrib/mediawiki.mdwn
+++ b/doc/plugins/contrib/mediawiki.mdwn
@@ -1,7 +1,10 @@
 [[!template id=plugin name=mediawiki author="[[sabr]]"]]
 [[!tag type/format]]
 
-[The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to
-process pages written using MediaWiki markup.
+The Mediawiki plugin allows ikiwiki to process pages written using MediaWiki
+markup.
 
-Available at <http://alcopop.org/~jon/mediawiki.pm>
+Available at <http://github.com/jmtd/mediawiki.pm>.
+
+This plugin originally lived at <http://u32.net/Mediawiki_Plugin/>, but that
+website has disappeared.
diff --git a/doc/plugins/google/discussion.mdwn b/doc/plugins/google/discussion.mdwn
index babc919d2..39403f9f9 100644
--- a/doc/plugins/google/discussion.mdwn
+++ b/doc/plugins/google/discussion.mdwn
@@ -4,3 +4,8 @@ This is not very good since the default ikiwiki
 templates produce XHTML instead of HTML.
 
 > Fixed, thanks for the patch! --[[Joey]] 
+
+It works to pass the whole wiki baseurl to Google, not just the
+domain, and appears to be legal. I've got a wiki that'd benefit
+(it's a few directories down from the root). Can the plugin be
+tweaked to do this? --[[schmonz]]
diff --git a/doc/plugins/rsync.mdwn b/doc/plugins/rsync.mdwn
index db7fcb4f7..315b663c0 100644
--- a/doc/plugins/rsync.mdwn
+++ b/doc/plugins/rsync.mdwn
@@ -7,7 +7,7 @@ The command to run is specified by setting `rsync_command` in your setup
 file. The command will be run in your destdir, so something like this
 is a typical command:
 
-	rsync => 'rsync -qa --delete . user@host:/path/to/docroot/',
+	rsync_command => 'rsync -qa --delete . user@host:/path/to/docroot/',
 
 If using rsync over ssh, you will need to enable noninteractive ssh login
 to the remote host. It's also a good idea to specify the exact command line
diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
index 1e5b912a9..ab6984494 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn
@@ -8,6 +8,9 @@ converting some of the Mediawiki conventions into Ikiwiki ones.
 The following instructions describe ways of obtaining the current version of
 the wiki. We do not yet cover importing the history of edits.
 
+Another set of instructions and conversion tools (which imports the full history)
+can be found at <http://github.com/mithro/media2iki>
+
 ## Step 1: Getting a list of pages
 
 The first bit of information you require is a list of pages in the Mediawiki.
@@ -131,5 +134,7 @@ most of the Mediawiki syntax.
 
 [[sabr]] used to explain how to [import MediaWiki content into
 git](http://u32.net/Mediawiki_Conversion/index.html?updated), including full
-edit history, but as of 2009/10/16 that site is not available.
+edit history, but as of 2009/10/16 that site is not available. A copy of the 
+information found on this website is stored at <http://github.com/mithro/media2iki>
+
 
diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index ed3faa324..683a3f8ac 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -13,9 +13,31 @@ Also, some detail on converting mediawiki transclusion to ikiwiki inlines...
 
 -- [[users/Jon]]
 
+----
+
 > "Who knows, the remote site might disappear.". Right now, it appears to
 > have done just that. -- [[users/Jon]]
 
+I have manage to recover most of the site using the Internet Archive. What
+I was unable to retrieve I have rewritten. You can find a copy of the code
+at <http://github.com/mithro/media2iki>
+
+> This is excellent news. However, I'm still keen on there being a
+> comprehensive and up-to-date set of instructions on *this* site. I wouldn't
+> suggest importing that material into ikiwiki like-for-like (not least for
+> [[licensing|freesoftware]] reasons), but it's excellent to have it available
+> for reference, especially since it (currently) is the only set of
+> instructions that gives you the whole history.
+> 
+> The `mediawiki.pm` that was at u32.net is licensed GPL-2. I'd like to see it
+> cleaned up and added to IkiWiki proper (although I haven't requested this
+> yet, I suspect the way it (ab)uses linkify would disqualify it at present).
+>
+> I've imported Scott's initial `mediawiki.pm` into a repository at
+> <http://github.com/jmtd/mediawiki.pm> as a start.
+> -- [[Jon]]
+
+----
 
 The iki-fast-load ruby script from the u32 page is given below:
 
@@ -613,6 +635,8 @@ Mediawiki.pm - A plugin which supports mediawiki format.
 	
 	1
 
+----
+
 Hello. Got ikiwiki running and I'm planning to convert my personal
 Mediawiki wiki to ikiwiki so I can take offline copies around. If anyone
 has an old copy of the instructions, or any advice on where to start I'd be
diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn
index 7895a03bf..ab71426d5 100644
--- 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
-  [[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
-[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]]
+* 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: