hide colorbar_doc a bit

jdh2358 · jdh2358 · commit f9867b0b801a · 2009-08-06T18:51:58.000Z
svn path=/branches/v0_99_maint/; revision=7407
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
@@ -28,7 +28,7 @@ <h3>Need help?</h3>
 and join the matplotlib
 mailing <a href="http://sourceforge.net/mail/?group_id=80706">lists</a>.
 The <a href="{{ pathto('search') }}">search</a> tool searches all of
-the documentation, including full text search of almost 300 complete
+the documentation, including full text search of over 350 complete
 examples which exercise almost every corner of matplotlib.</p>
 
 <p>You can file bugs, patches and feature requests on the
diff --git a/doc/users/credits.rst b/doc/users/credits.rst
@@ -16,9 +16,9 @@ Special thanks to those who have made valuable contributions
 Jeremy O'Donoghue
   wrote the wx backend
 
-Andrew Straw
-  provided much of the log scaling architecture, the fill command, PIL
-  support for imshow, and provided many examples
+Andrew Straw provided much of the log scaling architecture, the fill
+  command, PIL support for imshow, and provided many examples.  He
+  also wrote the support for dropped axis spines.
 
 Charles Twardy
   provided the impetus code for the legend class and has made
@@ -28,7 +28,6 @@ Gary Ruben
   made many enhancements to errorbar to support x and y
   errorbar plots, and added a number of new marker types to plot.
 
-
 John Gill
   wrote the table class and examples, helped with support for
   auto-legend placement, and added support for legending scatter
@@ -133,7 +132,7 @@ Eric Firing
   most aspects of matplotlib.
 
 Daishi Harada
-  added support for "Dashed Text".  See ` dashpointlabel.py
+  added support for "Dashed Text".  See `dashpointlabel.py
   <examples/pylab_examples/dashpointlabel.py>`_ and
   :class:`~matplotlib.text.TextWithDash`.
 
@@ -147,11 +146,10 @@ The `brainvisa <http://brainvisa.info>`_ Orsay team and Fernando Perez
 
 
 Charlie Moad
-  contributed work to matplotlib's Cocoa support and does the binary
-  builds and releases.
+  contributed work to matplotlib's Cocoa support and has done a lot of work on the OSX and win32 binary releases.
 
-Jouni K. Seppaenen
-  wrote the PDF backend.
+Jouni K. Seppaenen wrote the PDF backend and contributed numerous
+  fixes to the code, to tex support and to the get_sample_data handler
 
 Paul Kienzle
   improved the picking infrastruture for interactive plots, and with
@@ -171,4 +169,7 @@ John Porter, Jonathon Taylor and Reinier Heeres
   matplotlib, and Jonathon Taylor and Reinier Heeres ported it to the
   refactored transform trunk.
 
-
+Jae-Joon Lee implemented fancy arrows and boxes, rewrote the legend
+  support to handle multiple columns and fancy text boxes, wrote the
+  axes grid toolkit, and has made numerous contributions to the code
+  and documentation
diff --git a/doc/users/screenshots.rst b/doc/users/screenshots.rst
@@ -45,8 +45,23 @@ the :mod:`matplotlib.path`.
 
 .. plot:: mpl_examples/api/path_patch_demo.py
 
+.. _screenshots_mplot3d_surface:
+
+mplot3d
+=========
+
+The mplot3d toolkit (see :ref:`toolkit_mplot3d-tutorial` and
+:ref:`mplot3d-examples-index`) has support for simple 3d graphs
+including surface, wireframe, scatter, and bar charts (added in
+matlpotlib-0.99).  Thanks to John Porter, Jonathon Taylor and Reinier
+Heeres for the mplot3d toolkit.  The toolkit is included with all
+standard matplotlib installs.
+
+.. plot:: mpl_examples/mplot3d/surface3d_demo.py
+
 .. _screenshots_ellipse_demo:
 
+
 Ellipses
 ========
 
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
@@ -18,8 +18,8 @@ mplot3d
 
 Reinier Heeres has ported John Porter's mplot3d over to the new
 matplotlib transformations framework, and it is now available as a
-toolkit mpl_toolkits.mplot3d.  See the `examples
-<http://matplotlib.sourceforge.net/examples/mplot3d/index.html>`_ and
+toolkit mpl_toolkits.mplot3d (which now comes standard with all mpl
+installs).  See :ref:`mplot3d-examples-index` and
 :ref:`toolkit_mplot3d-tutorial`
 
 .. plot:: pyplots/whats_new_99_mplot3d.py
@@ -29,10 +29,11 @@ toolkit mpl_toolkits.mplot3d.  See the `examples
 axes grid toolkit
 -----------------
 
-Jae Joon has added a new toolkit to ease displaying multiple images in
+Jae-Joon Lee has added a new toolkit to ease displaying multiple images in
 matplotlib, as well as some support for curvilinear grids to support
-the world coordinate system. See :ref:`axes_grid_users-guide-index`
-and `examples <http://matplotlib.sourceforge.net/examples/axes_grid/index.html>`_
+the world coordinate system. The toolkit is included standard with all
+new mpl installs.  See :ref:`axes_grid-examples-index` and
+:ref:`axes_grid_users-guide-index`.
 
 .. plot:: pyplots/whats_new_99_axes_grid.py
 
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -1359,7 +1359,7 @@ def colormaps():
 ## Plotting part 1: manually generated functions and wrappers ##
 
 
-from matplotlib.colorbar import colorbar_doc
+from matplotlib.colorbar import colorbar_doc as _colorbar_doc
 def colorbar(mappable=None, cax=None, ax=None, **kw):
     if mappable is None:
         mappable = gci()
@@ -1369,7 +1369,7 @@ def colorbar(mappable=None, cax=None, ax=None, **kw):
     ret = gcf().colorbar(mappable, cax = cax, ax=ax, **kw)
     draw_if_interactive()
     return ret
-colorbar.__doc__ = colorbar_doc
+colorbar.__doc__ = _colorbar_doc
 
 def clim(vmin=None, vmax=None):
     """
