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

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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index bb2e8faaee55225a5032d23102c2150aabdbe0bb..23c0dde545ac02b73f261792930488de08245846 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -14,10 +14,9 @@ Projects
 * The [Relativistic Programming research wiki](http://wiki.cs.pdx.edu/rp).
 * [Debian-IN](http://debian-in.alioth.debian.org/)
 * [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/)
 * The [Relativistic Programming research wiki](http://wiki.cs.pdx.edu/rp).
 * [Debian-IN](http://debian-in.alioth.debian.org/)
 * [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/)

-* [Webconverger.org](http://webconverger.org/)
+* [Webconverger](http://webconverger.org/) (a Web only linux distribution) with a [blog](http://webconverger.org/blog/)

 * [debian-community.org](http://debian-community.org/)
 * The [cairo graphics library](http://cairographics.org/) website.
 * [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 ([[rcs/Git]] backend).
 * [DebTorrent](http://debtorrent.alioth.debian.org)
 * The [netconf project](http://netconf.alioth.debian.org)
 * The [Portland State Aerospace Society](http://psas.pdx.edu) website.  Converted from a combination of TWiki and MoinMoin to ikiwiki, including full history ([[rcs/Git]] backend).
 * [DebTorrent](http://debtorrent.alioth.debian.org)
 * The [netconf project](http://netconf.alioth.debian.org)


@@ -25,6 +24,7 @@ Projects
 * 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 [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.

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

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


@@ -80,6 +80,7 @@ Personal sites and blogs
 * [Paul Wise's homepage and blog](http://bonedaddy.net/pabs3/)
 * [Martin's PhD wiki](http://phd.martin-krafft.net/wiki)
 * [David Riebenbauer's page](http://liegesta.at/)
 * [Paul Wise's homepage and blog](http://bonedaddy.net/pabs3/)
 * [Martin's PhD wiki](http://phd.martin-krafft.net/wiki)
 * [David Riebenbauer's page](http://liegesta.at/)

+* [Thomas Harning's 'eHarning' wiki](http://www.eharning.us/wiki/)

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