diff options
author | Sofia Wallin <sofia.wallin@ericsson.com> | 2016-10-25 15:29:23 +0200 |
---|---|---|
committer | fuqiao <fuqiao@chinamobile.com> | 2017-01-06 15:09:39 +0800 |
commit | c60a7eeb5ce9974da87a1188834c8a35d8f83124 (patch) | |
tree | 8cf8b12c2f6a64dc61969707a5da8992e9f76c09 | |
parent | d277b81849655402ed050bd67be8a960de2d1d51 (diff) |
Documentation updatestable/colorado
Index files updated to enable correct documentation rendering.
JIRA: DOCS-85
Change-Id: Iec6d7e672a058804f02ca9f3cdc4a83e1885e826
Signed-off-by: fuqiao@chinamobile.com
-rw-r--r-- | docs/scenarios/index.rst | 37 | ||||
-rw-r--r-- | docs/userguide/index.rst | 38 |
2 files changed, 2 insertions, 73 deletions
diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst index f299246..d8a86b0 100644 --- a/docs/scenarios/index.rst +++ b/docs/scenarios/index.rst @@ -1,31 +1,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -.. OPNFV Release Engineering documentation, created by - sphinx-quickstart on Tue Jun 9 19:12:31 2015. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -.. image:: ../etc/opnfv-logo.png - :height: 40 - :width: 200 - :alt: OPNFV - :align: left - ->>>>>>> 011d936... Update the docs folder -Gap Analysis of High Availability -======================================= -======= -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> ->>>>>>> 593ef4f... Documentation update -======= .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> ->>>>>>> 593ef4f... Documentation update + ********************************* Gap Analysis of High Availability @@ -36,15 +12,4 @@ Gap Analysis of High Availability :maxdepth: 4 GAP_Analysis_Colorado.rst -<<<<<<< HEAD -======= - -Indices and tables -================== - -* :ref:`search` - -Revision: _sha1_ -Build date: |today| ->>>>>>> 011d936... Update the docs folder diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 7dc7811..1900322 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -1,31 +1,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -======= -.. OPNFV Release Engineering documentation, created by - sphinx-quickstart on Tue Jun 9 19:12:31 2015. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -.. image:: ../etc/opnfv-logo.png - :height: 40 - :width: 200 - :alt: OPNFV - :align: left - ->>>>>>> 011d936... Update the docs folder -HA Deployment Framework Guideline -======================================= -======= -.. This work is licensed under a Creative Commons Attribution 4.0 International License. -.. http://creativecommons.org/licenses/by/4.0 -.. (c) <optionally add copywriters name> ->>>>>>> 593ef4f... Documentation update -======= .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 .. (c) <optionally add copywriters name> ->>>>>>> 593ef4f... Documentation update + ********************************* HA Deployment Framework Guideline @@ -36,15 +12,3 @@ HA Deployment Framework Guideline :maxdepth: 4 Deployment_Guideline.rst -<<<<<<< HEAD -======= - -Indices and tables -================== - -* :ref:`search` - -Revision: _sha1_ - -Build date: |today| ->>>>>>> 011d936... Update the docs folder |