Merge branch 'plot_directive' of github.com:mdboom/matplotlib into plot_directive

mdboom · mdboom · commit 403c5b81b363 · 2011-04-04T08:00:16.000-04:00
Conflicts:
	lib/matplotlib/sphinxext/plot_directive.py
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -25,19 +25,19 @@
 
   2. Included as **inline content** to the directive::
 
-       .. plot::
-          import matplotlib.pyplot as plt
-          import matplotlib.image as mpimg
-          import numpy as np
-          img = mpimg.imread('_static/stinkbug.png')
-          imgplot = plt.imshow(img)
+     .. plot::
+        import matplotlib.pyplot as plt
+        import matplotlib.image as mpimg
+        import numpy as np
+        img = mpimg.imread('_static/stinkbug.png')
+        imgplot = plt.imshow(img)
 
   3. Using **doctest** syntax::
 
-       .. plot:: foo
-          A plotting example:
-          >>> import matplotlib.pyplot as plt
-          >>> plt.plot([1,2,3], [4,5,6])
+     .. plot::
+        A plotting example:
+        >>> import matplotlib.pyplot as plt
+        >>> plt.plot([1,2,3], [4,5,6])
 
 Options
 -------
