Merge branch 'v1.4.x' into master

Author: efiring

INSTALL

@@ -9,19 +9,36 @@ Installing
 There are many different ways to install matplotlib, and the best way
 depends on what operating system you are using, what you already have
 installed, and how you want to use it.  To avoid wading through all
-the details (and potential complications) on this page, the easiest
-thing for you to do is use one of the pre-packaged python
-distributions that already provide matplotlib built-in.  The Continuum.io
-Python distribution `(Anaconda)
-<https://store.continuum.io/cshop/anaconda/>`_ and the Enthought
-distribution `(Canopy) <https://www.enthought.com/products/canopy/>`_
-are both excellent choices that "just work" out of the box for any
-platform.  Both of these packages include matplotlib and
-*lots* of other useful tools.
-Another excellent alternative for Windows users is `Python (x, y)
-<https://code.google.com/p/pythonxy>`_ . matplotlib is also packaged for almost
-every major Linux distribution. So if you are on Linux, your package
-manager will probably provide matplotlib prebuilt.
+the details (and potential complications) on this page, there are several
+convenient options.
+
+Most platforms : scientific Python distributions
+================================================
+
+The first option is to use one of the pre-packaged python distributions that
+already provide matplotlib built-in.  The Continuum.io Python distribution
+`(Anaconda) <https://store.continuum.io/cshop/anaconda/>`_ and the Enthought
+distribution `(Canopy) <https://www.enthought.com/products/canopy/>`_ are both
+excellent choices that "just work" out of the box for Windows, OSX and common
+Linux platforms.  Both of these distributions include matplotlib and *lots* of
+other useful tools.  Another excellent alternative for Windows users is
+`Python (x, y) <https://code.google.com/p/pythonxy>`_ .
+
+Linux : using your package manager
+==================================
+
+If you are on Linux, you might prefer to use your package manager.  matplotlib
+is packaged for almost every major Linux distribution.
+
+* Debian / Ubuntu : ``sudo apt-get install python-matplotlib``
+* Fedora / Redhat : ``sudo yum install python-matplotlib``
+
+Mac OSX - using pip
+===================
+
+If you are on Mac OSX you can probably install matplotlib binaries using the
+standard Python installation program `pip <https://pypi.python.org/pip>`_.
+See :ref:`installing-osx-binaries`.
 
 Manually installing pre-built packages
 ======================================
@@ -36,7 +53,7 @@ on your machine, and if not, install it.  The official python builds
 are available for download `here <http://www.python.org/download>`_,
 but OS X users please read :ref:`which-python-for-osx`.
 
-Once you have python up and running, you will need to install `numpy
+Once you have Python up and running, you will need to install `numpy
 <http://www.numpy.org/>`_.  numpy provides high-performance array data
 structures and mathematical functions, and is a requirement for
 matplotlib.  You can test your progress::
@@ -87,7 +104,6 @@ python console, there are some issues relating to user interface
 toolkits and interactive settings that are discussed in
 :ref:`mpl-shell`.
 
-
 Installing on Windows
 ---------------------
 
@@ -207,7 +223,7 @@ manager on Linux, you may need to install the development packages
 
 .. note::
 
-    If you are on debian/ubuntu, you can get all the dependencies
+    If you are on Debian/Ubuntu, you can get all the dependencies
     required to build matplotlib with::
 
       sudo apt-get build-dep python-matplotlib

doc/api/artist_api.rst

@@ -4,7 +4,7 @@
 artists
 *******
 
-.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text matplotlib.offsetbox
+.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text matplotlib.offsetbox matplotlib.image
    :parts: 2
 
 :mod:`matplotlib.artist`
@@ -15,36 +15,3 @@ artists
    :undoc-members:
    :show-inheritance:
 
