Make plugin installer default documented way of installing InaSAFE

docs/source/contents.rst

@@ -6,10 +6,10 @@ Contents
 .. toctree::
    :maxdepth: 2
 
+   tutorial-docs/tutorial
    user-docs/index
    developer-docs/index
    api-docs/index
-   tutorial-docs/tutorial
    authors
 
 

docs/source/tutorial-docs/tutorial.rst

@@ -1,5 +1,5 @@
 =================================================================
-Ina-SAFE (Indonesian Scenario Assessment For Emergencies) V 0.4.0
+InaSAFE Tutorial
 =================================================================
 
 Overview
@@ -19,8 +19,8 @@ you the ability to learn how to manipulate data in InaSAFE, what the
 requirements of the data are and what kind of results you can expect out of the
 data.
 
-Who Should Attend
-.................
+Prerequisites
+.............
 
 This training is designed for those with a basic or intermediate knowledge of
 GIS, who wants to integrate scientific-based risk impact scenario in their
@@ -54,7 +54,7 @@ Reference
 .........
 
 “InaSAFE Documentation, Release 0.4.0-alpha”, Ole Moeller Nielsen & Tim Sutton,
-June 2012.  For more information, please visit www.inasafe.org.
+June 2012.  For more information, please visit `www.inasafe.org <http://inasafe.org>`_.
 
 Installation
 ------------
@@ -64,12 +64,23 @@ Install QGIS
 
 You need QGIS version 1.7 or newer.
 
-You can download the software from
-http://hub.qgis.org/projects/quantum-gis/wiki/Download.
+You can download the software from http://download.qgis.org.
 
 Install InaSAFE Plugin
 ......................
 
+Option 1: From QGIS Repository:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To install the InaSAFE, use the plugin manager in QGIS:
+
+:menuselection:`Plugins --> Fetch Python Plugins`
+Then search for ‘InaSAFE‘, select it and click the install button. The plugin
+will now be added to your plugins menu.
+
+Option 2: Manual Installation:
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 To install the InaSAFE plugin, go to
 https://github.com/AIFDR/inasafe/downloads.
 

docs/source/user-docs/install.rst

@@ -6,9 +6,23 @@ Installing InaSAFE
    |project_name| is a plugin for `Quantum GIS <http://qgis.org>`_ (QGIS), so
    QGIS must be installed first.
 
+Via QGIS Python Plugin Repository
+---------------------------------
+
+To install the |project_name|, use the plugin manager in QGIS::
+
+  Plugins -> Fetch Python Plugins
+
+Then search for '|project_name|', select it and click the install button.
+The plugin will now be added to your plugins menu.
+
 From Zip Archive
 ----------------
 
+.. warning:: This installation method is not recommended unless you have no
+   internet access or wish to use a specific version of InaSAFE. Please
+   install using the plugin repository described above rather.
+
 We make regular releases of the InaSAFE plugin and they are available at
 https://github.com/AIFDR/inasafe/downloads. Simply choose the most recent (i.e.
 the one with the largest version number) and save it to your hard disk.
@@ -32,18 +46,6 @@ appear in the list. Now tick the checkbox next to it to enable the plugin.
    :align: center
 
 
-Via QGIS Python Plugin Repository
----------------------------------
-
-.. warning:: This installation method is not yet supported - watch this space it
-   will be available in the near future.
-
-To install the |project_name|, use the plugin manager in QGIS::
-
-  Plugins -> Fetch Python Plugins
-
-Then search for '|project_name|', select it and click the install button.
-The plugin will now be added to your plugins menu.
 
 System Requirements
 -------------------