Revision: 6893
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6893&view=rev
Author:   mdboom
Date:     2009-02-09 13:32:34 +0000 (Mon, 09 Feb 2009)

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

........
  r6890 | jdh2358 | 2009-02-08 15:29:42 -0500 (Sun, 08 Feb 2009) | 1 line
  
  bumped the version number for bugfix release
........
  r6891 | mdboom | 2009-02-09 08:15:45 -0500 (Mon, 09 Feb 2009) | 2 lines
  
  Fix URLs in matplotlibrc.template (thanks, Sandro Tosi)
........

Modified Paths:
--------------
    trunk/matplotlib/matplotlibrc.template

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6886
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6892
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


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,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + 
/branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891

Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template      2009-02-09 13:31:18 UTC (rev 
6892)
+++ trunk/matplotlib/matplotlibrc.template      2009-02-09 13:32:34 UTC (rev 
6893)
@@ -35,7 +35,7 @@
 # you if backend_fallback is True
 #backend_fallback: True
 numerix      : %(numerix)s  # numpy, Numeric or numarray
-#interactive  : False      # see 
http://matplotlib.sourceforge.net/interactive.html
+#interactive  : False
 #toolbar      : toolbar2   # None | classic | toolbar2
 #timezone     : UTC        # a pytz timezone string, eg US/Central or 
Europe/Paris
 
@@ -45,7 +45,7 @@
 
 
 ### LINES
-# See http://matplotlib.sourceforge.net/matplotlib.lines.html for more
+# See 
http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.lines 
for more
 # information on line properties.
 #lines.linewidth   : 1.0     # line width in points
 #lines.linestyle   : -       # solid line
@@ -62,7 +62,7 @@
 ### PATCHES
 # Patches are graphical objects that fill 2D space, like polygons or
 # circles.  See
-# http://matplotlib.sourceforge.net/matplotlib.patches.html for more
+# 
http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.patches
 # information on patch properties
 #patch.linewidth       : 1.0     # edge width in points
 #patch.facecolor       : blue
@@ -72,7 +72,7 @@
 ### FONT
 #
 # font properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.font_manager.html for more
+# http://matplotlib.sourceforge.net/api/font_manager_api.html for more
 # information on font properties.  The 6 font properties used for font
 # matching are given below with their default values.
 #
@@ -123,7 +123,7 @@
 
 ### TEXT
 # text properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.text.html for more
+# http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.text 
for more
 # information on text properties
 
 #text.color          : black
@@ -193,7 +193,7 @@
 ### AXES
 # default face and edge color, default tick sizes,
 # default fontsizes for ticklabels, and so on.  See
-# http://matplotlib.sourceforge.net/matplotlib.axes.html#Axes
+# http://matplotlib.sourceforge.net/api/axes_api.html#module-matplotlib.axes
 #axes.hold           : True    # whether to clear the axes by default on
 #axes.facecolor      : white   # axes background color
 #axes.edgecolor      : black   # axes edge color
@@ -213,7 +213,7 @@
 #polaraxes.grid      : True    # display grid on polar axes
 
 ### TICKS
-# see http://matplotlib.sourceforge.net/matplotlib.axis.html#Ticks
+# see http://matplotlib.sourceforge.net/api/axis_api.html#matplotlib.axis.Tick
 #xtick.major.size     : 4      # major tick size in points
 #xtick.minor.size     : 2      # minor tick size in points
 #xtick.major.pad      : 4      # distance to major tick label in points
@@ -253,7 +253,7 @@
 #legend.shadow        : False
 
 ### FIGURE
-# See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
+# See 
http://matplotlib.sourceforge.net/api/figure_api.html#matplotlib.figure.Figure
 #figure.figsize   : 8, 6    # figure size in inches
 #figure.dpi       : 80      # figure dots per inch
 #figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray


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

------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

Reply via email to