Merge branch 'master' of https://github.com/REGOVAR/Pirus

REGOVAR · Oct 6, 2016 · 557dd01 · 557dd01
2 parents 84e9762 + 2c86e34
commit 557dd01
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,7 @@ Pirus is an application launcher service which allow user to run pipeline code f
 
 
 ## Installation 
-You need to have [MongoDB](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/)
- and [RabbitMQ](https://www.rabbitmq.com/install-debian.html) installed on your system. 
+You need to have [MongoDB](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/) and [RabbitMQ](https://www.rabbitmq.com/install-debian.html) installed on your system. 
 
         sudo apt install rabbitmq-server
         sudo apt install mongodb

diff --git a/docs/index.rst b/docs/index.rst
@@ -10,7 +10,17 @@ Contents:
 
 .. toctree::
    :maxdepth: 2
-
+
+
+   presentation
+   installation
+   userguide
+   devguide
+
+
+   restapi
+   architecture
+
 
 
 Indices and tables

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -2,22 +2,22 @@
 Installation
 ============
 
-You need to have [MongoDB](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/) and [RabbitMQ](https://www.rabbitmq.com/install-debian.html) installed on your system. 
-.. code-block:: bash
-    sudo apt install rabbitmq-server
-    sudo apt install mongodb
-    sudo apt install lxd
+You need to have `MongoDB <https://docs.mongodb.com/manual/tutorial/install-mongodb-on-ubuntu/>`_ and `RabbitMQ <https://www.rabbitmq.com/install-debian.html>`_ installed on your system :: 
+
+        sudo apt install rabbitmq-server
+        sudo apt install mongodb
+        sudo apt install lxd
 
-You may need also to install
-.. code-block:: bash
-    sudo apt install build-essential libssl-dev libffi-dev python3-dev virtualenv
+You may need also to install ::
+
+        sudo apt install build-essential libssl-dev libffi-dev python3-dev virtualenv
 	
         
-You can then clone the repository and install requirements.
-.. code-block:: bash
-    git clone https://github.com/REGOVAR/Pirus.git
-    cd Pirus
-    virtualenv -p /usr/bin/python3.5 venv
-    source venv/bin/activate
-    pip install -r requirements.txt
+You can then clone the repository and install requirements ::
+
+        git clone https://github.com/REGOVAR/Pirus.git
+        cd Pirus
+        virtualenv -p /usr/bin/python3.5 venv
+        source venv/bin/activate
+        pip install -r requirements.txt