DOC: update installation instructions (python-control#225)

murrayrm · murrayrm · commit 25f137160539 · 2018-07-13T21:20:32.000-07:00
diff --git a/README.rst b/README.rst
@@ -24,7 +24,7 @@ Features
 Links
 =====
 
-- Project home page: http://python-control.sourceforge.net
+- Project home page: http://python-control.org
 - Source code repository: https://github.com/python-control/python-control
 - Documentation: http://python-control.readthedocs.org/
 - Issue tracker: https://github.com/python-control/python-control/issues
@@ -46,7 +46,7 @@ https://github.com/python-control/Slycot
 Installation
 ============
 
-The package may be installed using pip or distutils.
+The package may be installed using pip, conda, or distutils.
 
 Pip
 ---
@@ -56,6 +56,14 @@ To install using pip::
   pip install slycot   # optional
   pip install control
 
+conda-forge
+-----------
+
+Binaries are available from conda-forge for selected platforms (Linux and
+MacOS).  Install using
+
+  conda install -c conda-forge control
+
 Distutils
 ---------
 
diff --git a/doc/intro.rst b/doc/intro.rst
@@ -62,11 +62,10 @@ For users with the Anaconda distribution of Python, the following
 commands can be used::
 
   conda install numpy scipy matplotlib    # if not yet installed
-  conda install -c python-control -c cyclus slycot control
+  conda install -c conda-forge control
 
-This installs `slycot` and `python-control` from the `python-control`
-channel and uses the `cyclus` channel to obtain the required `lapack`
-package. 
+This installs `slycot` and `python-control` from conda-forge, including the
+`openblas` package.
 
 Alternatively, to use setuptools, first `download the source <https://github.com/python-control/python-control/releases>`_ and unpack
 it.  To install in your home directory, use::
