fix doc build errors and warnings

Author: ddale

doc/api/gridspec_api.rst

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

doc/devel/release_guide.rst

@@ -92,10 +92,7 @@ replacing 'jdh2358' with your sourceforge login.
 
 
 Any changes to fix bugs in the release candidate should be fixed in
-the release branch and merged into the trunk with `git merge`; see
-:ref:`git merge`.  When the release candidate is signed off on, build
-the final sdist, binaries and eggs, and upload them to the sourceforge
-release area.
+the release branch and merged into the trunk.
 
 
 .. _release-uploading:

doc/faq/howto_faq.rst

@@ -525,45 +525,7 @@ Contributing: howto
 Submit a patch
 -----------------
 
-If you have a github account, or are willing to make one, make a private fork
-of the repository at `<https://github.com/matplotlib/matplotlib.git>`_. Then
-clone the repository::
-
-   git clone git@github.com:your_github_id/matplotlib.git
-
-if you don't have a github account::
-
-   git clone git://github.com/matplotlib/matplotlib.git
-
-If your changes are relative to a release branch, change branches, for example::
-
-   git checkout v1.0.x
-
-Then make a new branch::
-
-   cd matplotlib
-   git checkout -b topic
-
-Make your changes, making commits as you see fit. To submit the changes, if you
-don't have a github account::
-
-   git diff topic v1.0.x > topic.diff
-
-Post your patch the :file:`topic.diff` to the  `matplotlib-devel
-<http://sourceforge.net/mail/?group_id=80706>`_ mailing list.
-
-If you do have a github account, push the topic branch to your fork::
-
-   git push origin topic
-
-Then visit your profile at github, select the new branch, and file a pull
-request.
-
-If you don't want to create a github account::
-
-   git clone git://github.com/matplotlib/matplotlib.git
-   cd matplotlib
-   git checkout
+See :ref:`making-patches` for information on how to make a patch with git.
 
 If you are posting a patch to fix a code bug, please explain your
 patch in words -- what was broken before and how you fixed it.  Also,

doc/faq/installing_faq.rst

@@ -92,7 +92,7 @@ install directory.  To cleanly rebuild:
    <locating-matplotlib-install>`
 
 
-.. _install-git:
+.. _install-from-git:
 
 Install from git
 ================
@@ -394,9 +394,11 @@ changing the occurrences of ``MacOSX10.4u.sdk`` into ``MacOSX10.5.sdk``
 ``/Library/Frameworks/Python.framework/Versions/Current/lib/pythonX.Y/site-packages/easy-install.pth``,
 (where X.Y is the version of Python you are building against)
 Comment out the line containing the name of the directory in which the
-previous version of MPL was installed (Looks something like ``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
+previous version of MPL was installed (Looks something like
+``./matplotlib-0.98.5.2n2-py2.5-macosx-10.3-fat.egg``).
 
-3. Save the following as a shell script , for example ``./install-matplotlib-epd-osx.sh`` ::
+3. Save the following as a shell script , for example
+``./install-matplotlib-epd-osx.sh``::
 
    NAME=matplotlib
    VERSION=v1.0.x

doc/mpl_toolkits/axes_grid/index.rst

@@ -38,5 +38,4 @@ Documentation
 
    users/overview.rst
    users/index.rst
-   howtos/index.rst
    api/index.rst

doc/pyplots/plotmap.py

@@ -9,17 +9,13 @@
 
 from pylab import title, colorbar, show, axes, cm, arange, figure, \
                   text
+from matplotlib.cbook import get_sample_data
 
 # read in topo data (on a regular lat/lon grid)
 # longitudes go from 20 to 380.
-# you can get this data from matplolib svn matplotlib/htdocs/screenshots/data/
-datadir = '/home/jdhunter/python/svn/matplotlib/trunk/htdocs/screenshots/data/'
-if not os.path.exists(datadir):
-    raise SystemExit('You need to download the data with svn co https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/trunk/htdocs/screenshots/data/" and set the datadir variable in %s'%__file__)
-
-topoin = np.loadtxt(os.path.join(datadir, 'etopo20data.gz'))
-lons = np.loadtxt(os.path.join(datadir, 'etopo20lons.gz'))
-lats = np.loadtxt(os.path.join(datadir, 'etopo20lats.gz'))
+topoin = np.loadtxt(get_sample_data('screenshots/etopo20data.gz').name)
+lons = np.loadtxt(get_sample_data('screenshots/etopo20lons.gz').name)
+lats = np.loadtxt(get_sample_data('screenshots/etopo20lats.gz').name)
 # shift data so lons go from -180 to 180 instead of 20 to 380.
 topoin,lons = shiftgrid(180.,topoin,lons,start=False)
 

doc/pyplots/tex_demo.png

@@ -1,9 +1,9 @@
-\.. _gridspec-guide:
+.. _gridspec-guide:
 
 
-************************************************
- Customizing Location of Subplot Using GridSpec
-************************************************
+**********************************************
+Customizing Location of Subplot Using GridSpec
+**********************************************
 
     ``GridSpec``
         specifies the geometry of the grid that a subplot will be
@@ -19,8 +19,8 @@
         0-based indexing and let subplot to occupy multiple cells.
 
 
- Basic Example of using subplot2grid
-====================================
+Basic Example of using subplot2grid
+===================================
 
 To use subplot2grid, you provide geometry of the grid and the location
 of the subplot in the grid. For a simple single-cell subplot::

doc/users/gridspec.rst

@@ -228,7 +228,7 @@ object:
 
 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>`_.
 
-.. _Color Bars
+.. _`Color Bars`
 
 Color scale reference
 ------------------------
@@ -256,7 +256,7 @@ automatically change if you change you switch to a different
 colormap - you have to re-create your plot, and add in the colorbar
 again.
 
-.. _Data ranges
+.. _`Data ranges`
 
 Examining a specific data range
 ---------------------------------

doc/users/image_tutorial.rst

@@ -98,7 +98,7 @@ build everything yourself, it is not difficult to build matplotlib
 from source.  Grab the latest *tar.gz* release file from `sourceforge
 <http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
 you want to develop matplotlib or just need the latest bugfixed
-version, grab the latest git version :ref:`install-git`.
+version, grab the latest git version :ref:`install-from-git`.
 
 Once you have satisfied the requirements detailed below (mainly
 python, numpy, libpng and freetype), you build matplotlib in the usual
@@ -190,7 +190,7 @@ backends and the capabilities they provide
 :term:`pytz` 2007g or later
     timezone handling for python datetime objects.  By default,
     matplotlib will install pytz if it isn't already installed on your
-    system.  To override the default, use :file:`setup.cfg to force or
+    system.  To override the default, use :file:`setup.cfg` to force or
     prevent installation of pytz.
 
 :term:`dateutil` 1.1 or later