Merge pull request #15652 from anntzer/unthought

dstansby · web-flow · commit 5b2c85aca75d · 2019-11-10T17:21:03.000Z
Remove mention of Enthought Canopy from the docs.
diff --git a/INSTALL.rst b/INSTALL.rst
@@ -58,8 +58,7 @@ Third-party distributions of Matplotlib
 Scientific Python Distributions
 -------------------------------
 
-`Anaconda <https://www.anaconda.com/>`_ and `Canopy
-<https://www.enthought.com/products/canopy/>`_ and `ActiveState
+`Anaconda <https://www.anaconda.com/>`_ and `ActiveState
 <https://www.activestate.com/activepython/downloads>`_ are excellent
 choices that "just work" out of the box for Windows, macOS and common
 Linux platforms. `WinPython <https://winpython.github.io/>`_ is an
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -74,33 +74,23 @@ of NumPy, Scipy and Matplotlib means that these packages are difficult to
 upgrade (see `system python packages`_).  For that reason we strongly suggest
 that you install a fresh version of Python and use that as the basis for
 installing libraries such as NumPy and Matplotlib.  One convenient way to
-install Matplotlib with other useful Python software is to use one of the
-excellent Python scientific software collections that are now available:
+install Matplotlib with other useful Python software is to use the Anaconda_
+Python scientific software collection, which includes Python itself and a
+wide range of libraries; if you need a library that is not available from the
+collection, you can install it yourself using standard methods such as *pip*.
+See the Ananconda web page for installation support.
 
 .. _system python packages:
     https://github.com/MacPython/wiki/wiki/Which-Python#system-python-and-extra-python-packages
-
-- Anaconda_ from `Continuum Analytics`_
-- Canopy_ from Enthought_
-
-.. _Canopy: https://www.enthought.com/products/canopy/
 .. _Anaconda: https://www.anaconda.com/
-.. _Enthought: https://www.enthought.com
-.. _Continuum Analytics: https://www.continuum.io
-
-These collections include Python itself and a wide range of libraries; if you
-need a library that is not available from the collection, you can install it
-yourself using standard methods such as *pip*.  Continuum and Enthought offer
-their own installation support for these collections; see the Ananconda and
-Canopy web pages for more information.
 
 Other options for a fresh Python install are the standard installer from
 `python.org <https://www.python.org/downloads/mac-osx/>`_, or installing
 Python using a general OSX package management system such as `homebrew
 <http://brew.sh>`_ or `macports <https://www.macports.org>`_.  Power users on
 OSX will likely want one of homebrew or macports on their system to install
 open source software packages, but it is perfectly possible to use these
-systems with another source for your Python binary, such as Anaconda, Canopy
+systems with another source for your Python binary, such as Anaconda
 or Python.org Python.
 
 .. _install_osx_binaries:
diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst
@@ -100,8 +100,7 @@ provide the following information in your e-mail to the `mailing list
      python -c "import matplotlib; print matplotlib.__version__"
 
 * Where you obtained Matplotlib (e.g., your Linux distribution's packages,
-  GitHub, PyPi, or `Anaconda <https://www.anaconda.com/>`_ or
-  `Enthought Canopy <https://www.enthought.com/products/canopy/>`_).
+  GitHub, PyPi, or `Anaconda <https://www.anaconda.com/>`_).
 
 * Any customizations to your ``matplotlibrc`` file (see
   :doc:`/tutorials/introductory/customizing`).
