Merge pull request #5863 from notoraptor/update-windoc

doc/install_centos6.txt

@@ -11,6 +11,7 @@ CentOS 6 Installation Instructions
     from GitHub, please make sure you are reading `the latest version of this
     page <http://deeplearning.net/software/theano_versions/dev/install_centos6.html>`_.
 
+.. |PythonDistRecommended| replace:: The development package (python-dev or python-devel on most Linux distributions) is recommended (see just below)
 .. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2
 .. |CompilerName| replace:: ``g++``
 

doc/install_generic.inc

@@ -19,6 +19,11 @@ will be automatically installed as a dependency.
 
     conda install theano pygpu
 
+.. warning::
+
+    Last conda packages for theano (0.9) and pygpu (0.6*) currently don't support
+    Python 3.4 branch.
+
 With ``pip``
 ^^^^^^^^^^^^
 

doc/install_macos.txt

@@ -19,6 +19,7 @@ alternative instructions here.
 
 .. _theano-users: http://groups.google.com/group/theano-users?pli=1
 
+.. |PythonDistRecommended| replace:: The conda distribution is highly recommended
 .. |PlatformCompiler| replace:: ``clang`` (the system version)
 .. |CompilerName| replace:: ``Clang``
 

doc/install_ubuntu.txt

@@ -13,6 +13,7 @@ Ubuntu Installation Instructions
 
 .. _gpu_linux:
 
+.. |PythonDistRecommended| replace:: The development package (python-dev or python-devel on most Linux distributions) is recommended (see just below)
 .. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2
 .. |CompilerName| replace:: ``g++``
 

doc/install_windows.txt

@@ -11,7 +11,8 @@ Windows Installation Instructions
     from GitHub, please make sure you are reading `the latest version of this
     page <http://deeplearning.net/software/theano_versions/dev/install_windows.html>`_.
 
-.. |PlatformCompiler| replace:: ``python-dev``, ``g++`` >= 4.2
+.. |PythonDistRecommended| replace:: The conda distribution is highly recommended
+.. |PlatformCompiler| replace:: GCC compiler with ``g++`` (version >= ``4.2.*``), and Python development files
 .. |CompilerName| replace:: ``g++``
 
 .. List of requirements, optional requirements, and installation of miniconda.

doc/requirements.inc

@@ -14,10 +14,8 @@ Requirements
 .. _pycuda: https://mathema.tician.de/software/pycuda/
 .. _skcuda: http://scikit-cuda.readthedocs.io/en/latest/
 
-    Python_ == 2.7 or ( >= 3.3 and <= 3.5 )
-        The development package (python-dev or
-        python-devel on most Linux distributions) is recommended (see
-        just below). Python 2.4 was supported up to and including the
+    Python_ == 2.7* or ( >= 3.3 and < 3.6 )
+        |PythonDistRecommended|. Python 2.4 was supported up to and including the
         release 0.6. Python 2.6 was supported up to and including the
         release 0.8.2. Python 3 is supported past the 3.3 release.
 
@@ -28,7 +26,7 @@ Requirements
         Only currently required for sparse matrix and special functions support, but highly recommended. SciPy >=0.8 could work, but earlier versions have known bugs with sparse matrices.
 
     `BLAS`_ installation (with Level 3 functionality)
-        * **Recommended**: MKL, which is free through Conda.
+        * **Recommended**: MKL, which is free through Conda with ``mkl-service`` package.
         * Alternatively, we suggest to install OpenBLAS, with the development headers (``-dev``, ``-devel``, depending on your Linux distribution).
 
 **Optional requirements**

doc/requirements.txt

+.. |PythonDistRecommended| replace:: The development package (python-dev or python-devel on most Linux distributions) is recommended (see just below)
 .. |PlatformCompiler| replace:: ``g++`` (Linux and Windows), ``clang`` (OS X)
 
 .. |CompilerName| replace:: ``g++`` (Windows/Linux) or ``Clang`` (OS X)