X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/d9ce6feb2d36e40e83326744f1d4ff3890d1874f..23922aa39e585f1e6b11f3479da002c92bebf2a1:/doc/install.rst?ds=sidebyside

diff --git a/doc/install.rst b/doc/install.rst
index a19f9ba..7aba246 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -1,29 +1,47 @@
-.. _installation:
+
+.. _install:
 
 Installation
+============
+
+
+.. _install_dep:
+
+Dependencies
 ------------
 
-Source
-======
+LinPy requires Python version 3.4 or above to work.
 
-Users can install Linpy by cloning the git repository::
+LinPy's one mandatory dependency is `isl <http://isl.gforge.inria.fr/>`_ version 0.12 or 0.13 (it may work with other versions of isl, but this has not been tested).
+isl can be downloaded `here <http://freshmeat.net/projects/isl/>`_ or preferably, using your favorite package manager.
+For Debian or Ubuntu, the command to run is::
 
-	git clone https://scm.cri.ensmp.fr/git/pypol.git
+    sudo apt-get install libisl-dev
 
-Install
-=======
+Apart from isl, there are two optional dependencies that will maximize the use of LinPy's functions: `SymPy <http://sympy.org/en/index.html>`_ and `matplotlib <http://matplotlib.org/>`_.
+Please consult the `SymPy download page <http://sympy.org/en/download.html>`_ and `matplotlib installation instructions <http://matplotlib.org/faq/installing_faq.html#how-to-install>`_ to install these libraries.
 
-…execute `setup.py` 
 
-Dependencies
-============
+.. _install_pip:
+
+Install Using pip
+-----------------
+
+This is the recommanded way to install LinPy, with the command::
+
+    sudo pip install linpy
+
 
-Linpy has several dependencies. Users will first need to install Integer Set Library (isl). The source files of isl are available as a tarball or a git repository. Both are available `here`_ .  
+.. _install_source:
 
-To use the Linpy plotting function, users need to install matplotlib using instructions in the following `link`_.
+Install From Source
+-------------------
 
+Alternatively, LinPy can be installed from source.
+First, clone the public git repository::
 
+    git clone https://scm.cri.mines-paristech.fr/git/linpy.git
 
-.. _here: http://freshmeat.net/projects/isl/
+and build and install as usual with::
 
-.. _link: http://matplotlib.org/faq/installing_faq.html
\ No newline at end of file
+    sudo python3 setup.py install