SF.net SVN: matplotlib:[6626] trunk/matplotlib

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

Revision: 6626
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6626&view=rev
Author:   mdboom
Date:     2008-12-15 21:04:03 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Merged revisions 6625 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6625 | mdboom | 2008-12-15 15:49:22 -0500 (Mon, 15 Dec 2008) | 2 lines
  
  Fix docstring formatting.
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6623
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6625
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-12-15 20:49:22 UTC (rev 6625)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-12-15 21:04:03 UTC (rev 6626)
@@ -3182,7 +3182,7 @@
         Return value is a list of lines that were added.
 
         The following format string characters are accepted to control
-        the line style or marker
+        the line style or marker:
 
         ================    ===============================
         character           description
@@ -3216,7 +3216,7 @@
         ================    ===============================
 
 
-        The following color abbreviations are supported::
+        The following color abbreviations are supported:
 
         ==========  ========
         character   color


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