doc updated

doc/install.txt

@@ -799,11 +799,11 @@ note that you must first register to it, by going to `theano-users`_).
 Windows
 -------
 
-:ref:`install_windows` provides step-by-step instructions on how to install Theano on 32- or 64-bit Windows system, using freely available
+:ref:`install_windows` provides step-by-step instructions on how to install Theano on 32- or 64-bit Windows systems, using freely available
 tools and compilers.
 
 Editing code in Visual Studio
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You will find a Visual Studio solution file (``Theano.sln``) in the root of
 the Theano repository. Note that this project file may not be kept up-to-date
@@ -815,7 +815,7 @@ the Visual Studio editor.
 
 
 Windows Installation References
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 1. http://stackoverflow.com/questions/9047072/windows-python-version-and-vc-redistributable-version
 2. http://stackoverflow.com/questions/1865069/how-to-compile-a-64-bit-application-using-visual-c-2010-express

doc/install_windows.txt

@@ -29,7 +29,7 @@ Visual Studio and CUDA
 
 Unfortunately Microsoft recently stopped distributing Visual Studio
 Express 2008 (the compilers required for Python 2.7 are provided,
-though) and we require a temporary install of Visual Studio Express
+though), therefore we require a temporary install of Visual Studio Express
 2010 to be able to install CUDA (its installer requires a Visual
 Studio installation to proceed). Afterwards, the Visual Studio 2010
 can be safely removed. If someone knows how to install CUDA 5.5
@@ -51,10 +51,10 @@ doesn't provide a 64bit compiler. To get one download and install the
 <http://msdn.microsoft.com/en-us/windowsserver/bb980924.aspx>`_.
 
 Now you have a running (and free even for commercial use) installation
-of MSVS2010 ide wiht 32- and 64-bit compilers.
+of MSVS2010 IDE with 32- and 64-bit compilers.
 
 Once Visual Studio is installed, you can install CUDA. We recommend
-CUDA 5.5, as it supports MSVC 2008. Download the CUDA installer form
+CUDA 5.5, as it supports MSVC 2008. Download the CUDA installer from
 `the CUDA archive
 <https://developer.nvidia.com/cuda-toolkit-55-archive>`_. Be sure to
 get 32-, or 64-bit version depending on your system configuration.
@@ -118,7 +118,7 @@ If you are working in academia, an easy way to install most of the
 dependencies is to install `Enthought Python Distribution (EPD) <http://enthought.com/products/epd.php>`_.
 If you are affiliated with a university (as student or employee), you can
 download the installation for free.
-EPD installation includes in particular Python (and the development headers),
+EPD installation includes, in particular, Python (and the development headers),
 NumPy, SciPy, nose, sphinx, easy_install, pydot (but *not* `Graphviz`_, which is
 necessary for it to work), g++, and the MKL
 implementation of blas.
@@ -150,7 +150,7 @@ pip is not included in EPD, but you can simply install it with::
 Alternative: Canopy
 +++++++++++++++++++
 
-Another software from Enthought that installs all Theano dependencies.
+Canopy is another software that installs all Theano dependencies.
 If you are affiliated with a university (as student or employee), you
 can download the installation for free.
 
@@ -178,7 +178,7 @@ and 64-bit), including all dependencies of Theano. If you are not
 eligible for a download of EPD or Canopy (via a commercial, or free academic
 licence), this is the easiest way to install
 Theano's dependencies. Simply download and execute the installer from
-`AnacondaCE downlowad page <http://continuum.io/anacondace.html>`__,
+`AnacondaCE download page <http://continuum.io/anacondace.html>`__,
 then download and execute the :ref:`windows_anaconda`.
 
 .. _ContinuumIO: http://continuum.io
@@ -218,7 +218,7 @@ MinGW, but this has not been tested yet.
   it for instance to ``C:\mingw64``. Also download MSYS from
   `this page <http://sourceforge.net/projects/mingw-w64/files/External%20binary%20packages%20%28Win64%20hosted%29/MSYS%20%2832-bit%29/>`__
   (although it is a 32-bit version of MSYS, this does not matter since it is only
-  a convenience tool). Extract MSYS into the same folder, so that for instance you
+  a convenience tool). Extract MSYS into the same folder, so that, for instance you
   end up with ``C:\mingw64\msys``. Run ``C:\mingw64\msys\msys.bat`` and in the MSYS
   shell, type
 
