Merge commit 'origin/master' into pub/master

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index db1727076ab865c94b89e723ed086b0b050e9718..7d8e418269f31e1bc3dc6d167b9002c673861bf3 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -39,6 +39,7 @@ 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/)

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


@@ -101,7 +102,9 @@ Personal sites and blogs
 * [Andrey Tarantsov's homepage](http://www.tarantsov.com/)
 * [Don Marti's blog](http://zgp.org/~dmarti/)
 * [[JonDowland]]'s [homepage](http://jmtd.net/)
 * [Andrey Tarantsov's homepage](http://www.tarantsov.com/)
 * [Don Marti's blog](http://zgp.org/~dmarti/)
 * [[JonDowland]]'s [homepage](http://jmtd.net/)

-* [Xavier Maillard](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)

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