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

2007-11-18 17:24:01 -05:00 · 2007-11-18 17:24:01 -05:00 · 9f1e499496
parent e016a975c4 4e7abae23b
commit 9f1e499496
2 changed files with 2 additions and 2 deletions
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@ -14,7 +14,7 @@ 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/)
-* [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.
 * [Nouvelles Informations Positives Libres community](http://wiki.nipl.net/)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@ -1,4 +1,4 @@
-# NAME
+# SAMSUN

 ikiwiki - a wiki compiler