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

[ikiwiki.git] / doc / users / Gianpaolo_Macario.mdwn

diff --git a/doc/users/Gianpaolo_Macario.mdwn b/doc/users/Gianpaolo_Macario.mdwn
index 3abd0b09a16e2698ab89247e4f7f3aa8b4b05b33..203d75d28a0bce850dc8eb98d72d909697f37875 100644 (file)
--- a/doc/users/Gianpaolo_Macario.mdwn
+++ b/doc/users/Gianpaolo_Macario.mdwn
@@ -1,10 +1,14 @@
 Just started learning Ikiwiki...
 
-I have been using MediaWiki for a long time, now I would like to switch to Ikiwiki because of:
+I have been using [MediaWiki](http://www.mediawiki.org/wiki/MediaWiki) for a long time, now I would like to switch to [Ikiwiki](http://ikiwiki.info/) because of:
 
 + git backend
 + MarkDown syntax
 
 I have browsed <http://www.wikimatrix.org/compare/ikiwiki+MediaWiki>, but I am still not sure about which useful features (if any) I would miss from MediaWiki...
 
-So the best way is to actually trying it, isn't it?
+So the best way is actually trying it, isn't it?
+
+I would also try integrating Ikiwiki with [Infinote](http://infinote.org/) (or perhaps [jinfinote](http://www.jinfinote.com/)), in order to allow concurrent editing of pages.
+
+-- [Gianpaolo Macario](http://gmacario.altervista.org/)