Merge commit 'upstream/master' into pub/po

[git.ikiwiki.info.git] / doc / users / xma.mdwn

diff --git a/doc/users/xma.mdwn b/doc/users/xma.mdwn
index 782b6eab6ca3af9dbb1de37f7e9fad0bb99e6355..89f2ff74c294bc70c3d3d11a3c0cdaa46a902fa1 100644 (file)
--- a/doc/users/xma.mdwn
+++ b/doc/users/xma.mdwn
@@ -9,7 +9,7 @@ Anyway, [[ikiwiki]] is really *awesome* !
 
 ## More about me
 
-I am CLI user living in the linux console. More precisely, I live in an [[GNU Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]].
+I am CLI user living in the linux console. More precisely, I live in an [[GNU_Emacs]] frame all day long. My main computer is an EeePC 901 running Slackware GNU/Linux 12.1. I do not have X installed (too lazy) but when in X, I am running an instance of [[CLFSWM]].
 
 ## Contacting me
 
@@ -20,3 +20,9 @@ Various channels to contact me:
 - mobile: +33 621-964-362 (I only anwser to people I know though)
 
 Voila.
+
+## Plans
+
+I am planning to make a presentation of [[ikiwiki]]to my [local LUG](http://lolica.org) for our next montly meeting. Any help would be greatly appreciated.
+
+We are discussing to replace our old unmaintained (and unmaintainable) [SPIP](http://spip.net) website with a wiki. This is why I would like using ikiwiki ;)