Merge remote-tracking branch 'matplotlib/v1.5.3-doc' into v2.x

tacaswell · tacaswell · commit dd589b394cb5 · 2016-09-29T23:51:13.000-04:00
diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -42,8 +42,10 @@
    patches_api.rst
    path_api.rst
    patheffects_api.rst
+   projections_api.rst
    pyplot_api.rst
    sankey_api.rst
+   scale_api.rst
    spines_api.rst
    style_api.rst
    text_api.rst
diff --git a/doc/api/legend_api.rst b/doc/api/legend_api.rst
@@ -1,6 +1,6 @@
-******
-Legend
-******
+*************************
+legend and legend_handler
+*************************
 
 
 :mod:`matplotlib.legend`
diff --git a/doc/api/markers_api.rst b/doc/api/markers_api.rst
@@ -1,5 +1,5 @@
 *******
-Markers
+markers
 *******
 
 
diff --git a/doc/api/projections_api.rst b/doc/api/projections_api.rst
@@ -0,0 +1,19 @@
+***********
+projections
+***********
+
+
+:mod:`matplotlib.projections`
+=============================
+
+.. automodule:: matplotlib.projections
+   :members:
+   :show-inheritance:
+
+
+:mod:`matplotlib.projections.polar`
+===================================
+
+.. automodule:: matplotlib.projections.polar
+   :members:
+   :show-inheritance:
diff --git a/doc/api/scale_api.rst b/doc/api/scale_api.rst
@@ -0,0 +1,12 @@
+*****
+scale
+*****
+
+
+:mod:`matplotlib.scale`
+=======================
+
+.. automodule:: matplotlib.scale
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/devel/add_new_projection.rst b/doc/devel/add_new_projection.rst
@@ -130,23 +130,6 @@ interest.
 API documentation
 =================
 
-matplotlib.scale
-----------------
-
-.. automodule:: matplotlib.scale
-   :members:
-   :show-inheritance:
-
-matplotlib.projections
-----------------------
-
-.. automodule:: matplotlib.projections
-   :members:
-   :show-inheritance:
-
-matplotlib.projections.polar
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: matplotlib.projections.polar
-   :members:
-   :show-inheritance:
+* :mod:`matplotlib.scale`
+* :mod:`matplotlib.projections`
+* :mod:`matplotlib.projections.polar`
diff --git a/doc/devel/gitwash/development_workflow.rst b/doc/devel/gitwash/development_workflow.rst
@@ -397,9 +397,8 @@ Deleting a branch on GitHub_
    # delete branch on GitHub
    git push origin :my-unwanted-branch
 
-(Note the colon ``:`` before ``test-branch``.  See also:
-http://github.com/guides/remove-a-remote-branch
-
+Note the colon ``:`` before ``my-unwanted-branch``.  See also:
+https://help.github.com/articles/pushing-to-a-remote/#deleting-a-remote-branch-or-tag
 
 Exploring your repository
 =========================
diff --git a/doc/users/intro.rst b/doc/users/intro.rst
@@ -3,7 +3,7 @@ Introduction
 
 matplotlib is a library for making 2D plots of arrays in `Python
 <http://www.python.org>`_.  Although it has its origins in emulating
-the MATLAB |reg| [*]_ graphics commands, it is
+the MATLAB |reg| [#]_ graphics commands, it is
 independent of MATLAB, and can be used in a Pythonic, object oriented
 way.  Although matplotlib is written primarily in pure Python, it
 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
 embed matplotlib in a Gtk+ EEG application that runs on Windows, Linux
 and Macintosh OS X.
 
-.. [*] MATLAB is a registered trademark of The MathWorks, Inc.
+.. [#] MATLAB is a registered trademark of The MathWorks, Inc.

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 *******
 -Markers
 +markers
 *******