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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index cfd656ed49c865b3baa2312d64a7730e98b1a61d..b0438c7b4d5e9ec178775a363f227e5847f23d75 100644 (file)
--- 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/)

diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index af3634e13b0aa3a8b02d62494e2614c1d5cb373e..04a5e1556aa5de6f5cfe3b83fc6383c9bc269a04 100644 (file)
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -1,4 +1,4 @@
-# NAME
+# SAMSUN
 
 ikiwiki - a wiki compiler