Merge pull request #3063 from tonysyu/update-EPD-links

tacaswell · tacaswell · commit 672b30feb460 · 2014-05-15T10:48:44.000-04:00
Change EPD links to Enthought Canopy
diff --git a/doc/faq/installing_faq.rst b/doc/faq/installing_faq.rst
@@ -183,8 +183,8 @@ Which python for OS X?
 
 Apple ships with its own python, and many users have had trouble
 with it. There are several alternative versions of python that
-can be used. If it is feasible, we recommend that you use the enthought
-python distribution `EPD <http://www.enthought.com/products/epd.php>`_
+can be used. If it is feasible, we recommend that you use
+`Enthought Canopy <https://www.enthought.com/products/canopy/>`_
 for OS X (which comes with matplotlib and much more). Also available is
 `MacPython <http://wiki.python.org/moin/MacPython/Leopard>`_ or the
 official OS X version from `python.org <http://www.python.org/download/>`_.
@@ -313,7 +313,6 @@ scipy, vtk and user interface toolkits.  These packages are quite
 large because they come with so much, but you get everything with
 a single click installer.
 
-* The Enthought Python Distribution `EPD
-  <http://www.enthought.com/products/epd.php>`_
+* `Enthought Canopy <https://www.enthought.com/products/canopy/>`_
 
 * `python (x, y) <http://www.pythonxy.com>`_
diff --git a/doc/faq/troubleshooting_faq.rst b/doc/faq/troubleshooting_faq.rst
@@ -87,9 +87,8 @@ please provide the following information in your e-mail to the
         python -c `import matplotlib; print matplotlib.__version__`
 
   * where you obtained matplotlib (e.g., your Linux distribution's
-    packages or the matplotlib Sourceforge site, or the enthought
-    python distribution `EPD
-    <http://www.enthought.com/products/epd.php>`_).
+    packages or the matplotlib Sourceforge site, or
+    `Enthought Canopy <https://www.enthought.com/products/canopy/>`_.
 
   * any customizations to your ``matplotlibrc`` file (see
     :ref:`customizing-matplotlib`).
