Merge branch 'master' of github.com:ipython/ipython into trunk

docs/source/whatsnew/version0.10.txt

@@ -36,10 +36,10 b' Highlights of this release:'
   in remote tasks, as well as providing better control for remote task IDs.
 
 - New IPython Sphinx directive contributed by John Hunter.  You can use this
-  directive to mark blocks in reSructuredText documents as containig IPython
-  syntax (including figures) and the will be executed during the build::
+  directive to mark blocks in reSructuredText documents as containing IPython
+  syntax (including figures) and the will be executed during the build:
 
-  .. ipython::
+  .. sourcecode:: ipython
 
       In [2]: plt.figure()  # ensure a fresh figure