revert

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 6f2a127f26ff367a0fa07e8d120e8b8973ee5124..26f8daed4b60bba92b0b86a7b22dcc08572c691b 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!)

-* [Perl Mongers México](http://www.pm.org.mx/)

 * [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/)
 * [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/)


@@ -19,6 +18,7 @@ Projects
 * [debian-community.org](http://debian-community.org/)
 * The [cairo graphics library](http://cairographics.org/) website.
 * [Nouvelles Informations Positives Libres community](http://wiki.nipl.net/)
 * [debian-community.org](http://debian-community.org/)
 * The [cairo graphics library](http://cairographics.org/) website.
 * [Nouvelles Informations Positives Libres community](http://wiki.nipl.net/)

+* The [Portland State Aerospace Society](http://psas.pdx.edu) website.  Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[Git]] backend).

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


@@ -61,14 +61,16 @@ Personal sites and blogs
 * [Effective Programming](http://effectiveprogramming.com/)
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)
 * [Effective Programming](http://effectiveprogramming.com/)
 * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page.
 * [Chez Fred](http://fred.ccheznous.org)

-* [Cameron Dale](http://www.cs.sfu.ca/~camerond/personal/)
+* [Cameron Dale](http://www.camrdale.org/)

 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
 * [Charles Mauch](http://xtermin.us)'s website uses ikiwiki.
 * I keep my personal and project notes in a private ikiwiki - it's the perfect tool for this task. - [h01ger](http://layer-acht.org/)
 * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki 
   [asciidoc plugin](http://mowson.org/karl/colophon/).
 * [Carl Worth's Boring Web Pages](http://www.cworth.org)
 * [Charles Mauch](http://xtermin.us)'s website uses ikiwiki.
 * I keep my personal and project notes in a private ikiwiki - it's the perfect tool for this task. - [h01ger](http://layer-acht.org/)

-* [Nicolas Limare (nil)](http://poivron.org/~nil/)
-* [Patrick Winnertz (winnie)(https://www.der-winnie.de)
+* NicolasLimare ([nil](http://poivron.org/~nil/)+[lab](http://www.ann.jussieu.fr/~limare/)+[id](http://nicolas.limare.net/))
+* [Patrick Winnertz (winnie)](https://www.der-winnie.de)
+* Andrew Sackville-West has setup a [family wiki](http://wiki.swclan.homelinux.org)
+* [Simon Ward's site](http://bleah.co.uk/) and [blog](http://bleah.co.uk/blog/).

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