revise windows installation instructions to use the site of Gohlke

content/install.txt

@@ -250,35 +250,29 @@ provided by Christoph Gohlke.  To install Kwant on Windows
 
    (Instead of typing this command, you can also just copy it from here and
    paste it into the command prompt window). If you did not use the default
-   location to install python in step 2, then replace ``C:\Python27`` by the
-   actual location where python is installed.
+   location to install Python in step 2, then replace ``C:\Python27`` by the
+   actual location where Python is installed.
 
-5. Reboot your computer
+5. Reboot your computer.
 
-6. Now open a command prompt with administrator rights, as described in
+6. Download the necessary packages (with the ending ``.whl``) for your
+   operating system (32 or 64 bit) and Python version (e.g. ``cp27`` for Python
+   2.7) from the website of `Christoph Gohlke
+   <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_.  For Kwant, we recommend to download at least `NumPy <http://www.lfd.uci.edu/~gohlke/pythonlibs/#numpy>`_, `SciPy <http://www.lfd.uci.edu/~gohlke/pythonlibs/#scipy>`_, `Matplotlib <http://www.lfd.uci.edu/~gohlke/pythonlibs/#matplotlib>`_, `Nose <http://www.lfd.uci.edu/~gohlke/pythonlibs/#nose>`_, `Tinyarray <http://www.lfd.uci.edu/~gohlke/pythonlibs/#tinyarray>`_, and `Kwant <http://www.lfd.uci.edu/~gohlke/pythonlibs/#kwant>`_ itself.
+
+7. Now open a command prompt with administrator rights, as described in
    "How do I run a command with elevated permissions" at the
    `Microsoft Windows website <http://windows.microsoft.com/en-us/windows/command-prompt-faq>`_.
 
-   In this new command prompt window, execute::
-
-       pip install -U pip
-       pip install pyreadline
-       pip install --find-links http://downloads.kwant-project.org/gohlke-mirror/ ^
-       --trusted-host downloads.kwant-project.org --no-index numpy scipy ^
-       matplotlib ipython tornado pyzmq jinja2 nose tinyarray kwant
-
-   Now you are done!
-
-If you want to run ipython notebook, open a command prompt (no need for
-Adminstrator rights this time), and type::
+   In this new command prompt window, execute ::
 
-    ipython notebook
+       pip install <filename>
 
-If you wish to install later other python packages form the website of
-`Christoph Gohlke <http://www.lfd.uci.edu/~gohlke/pythonlibs/>`_, download
-the package (with the ending ``.whl``) for your operating system (32 or 64 bit)
-and install it from a command prompt as::
+   for each of the downloaded files (replacing ``<filename>`` with it).
 
-    pip install filename
+   Now you are done, you can ``import kwant`` from within Python scripts.
 
-where filename is the name of the downloaded file.
+(Note that many other userful scientific packages are available in Gohlke’s
+repository.  For example, you might want to install `IPython
+<http://www.lfd.uci.edu/~gohlke/pythonlibs/#ipython>`_ and its various
+dependencies so that you can use the `IPython notebook <http://ipython.org/notebook.html>`_.)