Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit dd589b3

Browse filesBrowse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v1.5.3-doc' into v2.x
2 parents f59e21d + 8d0388c commit dd589b3
Copy full SHA for dd589b3

File tree

Expand file treeCollapse file tree

8 files changed

+44
-29
lines changed
Filter options
Expand file treeCollapse file tree

8 files changed

+44
-29
lines changed

‎doc/api/index.rst

Copy file name to clipboardExpand all lines: doc/api/index.rst
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@
4242
patches_api.rst
4343
path_api.rst
4444
patheffects_api.rst
45+
projections_api.rst
4546
pyplot_api.rst
4647
sankey_api.rst
48+
scale_api.rst
4749
spines_api.rst
4850
style_api.rst
4951
text_api.rst

‎doc/api/legend_api.rst

Copy file name to clipboardExpand all lines: doc/api/legend_api.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
******
2-
Legend
3-
******
1+
*************************
2+
legend and legend_handler
3+
*************************
44

55

66
:mod:`matplotlib.legend`

‎doc/api/markers_api.rst

Copy file name to clipboardExpand all lines: doc/api/markers_api.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*******
2-
Markers
2+
markers
33
*******
44

55

‎doc/api/projections_api.rst

Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
***********
2+
projections
3+
***********
4+
5+
6+
:mod:`matplotlib.projections`
7+
=============================
8+
9+
.. automodule:: matplotlib.projections
10+
:members:
11+
:show-inheritance:
12+
13+
14+
:mod:`matplotlib.projections.polar`
15+
===================================
16+
17+
.. automodule:: matplotlib.projections.polar
18+
:members:
19+
:show-inheritance:

‎doc/api/scale_api.rst

Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
*****
2+
scale
3+
*****
4+
5+
6+
:mod:`matplotlib.scale`
7+
=======================
8+
9+
.. automodule:: matplotlib.scale
10+
:members:
11+
:undoc-members:
12+
:show-inheritance:

‎doc/devel/add_new_projection.rst

Copy file name to clipboardExpand all lines: doc/devel/add_new_projection.rst
+3-20Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -130,23 +130,6 @@ interest.
130130
API documentation
131131
=================
132132

133-
matplotlib.scale
134-
----------------
135-
136-
.. automodule:: matplotlib.scale
137-
:members:
138-
:show-inheritance:
139-
140-
matplotlib.projections
141-
----------------------
142-
143-
.. automodule:: matplotlib.projections
144-
:members:
145-
:show-inheritance:
146-
147-
matplotlib.projections.polar
148-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
149-
150-
.. automodule:: matplotlib.projections.polar
151-
:members:
152-
:show-inheritance:
133+
* :mod:`matplotlib.scale`
134+
* :mod:`matplotlib.projections`
135+
* :mod:`matplotlib.projections.polar`

‎doc/devel/gitwash/development_workflow.rst

Copy file name to clipboardExpand all lines: doc/devel/gitwash/development_workflow.rst
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,8 @@ Deleting a branch on GitHub_
397397
# delete branch on GitHub
398398
git push origin :my-unwanted-branch
399399

400-
(Note the colon ``:`` before ``test-branch``. See also:
401-
http://github.com/guides/remove-a-remote-branch
402-
400+
Note the colon ``:`` before ``my-unwanted-branch``. See also:
401+
https://help.github.com/articles/pushing-to-a-remote/#deleting-a-remote-branch-or-tag
403402

404403
Exploring your repository
405404
=========================

‎doc/users/intro.rst

Copy file name to clipboardExpand all lines: doc/users/intro.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Introduction
33

44
matplotlib is a library for making 2D plots of arrays in `Python
55
<http://www.python.org>`_. Although it has its origins in emulating
6-
the MATLAB |reg| [*]_ graphics commands, it is
6+
the MATLAB |reg| [#]_ graphics commands, it is
77
independent of MATLAB, and can be used in a Pythonic, object oriented
88
way. Although matplotlib is written primarily in pure Python, it
99
makes heavy use of `NumPy <http://www.numpy.org>`_ and other extension
@@ -91,4 +91,4 @@ from the Python shell in Tkinter on Windows™. My primary use is to
9191
embed matplotlib in a Gtk+ EEG application that runs on Windows, Linux
9292
and Macintosh OS X.
9393

94-
.. [*] MATLAB is a registered trademark of The MathWorks, Inc.
94+
.. [#] MATLAB is a registered trademark of The MathWorks, Inc.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.