matplotlib
diff --git a/‎INSTALL‎
Lines changed: 18 additions & 13 deletions b/‎INSTALL‎
Lines changed: 18 additions & 13 deletions
diff --git a/‎doc/faq/installing_faq.rst‎
Lines changed: 2 additions & 0 deletions b/‎doc/faq/installing_faq.rst‎
Lines changed: 2 additions & 0 deletions
@@ -163,10 +163,11 @@ Build requirements
 
 These are external packages which you will need to install before
 installing matplotlib.  If you are building on OSX, see
-:ref:`build_osx`. If you are installing dependencies with a package
-manager on Linux, you may need to install the development packages
-(look for a "-dev" postfix) in addition to the libraries themselves.
-
+:ref:`build_osx`. If you are building on Windows, see
+:ref:`build_windows`. If you are installing dependencies with a
+package manager on Linux, you may need to install the development
+packages (look for a "-dev" postfix) in addition to the libraries
+themselves.
 
 Required Dependencies
 ^^^^^^^^^^^^^^^^^^^^^
@@ -197,9 +198,7 @@ six 1.3 or later
 libpng 1.2 (or later)
     library for loading and saving :term:`PNG` files (`download
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
-    zlib. If you are a Windows user, you can ignore this because we
-    build support into the matplotlib single-click installer
-
+    zlib.
 
 Optional GUI framework
 ^^^^^^^^^^^^^^^^^^^^^^
@@ -235,7 +234,7 @@ ImageMagick
 Optional dependencies
 ^^^^^^^^^^^^^^^^^^^^^
 
-`Pillow http://python-imaging.github.io/`__
+`Pillow <http://python-imaging.github.io/>`_
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
@@ -295,12 +294,18 @@ the different OSX version (e.g., 10.4 and 10.5). We recommend that you build
 the way we do for the OSX release: get the source from the tarball or the
 git repository and follow the instruction in :file:`README.osx`.
 
-.. _build_osx:
+.. _build_windows:
 
 Building on Windows
 -------------------
 
-Building for source on windows can be difficult.  Please see
-`matplotlib-windbuild
-<https://github.com/jbmohler/matplotlib-winbuild>`_ for detailed
-instructions, dependency source blobs, and helper scripts.
+The Python shipped from http://www.python.org is compiled with Visual Studio
+2008 for versions before 3.3 and Visual Studio 2010 for 3.3 and later.  Python
+extensions are recommended to be compiled with the same compiler.  The .NET
+Framework 4.0 is required for MSBuild (you'll likely have the requisite
+Framework with Visual Studio).  In addition to Visual Studio `CMake
+<http://www.cmake.org>`_ is required for building libpng.
+
+Since there is no canonical Windows package manager the build methods for
+freetype, zlib, libpng, tcl, & tk source code are documented as a build script
+at `matplotlib=winbuild <https://github.com/jbmohler/matplotlib-winbuild>`.
@@ -145,6 +145,8 @@ line script to the appropriate places.
 .. note::
    Mac OSX users please see the :ref:`build_osx` guide.
 
+   Windows users please see the :ref:`build_windows` guide.
+
 Then, if you want to update your matplotlib at any time, just do::
 
   > git pull