Merged revisions 7727-7728,7734 via svnmerge from

leejjoon · leejjoon · commit 9a65ca3bbaad · 2009-09-10T23:22:40.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_99_maint ........ r7727 | ryanmay | 2009-09-09 14:41:43 -0400 (Wed, 09 Sep 2009) | 1 line Include 'top' keyword argument in docstring for Figure.subplots_adjust(). ........ r7728 | mdboom | 2009-09-09 15:55:52 -0400 (Wed, 09 Sep 2009) | 2 lines Fix some documentation warnings. ........ r7734 | leejjoon | 2009-09-10 19:01:28 -0400 (Thu, 10 Sep 2009) | 1 line fix a bug in Line2D.draw method that produces invalid svg when the line is invisible ........ svn path=/trunk/matplotlib/; revision=7735
diff --git a/doc/api/spine_api.rst b/doc/api/spine_api.rst
@@ -6,7 +6,7 @@ matplotlib spine
 :mod:`matplotlib.spine`
 ========================
 
-.. automodule:: matplotlib.spine
+.. automodule:: matplotlib.spines
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/doc/mpl_toolkits/mplot3d/tutorial.rst b/doc/mpl_toolkits/mplot3d/tutorial.rst
@@ -55,7 +55,7 @@ Filled contour plots
 
 Polygon plots
 ====================
-.. automethod:: add_collection3d
+.. automethod:: Axes3D.add_collection3d
 
 .. plot:: mpl_examples/mplot3d/polys3d_demo.py
 
diff --git a/doc/users/image_tutorial.rst b/doc/users/image_tutorial.rst
diff --git a/doc/users/index.rst b/doc/users/index.rst
@@ -23,7 +23,6 @@ User's Guide
     artists.rst
     legend_guide.rst
     event_handling.rst
-    legend.rst
     transforms_tutorial.rst
     path_tutorial.rst
     annotations_guide.rst
diff --git a/doc/users/pyplot_tutorial.rst b/doc/users/pyplot_tutorial.rst
@@ -165,17 +165,17 @@ The :func:`~matplotlib.pyplot.figure` command here is optional because
 ``figure(1)`` will be created by default, just as a ``subplot(111)``
 will be created by default if you don't manually specify an axes.  The
 :func:`~matplotlib.pyplot.subplot` command specifies ``numrows,
-	 numcols, fignum`` where ``fignum`` ranges from 1 to
-``numrows*numcols``.  The commas in the ``subplot`` command are optional
-if ``numrows*numcols<10``.  So ``subplot(211)`` is identical to
-``subplot(2,1,1)``.  You can create an arbitrary number of subplots
+numcols, fignum`` where ``fignum`` ranges from 1 to
+``numrows*numcols``.  The commas in the ``subplot`` command are
+optional if ``numrows*numcols<10``.  So ``subplot(211)`` is identical
+to ``subplot(2,1,1)``.  You can create an arbitrary number of subplots
 and axes.  If you want to place an axes manually, ie, not on a
 rectangular grid, use the :func:`~matplotlib.pyplot.axes` command,
 which allows you to specify the location as ``axes([left, bottom,
 width, height])`` where all values are in fractional (0 to 1)
 coordinates.  See :ref:`pylab_examples-axes_demo` for an example of
-placing axes manually and :ref:`pylab_examples-line_styles` for an example
-with lots-o-subplots.
+placing axes manually and :ref:`pylab_examples-line_styles` for an
+example with lots-o-subplots.
 
 
 You can create multiple figures by using multiple
@@ -267,6 +267,6 @@ these arguments are ``(x,y)`` tuples.
 In this basic example, both the ``xy`` (arrow tip) and ``xytext``
 locations (text location) are in data coordinates.  There are a
 variety of other coordinate systems one can choose -- see
-:ref:`annotations-tutorial` and :ref:`plotting-guide-annotation`
-for details.  More examples can be found
-in :ref:`pylab_examples-annotation_demo`.
+:ref:`annotations-tutorial` and :ref:`plotting-guide-annotation` for
+details.  More examples can be found in
+:ref:`pylab_examples-annotation_demo`.
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1360,7 +1360,7 @@ def has_data(self):
 
     def add_artist(self, a):
         '''
-        Add any :class:`~matplotlib.artist.Artist` to the axes
+        Add any :class:`~matplotlib.artist.Artist` to the axes.
 
         Returns the artist.
         '''
@@ -1373,8 +1373,8 @@ def add_artist(self, a):
 
     def add_collection(self, collection, autolim=True):
         '''
-        add a :class:`~matplotlib.collections.Collection` instance
-        to the axes
+        Add a :class:`~matplotlib.collections.Collection` instance
+        to the axes.
 
         Returns the collection.
         '''
@@ -3675,15 +3675,15 @@ def acorr(self, x, **kwargs):
 
         *maxlags* is a positive integer detailing the number of lags
         to show.  The default value of *None* will return all
-        :math:`2 \mathrm{len}(x) - 1` lags.
+        :math:`2 \times \mathrm{len}(x) - 1` lags.
 
         The return value is a tuple (*lags*, *c*, *linecol*, *b*)
         where
 
-        - *linecol* is the
-          :class:`~matplotlib.collections.LineCollection`
+          - *linecol* is the
+            :class:`~matplotlib.collections.LineCollection`
 
-        - *b* is the *x*-axis.
+          - *b* is the *x*-axis.
 
         .. seealso::
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1078,7 +1078,8 @@ def on_changed(m):
 
     def subplots_adjust(self, *args, **kwargs):
         """
-        fig.subplots_adjust(left=None, bottom=None, right=None, wspace=None, hspace=None)
+        fig.subplots_adjust(left=None, bottom=None, right=None, top=None,
+            wspace=None, hspace=None)
 
         Update the :class:`SubplotParams` with *kwargs* (defaulting to rc where
         None) and update the subplot locations
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -499,9 +499,10 @@ def draw(self, renderer):
             self._transform_path(subslice)
         if self._transformed_path is None:
             self._transform_path()
-        renderer.open_group('line2d', self.get_gid())
 
-        if not self._visible: return
+        if not self.get_visible(): return
+
+        renderer.open_group('line2d', self.get_gid())
         gc = renderer.new_gc()
         self._set_gc_clip(gc)
 
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -565,7 +565,7 @@ def cohere_pairs( X, ij, NFFT=256, Fs=2, detrend=detrend_none,
     example script that shows that this :func:`cohere_pairs` and
     :func:`cohere` give the same results for a given pair.
 
-    .. sealso::
+    .. seealso::
 
         :func:`psd`
             For information about the methods used to compute
