From 57213fa0dbabd52001897d0b63bfb1a8d9d6926a Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Tue, 27 Oct 2009 22:22:11 -0400 Subject: Google will take a full URL, request that the plugin send it --- doc/plugins/google/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) 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]] -- cgit v1.2.3 From 471c04bfd2222dbb8aec9c350a1512213ef711f5 Mon Sep 17 00:00:00 2001 From: "http://blog.mithis.net/" Date: Wed, 28 Oct 2009 03:47:41 -0400 Subject: Adding information about the media2iki github project. --- doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 + ## 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 + -- cgit v1.2.3 From 12a27e7025d8ad560976de8a1a76899daaf23a25 Mon Sep 17 00:00:00 2001 From: "http://blog.mithis.net/" Date: Wed, 28 Oct 2009 03:57:05 -0400 Subject: Adding information about the media2iki github project. --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index ed3faa324..3e9c4dc3c 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -16,6 +16,10 @@ Also, some detail on converting mediawiki transclusion to ikiwiki inlines... > "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 + The iki-fast-load ruby script from the u32 page is given below: -- cgit v1.2.3 From 8b745be93321dbeca6e090af668a3d7920f680b7 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:39:16 +0000 Subject: add XCB library to users --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) 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 ======================== -- cgit v1.2.3 From 6659d78aa2e3c66c9beadf180aa18438db0f40e5 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:43:02 +0000 Subject: add dividers to split up the individual discussions going on --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 3e9c4dc3c..12c241a7d 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -13,6 +13,8 @@ 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]] @@ -20,6 +22,7 @@ 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 +---- The iki-fast-load ruby script from the u32 page is given below: @@ -617,6 +620,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 -- cgit v1.2.3 From 4df15554f84831d9e39db8719efa1b4b9ef9dd82 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:51:00 +0000 Subject: response to mithro --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 12c241a7d..683a3f8ac 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -22,6 +22,21 @@ 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 +> 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 +> as a start. +> -- [[Jon]] + ---- The iki-fast-load ruby script from the u32 page is given below: -- cgit v1.2.3 From 4dd50ba1bc4cb86c408ff45bbe06069e511e28fc Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:52:05 +0000 Subject: update URL to mediawiki plugin --- doc/plugins/contrib/mediawiki.mdwn | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 +Available at . + +This plugin originally lived at , but that +website has disappeared. -- cgit v1.2.3 From 16ff34af90b6490e2c2a951d9c74f08547b39730 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:53:41 +0000 Subject: update info about my commits --- doc/users/jon.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index 7895a03bf..8bb218cdc 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -4,8 +4,8 @@ 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 -- cgit v1.2.3 From f782021644ddf8d2111f498f99e33db5fcc9c60a Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:53:58 +0000 Subject: my talk was in 2008 --- doc/users/jon.mdwn | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index 8bb218cdc..55b3ee137 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -9,10 +9,10 @@ sysadmins. * 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 . -- cgit v1.2.3 From e5cab4165d9c12b8b68a15ce2c037d21dd2090b0 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Oct 2009 13:55:03 +0000 Subject: add notes about mediawiki --- doc/users/jon.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index 55b3ee137..ab71426d5 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -19,6 +19,9 @@ piece of software for this task. 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: -- cgit v1.2.3 From 879f2f683e878ca859f98eb8b182002cdbc69a20 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Wed, 28 Oct 2009 20:57:27 -0400 Subject: the setup file wants `rsync_command`, not `rsync` --- doc/plugins/rsync.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3