12 files changed, 72 insertions, 64 deletions
diff --git a/docs/release/release-notes/index.rst b/docs/release/release-notes/index.rst
index 8c52b5c8..e18699a6 100644
--- a/docs/release/release-notes/index.rst
+++ b/docs/release/release-notes/index.rst
@@ -6,9 +6,9 @@
 .. (c) 2016 ZTE Corp.
 
 
-##################
+******************
 QTIP Release Notes
-##################
+******************
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/testing/developer/devguide/api.rst b/docs/testing/developer/devguide/api.rst
index 48ae3ae4..491c70f8 100644
--- a/docs/testing/developer/devguide/api.rst
+++ b/docs/testing/developer/devguide/api.rst
@@ -1,9 +1,10 @@
-**********************************************
-QTIP RESTful Application Programming Interface
-**********************************************
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
 
-Abstract
-########
+
+***************************************
+API - Application Programming Interface
+***************************************
 
 QTIP consists of different tools(metrics) to benchmark the NFVI. These metrics
 fall under different NFVI subsystems(QPI's) such as compute, storage and network.
diff --git a/docs/testing/developer/devguide/arch.rst b/docs/testing/developer/devguide/arch.rst
index d95faba6..6b9208e9 100644
--- a/docs/testing/developer/devguide/arch.rst
+++ b/docs/testing/developer/devguide/arch.rst
@@ -3,9 +3,9 @@
 .. (c) 2017 ZTE Corp.
 
 
-########################
-QTIP Architecture Design
-########################
+************
+Architecture
+************
 
 In Danube, QTIP releases its standalone mode, which is also know as ``solo``:
 
diff --git a/docs/testing/developer/devguide/cli.rst b/docs/testing/developer/devguide/cli.rst
index 72d1fbaf..7c681a64 100644
--- a/docs/testing/developer/devguide/cli.rst
+++ b/docs/testing/developer/devguide/cli.rst
@@ -1,9 +1,10 @@
-***************************
-QTIP Command Line Interface
-***************************
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
 
-Abstract
-########
+
+****************************
+CLI - Command Line Interface
+****************************
 
 QTIP consists of different tools(metrics) to benchmark the NFVI. These metrics fall under different NFVI
 subsystems(QPI's) such as compute, storage and network. A plan consists of one or more QPI's, depending upon how
diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index 89113e56..1c993dc9 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -3,9 +3,9 @@
 .. (c) 2016 ZTE Corp.
 
 
-##########################
-QTIP Design Specifications
-##########################
+***************
+Developer Guide
+***************
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/testing/developer/devguide/overview.rst b/docs/testing/developer/devguide/overview.rst
index d394574e..1d7e22fe 100644
--- a/docs/testing/developer/devguide/overview.rst
+++ b/docs/testing/developer/devguide/overview.rst
@@ -3,9 +3,9 @@
 .. (c) 2017 ZTE Corporation
 
 
-########
+********
 Overview
-########
+********
 
 QTIP uses Python as primary programming language and build the framework from the following packages
 
@@ -19,16 +19,15 @@ docs     `sphinx`_ - a tool that makes it easy to create intelligent and beautif
 testing  `pytest`_ - a mature full-featured Python testing tool that helps you write better programs
 ======== ===============================================================================================================
 
-***********
+
 Source Code
-***********
+===========
 
- The structure of repository is based on the recommended sample in
-`The Hitchhiker's Guide to Python`_
+The structure of repository is based on the recommended sample in `The Hitchhiker's Guide to Python`_
 
-==================  ========================================================================================================
+==================  ====================================================================================================
 Path                Content
-==================  ========================================================================================================
+==================  ====================================================================================================
 ``./benchmarks/``   builtin benchmark assets including plan, QPI and metrics
 ``./contrib/``      independent project/plugin/code contributed to QTIP
 ``./docker/``       configuration for building Docker image for QTIP deployment
@@ -38,11 +37,11 @@ Path                Content
 ``./qtip/``         the actual package
 ``./tests/``        package functional and unit tests
 ``./third-party/``  third part included in QTIP project
-==================  ========================================================================================================
+==================  ====================================================================================================
+
 
-************
 Coding Style
-************
+============
 
 QTIP follows `OpenStack Style Guidelines`_ for source code and commit message.
 
@@ -52,19 +51,19 @@ Specially, it is recommended to link each patch set with a JIRA issue. Put::
 
 in commit message to create an automatic link.
 
-*******
+
 Testing
-*******
+=======
 
 All testing related code are stored in ``./tests/``
 
-==================  ========================================================================================================
+==================  ====================================================================================================
 Path                Content
-==================  ========================================================================================================
+==================  ====================================================================================================
 ``./tests/data/``   data fixtures for testing
 ``./tests/unit/``   unit test for each module, follow the same layout as ./qtip/
 ``./conftest.py``   pytest configuration in project scope
-==================  ========================================================================================================
+==================  ====================================================================================================
 
 `tox`_ is used to automate the testing tasks
 
diff --git a/docs/testing/user/configguide/index.rst b/docs/testing/user/configguide/index.rst
index d5e05d63..43c32cab 100644
--- a/docs/testing/user/configguide/index.rst
+++ b/docs/testing/user/configguide/index.rst
@@ -4,9 +4,9 @@
 .. (c) 2016 ZTE Corp.
 
 
-#################
-QTIP Config Guide
-#################
+*********************************
+QTIP Installation & Configuration
+*********************************
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/testing/user/userguide/api.rst b/docs/testing/user/userguide/api.rst
index 080fef5f..7e1d7b1c 100644
--- a/docs/testing/user/userguide/api.rst
+++ b/docs/testing/user/userguide/api.rst
@@ -1,6 +1,10 @@
-**************
-QTIP API Usage
-**************
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+
+***************
+API User Manual
+***************
 
 QTIP consists of a number of benchmarking tools or metrics, grouped under QPI's. QPI's map to the different
 components of an NFVI ecosystem, such as compute, network and storage. Depending on the type of application,
diff --git a/docs/testing/user/userguide/cli.rst b/docs/testing/user/userguide/cli.rst
index 96026c5b..99efd930 100644
--- a/docs/testing/user/userguide/cli.rst
+++ b/docs/testing/user/userguide/cli.rst
@@ -1,6 +1,10 @@
-**************
-QTIP CLI Usage
-**************
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+
+
+***************
+CLI User Manual
+***************
 
 QTIP consists of a number of benchmarking tools or metrics, grouped under QPI's. QPI's map to the different
 components of a NFVI ecosystem, such as compute, network and storage. Depending on the type of application,
diff --git a/docs/testing/user/userguide/qpi-compute.rst b/docs/testing/user/userguide/compute.rst
index d64925bd..f889bfe6 100644
--- a/docs/testing/user/userguide/qpi-compute.rst
+++ b/docs/testing/user/userguide/compute.rst
@@ -4,11 +4,9 @@
 .. (c) 2016 ZTE Corp.
 
 
-Compute QPI
-===========
-
-Introduction
-------------
+********************************
+Compute Performance Benchmarking
+********************************
 
 The compute QPI aims to benchmark the compute components of an OPNFV platform.
 Such components include, the CPU performance, the memory performance.
@@ -23,13 +21,14 @@ Note: The Compute benchmank constains relatively old benchmarks such as dhryston
 and whetstone. The suite would be updated for better benchmarks such as Linbench for
 the OPNFV E release.
 
-Getting start with compute QPI
-------------------------------
+
+Getting started
+===============
 
 Notice: All descriptions are based on QTIP container.
 
 Inventory File
-^^^^^^^^^^^^^^
+--------------
 
 QTIP uses Ansible to trigger benchmark test. Ansible uses an inventory file to
 determine what hosts to work against. QTIP can automatically generate a inventory
@@ -43,7 +42,7 @@ IP addresses. For example:
   10.20.0.12
 
 QTIP key Pair
-^^^^^^^^^^^^^
+-------------
 
 QTIP use a SSH key pair to connect to remote hosts. When users execute compute QPI,
 QTIP will generate a key pair named *QtipKey* under ``/home/opnfv/qtip/`` and pass
@@ -54,8 +53,8 @@ manual. If *CI_DEBUG* is not set or set to *false*, QTIP will delete the key fro
 remote hosts before the execution ends. Please make sure the key deleted from remote
 hosts or it can introduce a security flaw.
 
-Commands to run compute QPI
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Commands
+--------
 
 In a QTIP container, you can run compute QPI by using QTIP CLI:
 ::
@@ -68,8 +67,8 @@ timestamp name.
 
 you can get more details from *userguide/cli.rst*.
 
-Benchmarks
-----------
+Metrics
+-------
 
 The benchmarks include:
 
diff --git a/docs/testing/user/userguide/index.rst b/docs/testing/user/userguide/index.rst
index 04a12f08..d0d555f8 100644
--- a/docs/testing/user/userguide/index.rst
+++ b/docs/testing/user/userguide/index.rst
@@ -4,9 +4,9 @@
 .. (c) 2016 ZTE Corp.
 
 
-###############
+***************
 QTIP User Guide
-###############
+***************
 
 .. toctree::
    :maxdepth: 2
@@ -14,4 +14,4 @@ QTIP User Guide
    overview.rst
    cli.rst
    api.rst
-   qpi-compute.rst
+   compute.rst
diff --git a/docs/testing/user/userguide/overview.rst b/docs/testing/user/userguide/overview.rst
index 1ad0b670..726d70bc 100644
--- a/docs/testing/user/userguide/overview.rst
+++ b/docs/testing/user/userguide/overview.rst
@@ -3,9 +3,9 @@
 .. (c) 2017 ZTE Corp.
 
 
-############
-Introduction
-############
+********
+Overview
+********
 
 `QTIP`_ is the project for **Platform Performance Benchmarking** in `OPNFV`_. It aims to provide user a simple indicator
 for performance, simple but supported by comprehensive testing data and transparent calculation formula.
@@ -18,9 +18,9 @@ performance. **TRUE** reflects the core value of QPI in four aspects
 - *Understandable*: QPI is broke down into section scores, and workload scores in report to help user to understand
 - *Extensible*: users may create their own QPI by composing the existed metrics in QTIP or extend new metrics
 
-##########
+
 Benchmarks
-##########
+==========
 
 The builtin benchmarks of QTIP are located in ``<package_root>/benchmarks`` folder