Merge pull request #9227 from matplotlib/auto-backport-of-pr-9225

dstansby · web-flow · commit 95691f401c8b · 2017-09-25T21:19:45.000+01:00
Backport PR #9225 on branch v2.1.x
diff --git a/doc/users/shell.rst b/doc/users/shell.rst
@@ -34,7 +34,7 @@ IPython to the rescue
     shadow python built-in and can lead to hard to track bugs. To get IPython
     integration without imports the use of the  `%matplotlib` magic is
     preferred. See
-    `ipython documentation <http://ipython.org/ipython-doc/stable/interactive/reference.html#plotting-with-matplotlib>`_
+    `ipython documentation <https://ipython.readthedocs.io/en/stable/interactive/reference.html#plotting-with-matplotlib>`_
     .
 
 Fortunately, `ipython <http://ipython.org/>`_, an enhanced

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ IPython to the rescue`
`34`	`34`	`shadow python built-in and can lead to hard to track bugs. To get IPython`
`35`	`35`	integration without imports the use of the `%matplotlib` magic is
`36`	`36`	`preferred. See`
`37`		- `ipython documentation <http://ipython.org/ipython-doc/stable/interactive/reference.html#plotting-with-matplotlib>`_
	`37`	+ `ipython documentation <https://ipython.readthedocs.io/en/stable/interactive/reference.html#plotting-with-matplotlib>`_
`38`	`38`	`.`
`39`	`39`
`40`	`40`	Fortunately, `ipython <http://ipython.org/>`_, an enhanced