Explained KEYSTONE_SERVICE_PROJECT_NAME variable

The objective is to make it more explicit that the 'service' project
is referring to the keystone service.
This changeset also updated the documentation to stay under the
limit of 80 per line.

Change-Id: I22430585e3e8999f27c2c2d48398a70298da9850

doc/source/deploy/user-guide.rst

@@ -4,15 +4,19 @@
 Welcome to the Watcher User Guide
 =================================
 
-In the `architecture <https://wiki.openstack.org/wiki/WatcherArchitecture>`_ you got information about how it works.
-In this guide we're going to take you through the fundamentals of using Watcher.
+In the `architecture <https://wiki.openstack.org/wiki/WatcherArchitecture>`_
+you got information about how it works.
+In this guide we're going to take you through the fundamentals of using
+Watcher.
 
 
 Getting started with Watcher
 ----------------------------
-This guide assumes you have a working installation of Watcher. If you get "*watcher: command not found*" you may have to verify your installation.
-Please refer to installation guide.
-In order to use Watcher, you have to configure your credentials suitable for watcher command-line tools.
+This guide assumes you have a working installation of Watcher. If you get
+"*watcher: command not found*" you may have to verify your installation.
+Please refer to the :doc:`installation guide <installation>`.
+In order to use Watcher, you have to configure your credentials suitable for
+watcher command-line tools.
 If you need help on a specific command, you can use:
 
 .. code:: bash
@@ -21,7 +25,8 @@ If you need help on a specific command, you can use:
 
 Seeing what the Watcher CLI can do ?
 ------------------------------------
-We can see all of the commands available with Watcher CLI by running the watcher binary without options.
+We can see all of the commands available with Watcher CLI by running the
+watcher binary without options.
 
 .. code:: bash
 
@@ -30,57 +35,74 @@ We can see all of the commands available with Watcher CLI by running the watcher
 How do I run an audit of my cluster ?
 -------------------------------------
 
-First, you need to create an audit template. An audit template defines an optimization goal to achieve (i.e. the settings of your audit).
-This goal should be declared in the Watcher service configuration file **/etc/watcher/watcher.conf**.
+First, you need to create an :ref:`audit template <audit_template_definition>`.
+An :ref:`audit template <audit_template_definition>` defines an optimization
+:ref:`goal <goal_definition>` to achieve (i.e. the settings of your audit).
+This goal should be declared in the Watcher service configuration file
+**/etc/watcher/watcher.conf**.
 
 .. code:: bash
 
   $ watcher audit-template-create my_first_audit SERVERS_CONSOLIDATION
 
-If you get "*You must provide a username via either --os-username or via env[OS_USERNAME]*" you may have to verify your credentials
+If you get "*You must provide a username via either --os-username or via
+env[OS_USERNAME]*" you may have to verify your credentials.
 
-Then, you can create an audit. An audit is a request for optimizing your cluster depending on the specified goal.
+Then, you can create an audit. An audit is a request for optimizing your
+cluster depending on the specified :ref:`goal <goal_definition>`.
 
-You can launch an audit on your cluster by referencing the audit template (i.e. the settings of your audit) that you want to use.
+You can launch an audit on your cluster by referencing the
+:ref:`audit template <audit_template_definition>` (i.e. the settings of your
+audit) that you want to use.
 
-- Get the audit template UUID:
+- Get the :ref:`audit template <audit_template_definition>` UUID:
 
 .. code:: bash
 
   $ watcher audit-template-list
 
-- Start an audit based on this audit template settings:
+- Start an audit based on this :ref:`audit template
+  <audit_template_definition>` settings:
 
 .. code:: bash
 
   $ watcher audit-create -a <your_audit_template_uuid>
 
 
-Watcher service will compute an Action Plan composed of a list of potential optimization actions (instance migration, disabling of an hypervisor, ...) according to the goal to achieve.
-You can see all of the goals available in section ``[watcher_strategies]`` of the Watcher service configuration file.
+Watcher service will compute an :ref:`Action Plan <action_plan_definition>`
+composed of a list of potential optimization :ref:`actions <action_definition>`
+(instance migration, disabling of an hypervisor, ...) according to the
+:ref:`goal <goal_definition>` to achieve. You can see all of the goals
+available in section ``[watcher_strategies]`` of the Watcher service
+configuration file.
 
-- Wait until the Watcher audit has produced a new action plan, and get it:
+- Wait until the Watcher audit has produced a new :ref:`action plan
+  <action_plan_definition>`, and get it:
 
 .. code:: bash
 
   $ watcher action-plan-list --audit <the_audit_uuid>
 
-- Have a look on the list of optimization actions contained in this new action plan:
+- Have a look on the list of optimization :ref:`actions <action_definition>`
+contained in this new :ref:`action plan <action_plan_definition>`:
 
 .. code:: bash
 
   $ watcher action-list --action-plan <the_action_plan_uuid>
 
 
-Once you've learned how to create an Action Plan, it's time to go further by applying it to your cluster:
+Once you have learned how to create an :ref:`Action Plan
+<action_plan_definition>`, it's time to go further by applying it to your
+cluster:
 
-- Execute the action plan:
+- Execute the :ref:`action plan <action_plan_definition>`:
 
 .. code:: bash
 
   $ watcher action-plan-start <the_action_plan_uuid>
 
-You can follow the states of the actions by calling periodically:
+You can follow the states of the :ref:`actions <action_definition>` by
+periodically calling:
 
 .. code:: bash
 
@@ -91,5 +113,3 @@ You can also obtain more detailed information about a specific action:
 .. code:: bash
 
   $ watcher action-show <the_action_uuid>
-
-