@@ -283,19 +283,14 @@ MinGW, but this has not been tested yet.
 
         python setup.py install
 
-At this point, whether you installed Python(x,y) or individual components, you
-should have MinGW, Python, Numpy, SciPy and Nose installed.
 
 
-Git Version Control
-###################
 
-Theano is hosted on GitHub, you need GIT to download it. For Windows,
-download and install the `MSYSGIT <http://msysgit.github.io/>`_ build.
 
 Configuring the Environment
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+At this point, you should have installed all Theano dependencies.
 By default neither Python, GCC, nor Visual Studio was added to the
 PATH. Save the following shell script as ``c:\scisoft\env.bat`` to
 configure the system path:
@@ -354,6 +349,9 @@ GIT is also possible.
 Git Install
 ###########
 
+
+Theano is hosted on GitHub, you need GIT to download it. For Windows,
+download and install the `MSYSGIT <http://msysgit.github.io/>`_ build.
 Open up the `Git Shell` in the directory in which you want to install
 Theano. For the bleeding-edge version execute
 
@@ -388,7 +386,7 @@ downloading the `zip
 Configuring Theano
 ##################
 
-Once you have fetched Theano, open the Python Shell
+Once you have installed Theano, open the Python Shell
 (e.g. ``c:\scisoft\env.bat`` if you follow the installation directories
 from this tutorial) and ``cd`` to it. Then run::
 
@@ -421,11 +419,36 @@ Create a test file containing:
                                               np_end-np_start, t_end-t_start)
    print "Result difference: %f" % (np.abs(AB-tAB).max(), )
 
-Then run it. It should execute without problems and the theano function
+Then run it. It should execute without problems and the Theano function
 should run at a speed similar to the regular numpy
 multiplication. (Both Numpy and Theano should call the same BLAS
 routine for matrix multiplication)
 
+Running Theano's test-suite
++++++++++++++++++++++++++
+
+Currently, due to memory fragmentation issue in Windows, the
+test-suite breaks at some point when using ``theano-nose``, with many error
+messages looking
+like: ``DLL load failed: Not enough storage is available to process this
+command``. As a workaround, you can instead run:
+
+    .. code-block:: bash
+
+        theano-nose --batch
+
+This will run tests in batches of 100, which should avoid memory errors.
+Note that this script calls ``nosetests``, which may require being run from
+within an MSYS shell if you installed Nose manually as described above.
+
+.. note::
+
+    In Theano versions <= 0.5, ``theano-nose`` was not included.  If you
+    are working with such a version, you can call this command instead:
+
+    .. code-block:: bash
+
+        python theano/tests/run_tests_in_batch.py
 
 Configure Theano for GPU use
 ############################
@@ -456,31 +479,6 @@ You can also find additional test code and useful GPU tips on the
 
 
 
-Running Theano test-suite
-+++++++++++++++++++++++++
-
-Currently, due to memory fragmentation issue in Windows, the
-test-suite breaks at some point when using ``theano-nose``, with many error
-messages looking
-like: ``DLL load failed: Not enough storage is available to process this
-command``. As a workaround, you can instead run:
-
-    .. code-block:: bash
-
-        theano-nose --batch
-
-This will run tests in batches of 100, which should avoid memory errors.
-Note that this script calls ``nosetests``, which may require being run from
-within an MSYS shell if you installed Nose manually as described above.
-
-.. note::
-
-    In Theano versions <= 0.5, ``theano-nose`` was not included.  If you
-    are working with such a version, you can call this command instead:
-
-    .. code-block:: bash
-
-        python theano/tests/run_tests_in_batch.py
 
 
 Compiling a faster BLAS
@@ -547,7 +545,7 @@ follows:
      Note that this setup does not add ``wget`` into the system PATH, so you
      will need to modify the ``PATH`` environment variable accordingly (either in
      Windows or in a ``.profile`` startup file in your MinGW home). Once this is done,
-     type ``wget --version`` in a MinGW shell to verify that it is working
+     type ``wget --version`` in a MinGW shell to verify that it is running
      properly. Note also that if you are behind a proxy, you should set up your
      ``HTTP_PROXY`` environment variable, or use a custom ``wgetrc`` config file
      for wget to be able to download files.