tacaswell
diff --git a/‎.travis.yml‎
Lines changed: 1 addition & 1 deletion b/‎.travis.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/api/api_changes/code_removal.rst‎
Lines changed: 10 additions & 0 deletions b/‎doc/api/api_changes/code_removal.rst‎
Lines changed: 10 additions & 0 deletions
diff --git a/‎lib/matplotlib/sphinxext/ipython_console_highlighting.py‎
Lines changed: 0 additions & 125 deletions b/‎lib/matplotlib/sphinxext/ipython_console_highlighting.py‎
Lines changed: 0 additions & 125 deletions
@@ -33,7 +33,7 @@ install:
   - |
     if [[ $BUILD_DOCS == true ]]; then
       sudo apt-get install -qq --no-install-recommends dvipng texlive-latex-base texlive-latex-extra texlive-fonts-recommended graphviz
-      pip install numpydoc linkchecker
+      pip install numpydoc linkchecker ipython
       wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb
       sudo dpkg -i fonts-humor-sans_1.0-1_all.deb
       wget https://googlefontdirectory.googlecode.com/hg/ofl/felipa/Felipa-Regular.ttf
 
@@ -27,3 +27,13 @@ via ``matplotlib.tri``
 Annotation
 ----------
 Removed ``textcoords`` and ``xytext`` proprieties from Annotation objects.
+
+
+spinxext.ipython_*.py
+---------------------
+Both ``ipython_console_highlighting`` and ``ipython_directive`` have been moved to
+`IPython`.
+
+Change your import from 'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive' and from 'matplotlib.sphinxext.ipython_directive' to
+'IPython.sphinxext.ipython_directive'