-
-:mod:`matplotlib.lines`
-=======================
-
-.. automodule:: matplotlib.lines
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-:mod:`matplotlib.patches`
-=========================
-
-.. automodule:: matplotlib.patches
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-:mod:`matplotlib.text`
-======================
-
-.. automodule:: matplotlib.text
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-
-:mod:`matplotlib.offsetbox`
-===========================
-
-.. automodule:: matplotlib.offsetbox
-   :members:
-   :undoc-members:
-   :show-inheritance:

doc/api/image_api.rst

@@ -0,0 +1,12 @@
+*****
+image
+*****
+
+
+:mod:`matplotlib.image`
+=======================
+
+.. automodule:: matplotlib.image
+   :members:
+   :undoc-members:
+   :show-inheritance:

doc/api/index.rst

@@ -31,15 +31,20 @@
    finance_api.rst
    font_manager_api.rst
    gridspec_api.rst
+   image_api.rst
    legend_api.rst
+   lines_api.rst
    markers_api.rst
    mathtext_api.rst
    mlab_api.rst
+   offsetbox_api.rst
+   patches_api.rst
    path_api.rst
    patheffects_api.rst
    pyplot_api.rst
    sankey_api.rst
    spines_api.rst
+   text_api.rst
    ticker_api.rst
    tight_layout_api.rst
    tri_api.rst

doc/api/lines_api.rst

@@ -0,0 +1,12 @@
+*****
+lines
+*****
+
+
+:mod:`matplotlib.lines`
+=======================
+
+.. automodule:: matplotlib.lines
+   :members:
+   :undoc-members:
+   :show-inheritance:

doc/api/offsetbox_api.rst

@@ -0,0 +1,12 @@
+*********
+offsetbox
+*********
+
+
+:mod:`matplotlib.offsetbox`
+===========================
+
+.. automodule:: matplotlib.offsetbox
+   :members:
+   :undoc-members:
+   :show-inheritance:

doc/api/patches_api.rst

@@ -0,0 +1,12 @@
+*******
+patches
+*******
+
+
+:mod:`matplotlib.patches`
+=========================
+
+.. automodule:: matplotlib.patches
+   :members:
+   :undoc-members:
+   :show-inheritance:

doc/api/text_api.rst

@@ -0,0 +1,12 @@
+****
+text
+****
+
+
+:mod:`matplotlib.text`
+=======================
+
+.. automodule:: matplotlib.text
+   :members:
+   :undoc-members:
+   :show-inheritance:

doc/faq/howto_faq.rst

@@ -41,11 +41,13 @@ You can also filter on class instances::
 
 
 .. _howto-supress_offset:
+
 How to prevent ticklabels from having an offset
 -----------------------------------------------
 The default formatter will use an offset to reduce
 the length of the ticklabels.  To turn this feature
 off on a per-axis basis::
+
    ax.get_xaxis().get_major_formatter().set_useOffset(False)
 
 set the rcParam ``axes.formatter.useoffset``, or use a different
@@ -385,6 +387,7 @@ pyplot::
 
 
 .. seealso::
+
     :ref:`howto-webapp` for information about running matplotlib inside
     of a web application.
 
@@ -581,7 +584,8 @@ enabled, you may get errors if you don't configure matplotlib for use
 in these environments.  Most importantly, you need to decide what
 kinds of images you want to generate (PNG, PDF, SVG) and configure the
 appropriate default backend.  For 99% of users, this will be the Agg
-backend, which uses the C++ `antigrain <http://antigrain.com>`_
+backend, which uses the C++
+`antigrain <http://agg.sourceforge.net/antigrain.com/index.html>`_
 rendering engine to make nice PNGs.  The Agg backend is also
 configured to recognize requests to generate other output formats
 (PDF, PS, EPS, SVG).  The easiest way to configure matplotlib to use
@@ -615,7 +619,7 @@ or by saving to a file handle::
     import sys
     fig.savefig(sys.stdout)
 
-Here is an example using `Pillow <http://python-imaging.github.io/>__.
+Here is an example using `Pillow <http://python-imaging.github.io/>`_.
 First, the figure is saved to a StringIO object which is then fed to
 Pillow for further processing::