Merge branch 'stable'

tritemio · Aug 30, 2016 · 3e6fb18 · 3e6fb18
2 parents d8a2bff + 1dd3b80
commit 3e6fb18
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/doc/index.rst b/doc/index.rst
@@ -25,11 +25,15 @@ supporting tidy DataFrames.
 Installation
 ------------
 
-Install pybroom with `pip` (python 3 only)::
+You can install pybroom from PyPI using the following command::
 
     pip install pybroom
 
-Dependencies are only pandas and lmfit (0.9.5+, which in turn requires scipy).
+or from `conda-forge <https://conda-forge.github.io/>`__ using::
+
+    conda install -c conda-forge pybroom
+
+Dependencies are python 3.4+, pandas and lmfit (0.9.5+, which in turn requires scipy).
 However, matplotlib and seaborn are strongly recommended (and necessary
 to run the example notebooks).