Merge branch 'development' of github.com:cool-RR/GarlicSim into development

cool-RR · cool-RR · commit b014eead650f · 2011-09-28T14:21:11.000+02:00
diff --git a/garlicsim/docs/intro/installation/developers/python-2.x.txt b/garlicsim/docs/intro/installation/developers/python-2.x.txt
@@ -39,9 +39,10 @@ For :mod:`garlicsim`
 
 * on Windows only: `Python for Windows Extensions`_.
 
-And for users of Python 2.5 only:
+For users of Python 2.5 only:
 
 * `Backport of the multiprocessing module`_.
+* `pyOpenSSL`_ is needed in order to use :class:`PiCloudCruncher`.
 
 Optional but recommended:
 
@@ -113,6 +114,7 @@ like this::
 
     c:\> c:\python26\Scripts\GarlicSim.py
     
+.. _pyOpenSSL: http://pypi.python.org/pypi/pyOpenSSL
 .. _pip: http://pypi.python.org/pypi/pip
 .. _distribute: http://pypi.python.org/pypi/distribute
 .. _Backport of the multiprocessing module: http://pypi.python.org/pypi/multiprocessing/
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.
