Merge remote-tracking branch 'origin/master' into development

cool-RR · cool-RR · commit 99d59911e24d · 2011-09-23T17:05:57.000+02:00
diff --git a/garlicsim/docs/intro/installation/end_users/index.txt b/garlicsim/docs/intro/installation/end_users/index.txt
@@ -24,4 +24,4 @@ way. (Currently Windows only.)
 This installer will give you :mod:`garlicsim`, :mod:`garlicsim_lib` and
 :mod:`garlicsim_wx`.
 
-A similiar end-user installer for Mac will become available in 2011.
+End-user installers for Mac and Linux will become available in the future.
