SF.net SVN: matplotlib:[7756] branches/v0_99_maint

[<md...@us...>]

Revision: 7756
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7756&view=rev
Author:   mdboom
Date:     2009-09-14 17:11:06 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
Minor doc fixes

Modified Paths:
--------------
    branches/v0_99_maint/doc/users/image_tutorial.rst
    branches/v0_99_maint/lib/matplotlib/axes.py
    branches/v0_99_maint/lib/matplotlib/font_manager.py
    branches/v0_99_maint/lib/matplotlib/mlab.py

Modified: branches/v0_99_maint/doc/users/image_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/image_tutorial.rst	2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/doc/users/image_tutorial.rst	2009-09-14 17:11:06 UTC (rev 7756)
@@ -179,7 +179,7 @@
 
     In [6]: lum_img = img[:,:,0]
 
-This is array slicing.  You can read more `here
+This is array slicing.  You can read more in the `Numpy tutorial
 <http://www.scipy.org/Tentative_NumPy_Tutorial>`_.
 
 .. sourcecode:: ipython
@@ -229,8 +229,8 @@
         imgplot = plt.imshow(lum_img)
         imgplot.set_cmap('spectral')
 
-There are many other colormap schemes available.  See a list and
-images of the colormaps `here
+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

Modified: branches/v0_99_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/axes.py	2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/axes.py	2009-09-14 17:11:06 UTC (rev 7756)
@@ -7438,8 +7438,8 @@
                  window = mlab.window_hanning, noverlap=0, pad_to=None,
                  sides='default', scale_by_freq=None, **kwargs)
 
-        cohere the coherence between *x* and *y*.  Coherence is the normalized
-        cross spectral density:
+        :meth:`cohere` the coherence between *x* and *y*.  Coherence
+        is the normalized cross spectral density:
 
         .. math::
 

Modified: branches/v0_99_maint/lib/matplotlib/font_manager.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/font_manager.py	2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/font_manager.py	2009-09-14 17:11:06 UTC (rev 7756)
@@ -12,12 +12,12 @@
 font specification <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_.
 Future versions may implement the Level 2 or 2.1 specifications.
 
-Experimental support is included for using `fontconfig
-<http://www.fontconfig.org>`_ on Unix variant plaforms (Linux, OS X,
-Solaris).  To enable it, set the constant ``USE_FONTCONFIG`` in this
-file to ``True``.  Fontconfig has the advantage that it is the
-standard way to look up fonts on X11 platforms, so if a font is
-installed, it is much more likely to be found.
+Experimental support is included for using `fontconfig` on Unix
+variant platforms (Linux, OS X, Solaris).  To enable it, set the
+constant ``USE_FONTCONFIG`` in this file to ``True``.  Fontconfig has
+the advantage that it is the standard way to look up fonts on X11
+platforms, so if a font is installed, it is much more likely to be
+found.
 """
 
 """
@@ -707,7 +707,7 @@
     def __hash__(self):
         l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)]
         return hash(repr(l))
- 
+
     def __str__(self):
         return self.get_fontconfig_pattern()
 

Modified: branches/v0_99_maint/lib/matplotlib/mlab.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/mlab.py	2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/mlab.py	2009-09-14 17:11:06 UTC (rev 7756)
@@ -362,12 +362,16 @@
 
     *x*
         Array or sequence containing the data
+
     %(PSD)s
+
     Returns the tuple (*Pxx*, *freqs*).
 
     Refs:
+
         Bendat & Piersol -- Random Data: Analysis and Measurement
         Procedures, John Wiley & Sons (1986)
+
     """
     Pxx,freqs = csd(x, x, NFFT, Fs, detrend, window, noverlap, pad_to, sides,
         scale_by_freq)
@@ -391,7 +395,9 @@
 
     *x*, *y*
         Array or sequence containing the data
+
     %(PSD)s
+
     Returns the tuple (*Pxy*, *freqs*).
 
     Refs:
@@ -418,7 +424,9 @@
     If *x* is real (i.e. non-complex) only the spectrum of the positive
     frequencie is returned.  If *x* is complex then the complete
     spectrum is returned.
+
     %(PSD)s
+
     Returns a tuple (*Pxx*, *freqs*, *t*):
 
          - *Pxx*: 2-D array, columns are the periodograms of
@@ -462,11 +470,13 @@
 
     *x*, *y*
         Array or sequence containing the data
+
     %(PSD)s
+
     The return value is the tuple (*Cxy*, *f*), where *f* are the
     frequencies of the coherence vector. For cohere, scaling the
-    individual densities by the sampling frequency has no effect, since
-    the factors cancel out.
+    individual densities by the sampling frequency has no effect,
+    since the factors cancel out.
 
     .. seealso::
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.