Merge pull request matplotlib#5818 from jenshnielsen/151docupdates

DOC: Update docs for 1.5.1

Author: tacaswell

INSTALL

@@ -190,28 +190,31 @@ Required Dependencies
 :term:`numpy` |minimum_numpy_version| (or later)
     array support for python (`download numpy <http://numpy.org>`_)
 
+`setuptools <http://pythonhosted.org/setuptools/>`__
+    Setuptools provides extensions for python package installation.
+
 :term:`dateutil` 1.1 or later
     Provides extensions to python datetime handling.  If using pip,
     easy_install or installing from source, the installer will attempt
     to download and install `python_dateutil` from PyPI.
 
-`pyparsing`
+`pyparsing <https://pyparsing.wikispaces.com/>`__
     Required for matplotlib's mathtext math rendering support.  If
     using pip, easy_install or installing from source, the installer
     will attempt to download and install `pyparsing` from PyPI.
 
-libpng 1.2 (or later)
+`libpng 1.2 (or later) <http://www.libpng.org>`__
     library for loading and saving :term:`PNG` files (`download
     <http://www.libpng.org/pub/png/libpng.html>`__). libpng requires
     zlib.
 
-`pytz`
-    Used to manipulate time-zone aware datetimes.
+`pytz <http://pytz.sourceforge.net/>`__
+    Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
 
 :term:`freetype` 2.3 or later
     library for reading true type font files.
 
-``cycler`` 0.9 or later
+`cycler <http://matplotlib.org/cycler/>`__ 0.9 or later
    Composable cycle class used for constructing style-cycles
 
 
@@ -239,11 +242,11 @@ backends and the capabilities they provide.
 
 Optional external programs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
-ffmpeg/avconv or mencoder
+`ffmpeg <https://www.ffmpeg.org/>`__/`avconv <https://libav.org/avconv.html>`__ or `mencoder <http://www.mplayerhq.hu/design7/news.html>`__
     Required for the animation module to be save out put to movie
     formats.
 
-ImageMagick
+`ImageMagick <http://www.imagemagick.org/>`__
     Required for the animation module to be able to save to animated gif.
 
 Optional dependencies
@@ -253,7 +256,7 @@ Optional dependencies
     If Pillow is installed, matplotlib can read and write a larger
     selection of image file formats.
 
-pkg-config
+`pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>`__
     A tool used to find required non-python libraries.  This is not strictly
     required, but can make installation go more smoothly if the libraries and
     headers are not in the expected locations.

doc/_templates/index.html

@@ -181,8 +181,7 @@ <h1>Open source</h1>
 Please
 consider <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=X9T4KLZT2794S">donating
 to the matplotlib project</a> through the Numfocus organization or to
-the <a href="http://numfocus.org/johnhunter/">John Hunter Memorial
-Fund</a>.
+the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
 </p>
 
 <p>
@@ -195,6 +194,13 @@ <h1>Open source</h1>
 who have made significant <a href="{{ pathto('users/credits') }}">contributions</a>.
 </p>
 
+<p>
+Matplotlib is hosted on <a href="https://github.com/matplotlib/matplotlib">Github</a>.
+<a href="https://github.com/matplotlib/matplotlib/issues">Issues</a> and
+<a href="https://github.com/matplotlib/matplotlib/pulls">Pull requests</a>
+are tracked at Github too.
+</p>
+
 
 <div class="footnote"><p>
 <sup><a name="ftn.matlab" href="#matlab">*</a></sup>

doc/faq/usage_faq.rst

@@ -417,14 +417,16 @@ a file:
 ============   ================================================================
 Backend        Description
 ============   ================================================================
-GTKAgg         Agg rendering to a :term:`GTK` 2.x canvas (requires PyGTK_)
-GTK3Agg        Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_)
+GTKAgg         Agg rendering to a :term:`GTK` 2.x canvas (requires PyGTK_ and
+               pycairo_ or cairocffi_; Python2 only)
+GTK3Agg        Agg rendering to a :term:`GTK` 3.x canvas (requires PyGObject_
+               and pycairo_ or cairocffi_)
 GTK            GDK rendering to a :term:`GTK` 2.x canvas (not recommended)
-               (requires PyGTK_)
+               (requires PyGTK_ and pycairo_ or cairocffi_; Python2 only)
 GTKCairo       Cairo rendering to a :term:`GTK` 2.x canvas (requires PyGTK_
-               and pycairo_)
+               and pycairo_ or cairocffi_; Python2 only)
 GTK3Cairo      Cairo rendering to a :term:`GTK` 3.x canvas (requires PyGObject_
-               and pycairo_)
+               and pycairo_ or cairocffi_)
 WXAgg          Agg rendering to to a :term:`wxWidgets` canvas
                (requires wxPython_)
 WX             Native :term:`wxWidgets` drawing to a :term:`wxWidgets` Canvas
@@ -446,11 +448,31 @@ macosx         Cocoa rendering in OSX windows
 .. _PyGTK: http://www.pygtk.org
 .. _PyGObject: https://live.gnome.org/PyGObject
 .. _pycairo: http://www.cairographics.org/pycairo/
+.. _cairocffi: https://pythonhosted.org/cairocffi/
 .. _wxPython: http://www.wxpython.org/
 .. _TkInter: http://wiki.python.org/moin/TkInter
 .. _PyQt4: http://www.riverbankcomputing.co.uk/software/pyqt/intro
 .. _PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro
 
+WX backends
+===========
+
+At present the release version of `wxPython` (also known as wxPython classic)
+does not support python3. A work in progress redesigned version known as
+wxPython-Phoenix_ does support python3.
+Matplotlib should work with both versions.
+
+.. _wxPython-Phoenix: http://wxpython.org/Phoenix/docs/html/main.html
+
+GTK and Cairo
+=============
+
+Both `GTK2` and `GTK3` have implicit dependencies on PyCairo regardless of the
+specific Matplotlib backend used. Unfortunatly the latest release of PyCairo
+for Python3 does not implement the Python wrappers needed for the `GTK3Agg`
+backend. `Cairocffi` can be used as a replacement which implements the correct
+wrapper.
+
 How do I select PyQt4 or PySide?
 ========================================