aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-10-21 17:57:32 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-10-21 17:57:32 -0400
commita18fea41cd562b090c77fab2d98544ba07e357a1 (patch)
tree9b7eeb9d14d1818792c7dbce2c0d1d505c30f5e7 /doc
parente75818572fff5256d16221a2b065b214d8cb9f5d (diff)
parentf1f7b9a38e5d66fb8b1e03183728de5f2b1e266b (diff)
downloadikiwiki-a18fea41cd562b090c77fab2d98544ba07e357a1.tar
ikiwiki-a18fea41cd562b090c77fab2d98544ba07e357a1.tar.gz
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc')
-rw-r--r--doc/plugins/contrib/linguas.mdwn3
-rw-r--r--doc/users/xma.mdwn6
2 files changed, 8 insertions, 1 deletions
diff --git a/doc/plugins/contrib/linguas.mdwn b/doc/plugins/contrib/linguas.mdwn
index 0c3366846..bf502606e 100644
--- a/doc/plugins/contrib/linguas.mdwn
+++ b/doc/plugins/contrib/linguas.mdwn
@@ -10,7 +10,8 @@ Download: [linguas.pm](http://ettin.org/pub/ikiwiki/linguas.pm) (2006-08-21).
Note that even though it is still available for download, this plugin is no
longer actively maintained. If you are interested in multilingual wiki pages, you
-can also take a look at other approaches such as [[todo/l10n]] or Lars Wirzenius's
+can also take a look at other approaches such as [[todo/l10n]], [[plugins/contrib/po]],
+or Lars Wirzenius's
[Static website, with translations, using IkiWiki](http://liw.iki.fi/liw/log/2007-05.html#20070528b).
Usage
diff --git a/doc/users/xma.mdwn b/doc/users/xma.mdwn
index 782b6eab6..97a8ef869 100644
--- a/doc/users/xma.mdwn
+++ b/doc/users/xma.mdwn
@@ -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 ;)