X-Git-Url: https://svn.cri.ensmp.fr/git/linpy.git/blobdiff_plain/35c965895771a3df79744ae54f1eda91f0b62862..ce8dda550018a59520e2d632f10d3fe5650e9d0d:/doc/install.rst

diff --git a/doc/install.rst b/doc/install.rst
index d1b9f1f..7aba246 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -1,44 +1,47 @@
-.. _installation:
+
+.. _install:
 
 Installation
-------------
-Source
-======
+============
 
-Users can install LinPy by cloning the git repository::
 
-    git clone https://scm.cri.ensmp.fr/git/linpy.git
+.. _install_dep:
 
-Then, execute the following to complete installation::
-    
-    python3 setup.py install
+Dependencies
+------------
 
-PyPi
-====
+LinPy requires Python version 3.4 or above to work.
 
-    sudo pip install linpy
+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::
 
-Dependencies
-============
+    sudo apt-get install libisl-dev
+
+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.
 
-LinPy's one mandatory dependency is isl, which can be downloaded from `here`_ or using package manager, e.g for ubuntu::
 
-    sudo apt-get install libisl­-dev
+.. _install_pip:
 
-There are two optional dependencies that will maximize the use of LinPy's
-functions; SymPy and matplotlib. SymPy installation instructions can be found on the SymPy `download page`_. Matplotlib install information can be found at this `link`_.
+Install Using pip
+-----------------
 
-License
-=======
+This is the recommanded way to install LinPy, with the command::
+
+    sudo pip install linpy
 
-LinPy is a free software, licensed under the `GPLv3 license`_ . 
 
+.. _install_source:
 
-.. _here: http://freshmeat.net/projects/isl/
+Install From Source
+-------------------
 
-.. _download page: http://sympy.org/en/download.html
+Alternatively, LinPy can be installed from source.
+First, clone the public git repository::
 
-.. _link: http://matplotlib.org/faq/installing_faq.html
+    git clone https://scm.cri.mines-paristech.fr/git/linpy.git
 
-.. _GPLv3 license: https://www.gnu.org/licenses/gpl-3.0.txt
+and build and install as usual with::
 
+    sudo python3 setup.py install