Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 59037fb

Browse files
Phil Elsonmdboom
Phil Elson
authored and
mdboom
committed
Misc doc changes applied to the maintenance branch.
1 parent 629749d commit 59037fb

20 files changed

+204
-187
lines changed

‎doc/api/sankey_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sankey
44

55

66
:mod:`matplotlib.sankey`
7-
=======================
7+
========================
88

99
.. automodule:: matplotlib.sankey
1010
:members:

‎doc/devel/gitwash/git_links.inc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
.. _git svn crash course: http://git-scm.com/course/svn.html
2121
.. _learn.github: http://learn.github.com/
2222
.. _network graph visualizer: http://github.com/blog/39-say-hello-to-the-network-graph-visualizer
23-
.. _git user manual: http://www.kernel.org/pub/software/scm/git/docs/user-manual.html
24-
.. _git tutorial: http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html
23+
.. _git user manual: http://schacon.github.com/git/user-manual.html
24+
.. _git tutorial: http://schacon.github.com/git/gittutorial.html
2525
.. _git community book: http://book.git-scm.com/
2626
.. _git ready: http://www.gitready.com/
2727
.. _git casts: http://www.gitcasts.com/
2828
.. _Fernando's git page: http://www.fperez.org/py4science/git.html
2929
.. _git magic: http://www-cs-students.stanford.edu/~blynn/gitmagic/index.html
3030
.. _git concepts: http://www.eecs.harvard.edu/~cduan/technical/git/
31-
.. _git clone: http://www.kernel.org/pub/software/scm/git/docs/git-clone.html
32-
.. _git checkout: http://www.kernel.org/pub/software/scm/git/docs/git-checkout.html
33-
.. _git commit: http://www.kernel.org/pub/software/scm/git/docs/git-commit.html
34-
.. _git push: http://www.kernel.org/pub/software/scm/git/docs/git-push.html
35-
.. _git pull: http://www.kernel.org/pub/software/scm/git/docs/git-pull.html
36-
.. _git add: http://www.kernel.org/pub/software/scm/git/docs/git-add.html
37-
.. _git status: http://www.kernel.org/pub/software/scm/git/docs/git-status.html
38-
.. _git diff: http://www.kernel.org/pub/software/scm/git/docs/git-diff.html
39-
.. _git log: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
40-
.. _git branch: http://www.kernel.org/pub/software/scm/git/docs/git-branch.html
41-
.. _git remote: http://www.kernel.org/pub/software/scm/git/docs/git-remote.html
42-
.. _git config: http://www.kernel.org/pub/software/scm/git/docs/git-config.html
31+
.. _git clone: http://schacon.github.com/git/git-clone.html
32+
.. _git checkout: http://schacon.github.com/git/git-checkout.html
33+
.. _git commit: http://schacon.github.com/git/git-commit.html
34+
.. _git push: http://schacon.github.com/git/git-push.html
35+
.. _git pull: http://schacon.github.com/git/git-pull.html
36+
.. _git add: http://schacon.github.com/git/git-add.html
37+
.. _git status: http://schacon.github.com/git/git-status.html
38+
.. _git diff: http://schacon.github.com/git/git-diff.html
39+
.. _git log: http://schacon.github.com/git/git-log.html
40+
.. _git branch: http://schacon.github.com/git/git-branch.html
41+
.. _git remote: http://schacon.github.com/git/git-remote.html
42+
.. _git config: http://schacon.github.com/git/git-config.html
4343
.. _why the -a flag?: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
4444
.. _git staging area: http://www.gitready.com/beginner/2009/01/18/the-staging-area.html
4545
.. _tangled working copy problem: http://tomayko.com/writings/the-thing-about-git

‎doc/faq/installing_faq.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,4 +366,4 @@ a single click installer.
366366
* The Enthought Python Distribution `EPD
367367
<http://www.enthought.com/products/epd.php>`_
368368

369-
* `python (x, y) <http://www.pythonxy.com/foreword.php>`_
369+
* `python (x, y) <http://www.pythonxy.com>`_

‎doc/users/intro.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ nothing about output. The *backends* are device dependent drawing
7070
devices, aka renderers, that transform the frontend representation to
7171
hardcopy or a display device (:ref:`what-is-a-backend`). Example
7272
backends: PS creates `PostScript®
73-
<http://http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
73+
<http://www.adobe.com/products/postscript/>`_ hardcopy, SVG
7474
creates `Scalable Vector Graphics <http://www.w3.org/Graphics/SVG/>`_
7575
hardcopy, Agg creates PNG output using the high quality `Anti-Grain
7676
Geometry <http://www.antigrain.com>`_ library that ships with

‎doc/users/transforms_tutorial.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ documentation figure size defaults are different.
112112

113113

114114
.. note::
115+
115116
If you run the source code in the example above in a GUI backend,
116117
you may also find that the two arrows for the `data` and `display`
117118
annotations do not point to exactly the same point. This is because

‎examples/api/demo_affine_image.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def imshow_affine(ax, z, *kl, **kwargs):
3535

3636
ax1 = plt.subplot(121)
3737
Z = get_image()
38-
im1 = imshow_affine(ax1, Z, interpolation='nearest', cmap=cm.jet,
38+
im1 = imshow_affine(ax1, Z, interpolation='none', cmap=cm.jet,
3939
origin='lower',
4040
extent=[-2, 4, -3, 2], clip_on=True)
4141

@@ -56,7 +56,7 @@ def imshow_affine(ax, z, *kl, **kwargs):
5656
# image skew
5757

5858
ax2 = plt.subplot(122)
59-
im2 = ax2.imshow(Z, interpolation='nearest', cmap=cm.jet,
59+
im2 = ax2.imshow(Z, interpolation='none', cmap=cm.jet,
6060
origin='lower',
6161
extent=[-2, 4, -3, 2], clip_on=True)
6262
im2._image_skew_coordinate = (3, -2)

‎lib/matplotlib/__init__.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -917,14 +917,20 @@ def use(arg, warn=True):
917917
918918
will specify a default of pdf output generated by Cairo.
919919
920-
Note: this function must be called *before* importing pylab for
921-
the first time; or, if you are not using pylab, it must be called
922-
before importing matplotlib.backends. If warn is True, a warning
923-
is issued if you try and callthis after pylab or pyplot have been
924-
loaded. In certain black magic use cases, eg
925-
pyplot.switch_backends, we are doing the reloading necessary to
926-
make the backend switch work (in some cases, eg pure image
927-
backends) so one can set warn=False to supporess the warnings
920+
.. note::
921+
922+
This function must be called *before* importing pyplot for
923+
the first time; or, if you are not using pyplot, it must be called
924+
before importing matplotlib.backends. If warn is True, a warning
925+
is issued if you try and call this after pylab or pyplot have been
926+
loaded. In certain black magic use cases, e.g.
927+
:func:`pyplot.switch_backends`, we are doing the reloading necessary to
928+
make the backend switch work (in some cases, e.g. pure image
929+
backends) so one can set warn=False to supporess the warnings.
930+
931+
To find out which backend is currently set, see
932+
:func:`matplotlib.get_backend`.
933+
928934
"""
929935
if 'matplotlib.backends' in sys.modules:
930936
if warn: warnings.warn(_use_error_msg)
@@ -944,7 +950,7 @@ def use(arg, warn=True):
944950
rcParams['backend'] = name
945951

946952
def get_backend():
947-
"Returns the current backend"
953+
"Returns the current backend."
948954
return rcParams['backend']
949955

950956
def interactive(b):

0 commit comments

Comments
 (0)