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

Skip to content

Commit 9fc5ddc

Browse files
ddaleddale
committed
Merge branch 'v1.0.x'
2 parents 97a56f4 + 781d8fe commit 9fc5ddc

13 files changed

Lines changed: 22 additions & 61 deletions

File tree

‎doc/api/gridspec_api.rst‎

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

55

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

99
.. automodule:: matplotlib.gridspec
1010
:members:

‎doc/devel/release_guide.rst‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,7 @@ replacing 'jdh2358' with your sourceforge login.
9292

9393

9494
Any changes to fix bugs in the release candidate should be fixed in
95-
the release branch and merged into the trunk with `git merge`; see
96-
:ref:`git merge`. When the release candidate is signed off on, build
97-
the final sdist, binaries and eggs, and upload them to the sourceforge
98-
release area.
95+
the release branch and merged into the trunk.
9996

10097

10198
.. _release-uploading:

‎doc/faq/howto_faq.rst‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -525,45 +525,7 @@ Contributing: howto
525525
Submit a patch
526526
-----------------
527527

528-
If you have a github account, or are willing to make one, make a private fork
529-
of the repository at `<https://github.com/matplotlib/matplotlib.git>`_. Then
530-
clone the repository::
531-
532-
git clone [email protected]:your_github_id/matplotlib.git
533-
534-
if you don't have a github account::
535-
536-
git clone git://github.com/matplotlib/matplotlib.git
537-
538-
If your changes are relative to a release branch, change branches, for example::
539-
540-
git checkout v1.0.x
541-
542-
Then make a new branch::
543-
544-
cd matplotlib
545-
git checkout -b topic
546-
547-
Make your changes, making commits as you see fit. To submit the changes, if you
548-
don't have a github account::
549-
550-
git diff topic v1.0.x > topic.diff
551-
552-
Post your patch the :file:`topic.diff` to the `matplotlib-devel
553-
<http://sourceforge.net/mail/?group_id=80706>`_ mailing list.
554-
555-
If you do have a github account, push the topic branch to your fork::
556-
557-
git push origin topic
558-
559-
Then visit your profile at github, select the new branch, and file a pull
560-
request.
561-
562-
If you don't want to create a github account::
563-
564-
git clone git://github.com/matplotlib/matplotlib.git
565-
cd matplotlib
566-
git checkout
528+
See :ref:`making-patches` for information on how to make a patch with git.
567529

568530
If you are posting a patch to fix a code bug, please explain your
569531
patch in words -- what was broken before and how you fixed it. Also,

‎doc/faq/installing_faq.rst‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ install directory. To cleanly rebuild:
9292
<locating-matplotlib-install>`
9393

9494

95-
.. _install-git:
95+
.. _install-from-git:
9696

9797
Install from git
9898
================
@@ -405,9 +405,11 @@ changing the occurrences of ``MacOSX10.4u.sdk`` into ``MacOSX10.5.sdk``
405405
``/Library/Frameworks/Python.framework/Versions/Current/lib/pythonX.Y/site-packages/easy-install.pth``,
406406
(where X.Y is the version of Python you are building against)
407407
Comment out the line containing the name of the directory in which the
408-
previous version of MPL was installed (Looks something like ``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
408+
previous version of MPL was installed (Looks something like
409+
``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
409410

410-
3. Save the following as a shell script , for example ``./install-matplotlib-epd-osx.sh`` ::
411+
3. Save the following as a shell script , for example
412+
``./install-matplotlib-epd-osx.sh``::
411413

412414
NAME=matplotlib
413415
VERSION=v1.0.x

‎doc/mpl_toolkits/axes_grid/index.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ Documentation
3838

3939
users/overview.rst
4040
users/index.rst
41-
howtos/index.rst
4241
api/index.rst

‎doc/pyplots/plotmap.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from mpl_toolkits.basemap import Basemap
22
import matplotlib.pyplot as plt
33
import numpy as np
4+
45
# create figure
56
fig = plt.figure(figsize=(8,8))
67
# set up orthographic map projection with

‎doc/pyplots/tex_demo.png‎

-1 Bytes
Loading

‎doc/users/gridspec.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. _gridspec-guide:
22

33

4-
************************************************
5-
Customizing Location of Subplot Using GridSpec
6-
************************************************
4+
**********************************************
5+
Customizing Location of Subplot Using GridSpec
6+
**********************************************
77

88
``GridSpec``
99
specifies the geometry of the grid that a subplot will be
@@ -19,8 +19,8 @@
1919
0-based indexing and let subplot to occupy multiple cells.
2020

2121

22-
Basic Example of using subplot2grid
23-
====================================
22+
Basic Example of using subplot2grid
23+
===================================
2424

2525
To use subplot2grid, you provide geometry of the grid and the location
2626
of the subplot in the grid. For a simple single-cell subplot::

‎doc/users/image_tutorial.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ object:
228228

229229
There are many other colormap schemes available. See the `list and images of the colormaps <http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_.
230230

231-
.. _Color Bars
231+
.. _`Color Bars`
232232
233233
Color scale reference
234234
------------------------
@@ -256,7 +256,7 @@ automatically change if you change you switch to a different
256256
colormap - you have to re-create your plot, and add in the colorbar
257257
again.
258258

259-
.. _Data ranges
259+
.. _`Data ranges`
260260
261261
Examining a specific data range
262262
---------------------------------

‎doc/users/installing.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ build everything yourself, it is not difficult to build matplotlib
9898
from source. Grab the latest *tar.gz* release file from `sourceforge
9999
<http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
100100
you want to develop matplotlib or just need the latest bugfixed
101-
version, grab the latest git version :ref:`install-git`.
101+
version, grab the latest git version :ref:`install-from-git`.
102102

103103
Once you have satisfied the requirements detailed below (mainly
104104
python, numpy, libpng and freetype), you build matplotlib in the usual
@@ -201,7 +201,7 @@ backends and the capabilities they provide
201201
:term:`pytz` 2007g or later
202202
timezone handling for python datetime objects. By default,
203203
matplotlib will install pytz if it isn't already installed on your
204-
system. To override the default, use :file:`setup.cfg to force or
204+
system. To override the default, use :file:`setup.cfg` to force or
205205
prevent installation of pytz.
206206

207207
:term:`dateutil` 1.1 or later

0 commit comments

Comments
 (0)