replaces epd and pythonxy with anaconda and canopy. Also, added some notions in

katyhuff · dmcdougall · commit 1c7d15ed1212 · 2014-07-16T19:23:35.000-05:00
the readme.osx
diff --git a/INSTALL b/INSTALL
@@ -11,17 +11,17 @@ depends on what operating system you are using, what you already have
 installed, and how you want to use it.  To avoid wading through all
 the details (and potential complications) on this page, the easiest
 thing for you to do is use one of the pre-packaged python
-distributions that already provide matplotlib built-in.  The Enthought
-Python Distribution `(EPD)
-<http://www.enthought.com/products/epd.php>`_ for Windows, OS X or
-Redhat is an excellent choice that "just works" out of the box.
-Another excellent alternative for Windows users is `Python (x, y)
-<http://www.pythonxy.com/>`_ which tends to be updated a bit more
-frequently.  Both of these packages include matplotlib and pylab, and
-*lots* of other useful tools.  matplotlib is also packaged for almost
-every major Linux distribution. So if you are on Linux, your package
-manager will probably provide matplotlib prebuilt.
-
+distributions that already provide matplotlib built-in.  The
+Continuum.io distribution `(Anaconda)
+<https://store.continuum.io/cshop/anaconda/>`_ or the Enthought distribution
+`(Canopy) <https://www.enthought.com/products/canopy/>`_ for Windows, OS X, or
+Redhat is an excellent choice that "just works" out of the box.  Another
+excellent alternative for Windows users is `Python (x, y)
+<http://www.pythonxy.com/>`_ which tends to be updated a bit more frequently.
+Both of these packages include matplotlib and pylab, and *lots* of other useful
+tools.  matplotlib is also packaged for almost every major Linux distribution.
+So if you are on Linux, your package manager will probably provide matplotlib
+prebuilt.
 
 Manually installing pre-built packages
 ======================================
diff --git a/README.osx b/README.osx
@@ -1,11 +1,18 @@
-Building mpl on OSX has proven to be a nightmare because of all the
+Building mpl on OSX is sometimes a nightmare because of all the
 different types of zlib, png and freetype that may be on your system.
-The recommended and supported way to build is to use a third-party
-package manager to install the required dependencies, and then
-install matplotlib from source using the setup.py script. Two widely
-used package managers are homebrew and MacPorts. The following
-example illustrates how to install libpng and freetype using
-homebrew.
+
+For developers who want to build matplotlib from source, the recommended and 
+supported way to build is to use a third-party package manager to install the 
+required dependencies, and then install matplotlib from source using the 
+setup.py script. Three widely used package managers are conda, homebrew, and 
+MacPorts. The following example illustrates how to install libpng and freetype 
+using conda:
+
+Example usage::
+
+  conda install libpng freetype 
+
+If you are using homebrew, execute the following instead:
 
 Example usage::
 
@@ -22,3 +29,7 @@ To install matplotlib from source, execute:
 Example usage::
 
   python setup.py install
+
+
+Note that your environment is somewhat important. Some conda users have found 
+that their PYTHONPATH must include /path/to/anaconda/
