Merge branch 'master' into fancypodcast

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

diff --git a/doc/users/Gianpaolo_Macario.mdwn b/doc/users/Gianpaolo_Macario.mdwn
index ee2c05d2f9557528cbcbc880c75ff38d5cef642f..203d75d28a0bce850dc8eb98d72d909697f37875 100644 (file)
--- a/doc/users/Gianpaolo_Macario.mdwn
+++ b/doc/users/Gianpaolo_Macario.mdwn
@@ -7,6 +7,8 @@ I have been using [MediaWiki](http://www.mediawiki.org/wiki/MediaWiki) for a lon
 
 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...
 
 
 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 to integrate Ikiwiki with [Infinote](http://infinote.org/) (or maybe [jinfinote](http://www.jinfinote.com/)), in order to allow concurrent editing of pages.
+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/)