Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / ikiwikiusers.mdwn

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index dc7153e39024db3dacefe5073092833e4d5dfc11..989a425c6cdd0ffeea4d098f14f0440a8d3efed5 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -2,7 +2,6 @@ Projects
 ========
 
 * [This wiki](http://ikiwiki.info) (of course!)
 ========
 
 * [This wiki](http://ikiwiki.info) (of course!)

-* [UK Software Patents info page](http://www.softwarepatents.co.uk/)

 * [Planet Debian upstream](http://updo.debian.net/)
 * The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)
 * [Planet Debian upstream](http://updo.debian.net/)
 * The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/)
 * [Debian Mentors wiki](http://jameswestby.net/mentors/)


@@ -22,7 +21,7 @@ Projects
 * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
 * The [libkdtree project](http://libkdtree.alioth.debian.org)
 * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project.  (Simple rcs backend)
 * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/)
 * The [libkdtree project](http://libkdtree.alioth.debian.org)
 * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project.  (Simple rcs backend)

-* [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.
+* [The TOVA Company](http://www.tovatest.com) public site.  We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend.

 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)
 * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/))
 * [CampusGrün Hamburg](http://www.campusgruen.org/)
 * The [awesome window manager homepage](http://awesome.naquadah.org/)


@@ -39,6 +38,8 @@ Projects
 * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
 * [monkeysphere](http://web.monkeysphere.info/)
 * [The Walden Effect](http://www.waldeneffect.org/)
 * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de)
 * [monkeysphere](http://web.monkeysphere.info/)
 * [The Walden Effect](http://www.waldeneffect.org/)

+* The [Fortran Wiki](http://fortranwiki.org/)
+* [Monotone](http://monotone.ca/wiki/FrontPage/)

 
 Personal sites and blogs
 ========================
 
 Personal sites and blogs
 ========================


@@ -100,12 +101,20 @@ Personal sites and blogs
 * [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/)
 * [Andrey Tarantsov's homepage](http://www.tarantsov.com/)
 * [Don Marti's blog](http://zgp.org/~dmarti/)
 * [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/)
 * [Andrey Tarantsov's homepage](http://www.tarantsov.com/)
 * [Don Marti's blog](http://zgp.org/~dmarti/)

-* [[JonDowland]]'s [homepage](http://jmtd.net/)
+* [[users/Jon]]'s [homepage](http://jmtd.net/)

 * [[xma]] is using ikiwiki (<http://maillard.mobi/~xma/>)
 * [[xma]] is using ikiwiki (<http://maillard.mobi/~xma/>)

+* [[JanWalzer|jwalzer]]'s [homepage](http://wa.lzer.net/) -- Work in Progress
+* [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet)
+* [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and
+  [blog](http://smcv.pseudorandom.co.uk/)
+
+Schools
+=======
+* [St Hugh of Lincoln Primary School in Surrey](http://hugh.vm.bytemark.co.uk/)

  
 Please feel free to add your own ikiwiki site!
 
  
 Please feel free to add your own ikiwiki site!
 

-See also: [Debian ikiwiki popcon graph](http://people.debian.org/~igloo/popcon-graphs/index.php?packages=ikiwiki)
+See also: [Debian ikiwiki popcon graph](http://popcon.debian.org/~igloo/popcon-graphs/index.php?packages=ikiwiki)

 and [google search for ikiwiki powered sites](http://www.google.com/search?q=%22powered%20by%20ikiwiki%22).
 
 While nothing makes me happier than knowing that ikiwiki has happy users, dropping some change in the [[TipJar]] is a nice way to show extra appreciation.
 and [google search for ikiwiki powered sites](http://www.google.com/search?q=%22powered%20by%20ikiwiki%22).
 
 While nothing makes me happier than knowing that ikiwiki has happy users, dropping some change in the [[TipJar]] is a nice way to show extra appreciation.