SF.net SVN: matplotlib:[6946] branches/v0_98_5_maint/doc/conf.py

2009-03-02 Thread mdboom 
Revision: 6946
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6946&view=rev
Author:   mdboom
Date: 2009-03-02 22:50:44 + (Mon, 02 Mar 2009)

Log Message:
---
Fix bug in doc build.

Modified Paths:
--
branches/v0_98_5_maint/doc/conf.py

Modified: branches/v0_98_5_maint/doc/conf.py
===
--- branches/v0_98_5_maint/doc/conf.py  2009-02-28 20:13:38 UTC (rev 6945)
+++ branches/v0_98_5_maint/doc/conf.py  2009-03-02 22:50:44 UTC (rev 6946)
@@ -28,7 +28,7 @@
 # Add any Sphinx extension module names here, as strings. They can be 
extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table',
-  'sphinx.ext.autodoc', # 'matplotlib.sphinxext.only_directives',
+  'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
   'matplotlib.sphinxext.plot_directive', 'inheritance_diagram',
   'gen_gallery', 'gen_rst']
 


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

--
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins

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

2009-03-02 Thread mdboom 
Revision: 6947
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6947&view=rev
Author:   mdboom
Date: 2009-03-02 23:04:27 + (Mon, 02 Mar 2009)

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


  r6946 | mdboom | 2009-03-02 17:50:44 -0500 (Mon, 02 Mar 2009) | 2 lines
  
  Fix bug in doc build.


Modified Paths:
--
trunk/matplotlib/doc/conf.py

Property Changed:

trunk/matplotlib/
trunk/matplotlib/doc/pyplots/README
trunk/matplotlib/doc/sphinxext/gen_gallery.py
trunk/matplotlib/doc/sphinxext/gen_rst.py
trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py
trunk/matplotlib/lib/matplotlib/sphinxext/only_directives.py
trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py


Property changes on: trunk/matplotlib
___
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6941
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6946
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,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941
   + /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,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946

Modified: trunk/matplotlib/doc/conf.py
===
--- trunk/matplotlib/doc/conf.py2009-03-02 22:50:44 UTC (rev 6946)
+++ trunk/matplotlib/doc/conf.py2009-03-02 23:04:27 UTC (rev 6947)
@@ -28,7 +28,7 @@
 # Add any Sphinx extension module names here, as strings. They can be 
extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['matplotlib.sphinxext.mathmpl', 'math_symbol_table',
-  'sphinx.ext.autodoc', # 'matplotlib.sphinxext.only_directives',
+  'sphinx.ext.autodoc', 'matplotlib.sphinxext.only_directives',
   'matplotlib.sphinxext.plot_directive', 'inheritance_diagram',
   'gen_gallery', 'gen_rst']
 


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941
   + 
/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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/mathmpl.py