Merge branch 'doc_tweaks_maint' of https://github.com/PhilipElson/matplotlib into PhilipElson-doc_tweaks_maint

Author: WeatherGod

doc/api/sankey_api.rst

@@ -4,7 +4,7 @@ sankey
 
 
 :mod:`matplotlib.sankey`
-=======================
+========================
 
 .. automodule:: matplotlib.sankey
    :members:

doc/devel/gitwash/git_links.inc

@@ -20,26 +20,26 @@
 .. _git svn crash course: http://git-scm.com/course/svn.html
 .. _learn.github: http://learn.github.com/
 .. _network graph visualizer: http://github.com/blog/39-say-hello-to-the-network-graph-visualizer
-.. _git user manual: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
-.. _git tutorial: http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
+.. _git user manual: http://schacon.github.com/git/user-manual.html
+.. _git tutorial: http://schacon.github.com/git/gittutorial.html
 .. _git community book: http://book.git-scm.com/
 .. _git ready: http://www.gitready.com/
 .. _git casts: http://www.gitcasts.com/
 .. _Fernando's git page: http://www.fperez.org/py4science/git.html
 .. _git magic: http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html
 .. _git concepts: http://www.eecs.harvard.edu/~cduan/technical/git/
-.. _git clone: http://www.kernel.org/pub/software/scm/git/docs/git-clone.html
-.. _git checkout: http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
-.. _git commit: http://www.kernel.org/pub/software/scm/git/docs/git-commit.html
-.. _git push: http://www.kernel.org/pub/software/scm/git/docs/git-push.html
-.. _git pull: http://www.kernel.org/pub/software/scm/git/docs/git-pull.html
-.. _git add: http://www.kernel.org/pub/software/scm/git/docs/git-add.html
-.. _git status: http://www.kernel.org/pub/software/scm/git/docs/git-status.html
-.. _git diff: http://www.kernel.org/pub/software/scm/git/docs/git-diff.html
-.. _git log: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
-.. _git branch: http://www.kernel.org/pub/software/scm/git/docs/git-branch.html
-.. _git remote: http://www.kernel.org/pub/software/scm/git/docs/git-remote.html
-.. _git config: http://www.kernel.org/pub/software/scm/git/docs/git-config.html
+.. _git clone: http://schacon.github.com/git/git-clone.html
+.. _git checkout: http://schacon.github.com/git/git-checkout.html
+.. _git commit: http://schacon.github.com/git/git-commit.html
+.. _git push: http://schacon.github.com/git/git-push.html
+.. _git pull: http://schacon.github.com/git/git-pull.html
+.. _git add: http://schacon.github.com/git/git-add.html
+.. _git status: http://schacon.github.com/git/git-status.html
+.. _git diff: http://schacon.github.com/git/git-diff.html
+.. _git log: http://schacon.github.com/git/git-log.html
+.. _git branch: http://schacon.github.com/git/git-branch.html
+.. _git remote: http://schacon.github.com/git/git-remote.html
+.. _git config: http://schacon.github.com/git/git-config.html
 .. _why the -a flag?: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
 .. _git staging area: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
 .. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git

doc/faq/installing_faq.rst

@@ -366,4 +366,4 @@ a single click installer.
 * The Enthought Python Distribution `EPD
   <http://www.enthought.com/products/epd.php>`_
 
-* `python (x, y) <http://www.pythonxy.com/foreword.php>`_
+* `python (x, y) <http://www.pythonxy.com>`_

doc/users/intro.rst

@@ -70,7 +70,7 @@ nothing about output.  The *backends* are device dependent drawing
 devices, aka renderers, that transform the frontend representation to
 hardcopy or a display device (:ref:`what-is-a-backend`).  Example
 backends: PS creates `PostScript®
-<http://http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
+<http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
 creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
 hardcopy, Agg creates PNG output using the high quality `Anti-Grain
 Geometry <http://www.antigrain.com>`_ library that ships with

doc/users/transforms_tutorial.rst

@@ -112,6 +112,7 @@ documentation figure size defaults are different.
 
 
 .. note::
+
   If you run the source code in the example above in a GUI backend,
   you may also find that the two arrows for the `data` and `display`
   annotations do not point to exactly the same point.  This is because

examples/api/demo_affine_image.py

@@ -35,7 +35,7 @@ def imshow_affine(ax, z, *kl, **kwargs):
 
     ax1 = plt.subplot(121)
     Z = get_image()
-    im1 = imshow_affine(ax1, Z, interpolation='nearest', cmap=cm.jet,
+    im1 = imshow_affine(ax1, Z, interpolation='none', cmap=cm.jet,
                         origin='lower',
                         extent=[-2, 4, -3, 2], clip_on=True)
 
@@ -56,7 +56,7 @@ def imshow_affine(ax, z, *kl, **kwargs):
     # image skew
 
     ax2 = plt.subplot(122)
-    im2 = ax2.imshow(Z, interpolation='nearest', cmap=cm.jet,
+    im2 = ax2.imshow(Z, interpolation='none', cmap=cm.jet,
                      origin='lower',
                      extent=[-2, 4, -3, 2], clip_on=True)
     im2._image_skew_coordinate = (3, -2)

examples/event_handling/lasso_demo.py

@@ -8,7 +8,6 @@
 inside polygon detection routine.
 """
 from matplotlib.widgets import Lasso
-import matplotlib.mlab
 from matplotlib.nxutils import points_inside_poly
 from matplotlib.colors import colorConverter
 from matplotlib.collections import RegularPolyCollection

lib/matplotlib/__init__.py

@@ -902,14 +902,20 @@ def use(arg, warn=True):
 
     will specify a default of pdf output generated by Cairo.
 
-    Note: this function must be called *before* importing pylab for
-    the first time; or, if you are not using pylab, it must be called
-    before importing matplotlib.backends.  If warn is True, a warning
-    is issued if you try and callthis after pylab or pyplot have been
-    loaded.  In certain black magic use cases, eg
-    pyplot.switch_backends, we are doing the reloading necessary to
-    make the backend switch work (in some cases, eg pure image
-    backends) so one can set warn=False to supporess the warnings
+    .. note::
+
+        This function must be called *before* importing pyplot for
+        the first time; or, if you are not using pyplot, it must be called
+        before importing matplotlib.backends.  If warn is True, a warning
+        is issued if you try and call this after pylab or pyplot have been
+        loaded.  In certain black magic use cases, e.g.
+        :func:`pyplot.switch_backends`, we are doing the reloading necessary to
+        make the backend switch work (in some cases, e.g. pure image
+        backends) so one can set warn=False to supporess the warnings.
+
+    To find out which backend is currently set, see
+    :func:`matplotlib.get_backend`.
+
     """
     if 'matplotlib.backends' in sys.modules:
         if warn: warnings.warn(_use_error_msg)
@@ -929,7 +935,7 @@ def use(arg, warn=True):
     rcParams['backend'] = name
 
 def get_backend():
-    "Returns the current backend"
+    "Returns the current backend."
     return rcParams['backend']
 
 def interactive(b):