Reorganizing main page per training call

ksandeep-palc · Apr 13, 2017 · 0b5547a · 0b5547a
1 parent 81dea35
commit 0b5547a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 21 deletions.
diff --git a/index.rst b/index.rst
@@ -32,27 +32,20 @@ Installation
 .. toctree::
    :maxdepth: 1
 
-   install_toolkit
+   install_getting
+   install_quick_start
+   install_centos_netinstall
+   install_centos_fullinstall
+   install_config_first_time
    install_centos
    install_debian
+   install_migrate_centos7
 
 
 .. _index-toolkit:
 
 perfSONAR Toolkit
------------------
-
-Toolkit Installation
-====================
-.. toctree::
-   :maxdepth: 1
-
-   install_quick_start
-   install_getting
-   install_centos_netinstall
-   install_centos_fullinstall
-   install_config_first_time
-   install_migrate_centos7
+------------------
 
 Managing the perfSONAR Toolkit
 ==============================

diff --git a/install_centos.rst b/install_centos.rst
@@ -1,5 +1,5 @@
 ******************************
-Installation on CentOS 
+Bundle Installation on CentOS 
 ******************************
 
 perfSONAR combines various sets of measurement tools and services. Commonly people install the entire set of tools using the Toolkit ISO (as detailed at :doc:`install_getting`) but this may not be optimal for every situation. For example if you only need a subset of the tools, you have an existing CentOS system on which you'd like to install the software and/or you are doing a large deployment of perfSONAR nodes. With this in mind RPMs are available that install the bundles described in :doc:`install_options`. The steps in the remaining sections of this document detail the steps required for installing these bundles.

diff --git a/install_debian.rst b/install_debian.rst
@@ -1,6 +1,6 @@
-**********************
-Installation on Debian
-**********************
+***********************************
+Bundle Installation on Debian
+***********************************
 
 perfSONAR combines various sets of measurement tools and services. For perfSONAR 4.0 we provide the whole perfSONAR toolkit as Debian packages for five different architectures.  This should enable you to deploy a full perfSONAR node on one of the following distributions:
 

diff --git a/install_getting.rst b/install_getting.rst
@@ -1,7 +1,10 @@
 ****************************
-Getting the Toolkit Software
+Getting the Software
 ****************************
 
+Toolkit
+---------
+
 .. _GettingChooseInstall:
 
 Choosing a Toolkit Installation Method
@@ -39,6 +42,6 @@ Downloads
 
 .. |centos_fullinstall_when|  replace:: Use this in cases where the installation host has limited to no network connectivity to the CentOS and perfSONAR download servers. Be aware that this installation type may result in outdated packages initially and updates may be impossible if external network connectivity is not available even after the initial install. 
 
-Alternative installation methods
-================================
+Bundles
+--------------------
 We now also provide some alternative installation methods based on bundles where only a subset of the perfSONAR toolkit is installed.  These bundles offer more flexibility in your installation options and are also supported on a wider OS selection.  See :doc:`install_options` for details.
diff --git a/pscheduler_client_tasks.rst b/pscheduler_client_tasks.rst
@@ -110,5 +110,8 @@ Test parameters may be changed on the fly by adding them to the command line aft
 Pausing Tasks
 ------------------
 
+Resuming Tasks
+------------------
+
 Canceling Tasks
 ------------------