Few docu updates

molmod · Aug 4, 2017 · 4fbab69 · 4fbab69
1 parent d71c012
commit 4fbab69
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/doc/ug_features.rst b/doc/ug_features.rst
@@ -36,7 +36,9 @@ Release notes
 * Version 1.2.0
 
   - Installable with pip.
-  - Fix parallel testing issues.
+  - Installable with conda.
+  - Automatic deployment of new releases.
+  - Fix parallel unit testing issues.
 
 * Version 1.1.3
 

diff --git a/doc/ug_install.rst b/doc/ug_install.rst
@@ -56,11 +56,23 @@ command.
 Installation
 ============
 
-You can install Yaff with pip:
+You can install Yaff with pip (in your home directory):
 
 .. code:: bash
 
-    pip install --user yaff
+    pip install yaff --user
+
+or in system wide or in a virtual environment:
+
+.. code:: bash
+
+    pip install yaff
+
+Alternatively, you can also install yaff with conda. See https://www.continuum.io/downloads
+
+.. code:: bash
+
+    conda install -c tovrstra yaff
 
 
 Test your installation