From 071dde61d08d021891b1e77e3fa0376a8f16b9b0 Mon Sep 17 00:00:00 2001 From: Sofia Wallin Date: Tue, 25 Oct 2016 15:29:23 +0200 Subject: Documentation update Index files updated to enable correct documentation rendering. JIRA: DOCS-85 Change-Id: Ia2429bf87284c40260f0fba4c7ad9d47438275b5 Signed-off-by:fuqiao@chinamobile.com --- docs/scenarios/index.rst | 10 +++++++++- docs/userguide/index.rst | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst index 5a8353f..24e6b3d 100644 --- a/docs/scenarios/index.rst +++ b/docs/scenarios/index.rst @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ======= .. OPNFV Release Engineering documentation, created by sphinx-quickstart on Tue Jun 9 19:12:31 2015. @@ -14,8 +15,15 @@ >>>>>>> 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) +>>>>>>> 593ef4f... Documentation update -Contents: +********************************* +Gap Analysis of High Availability +********************************* .. toctree:: :numbered: diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 12e6a75..17ed443 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ======= .. OPNFV Release Engineering documentation, created by sphinx-quickstart on Tue Jun 9 19:12:31 2015. @@ -14,8 +15,15 @@ >>>>>>> 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) +>>>>>>> 593ef4f... Documentation update -Contents: +********************************* +HA Deployment Framework Guideline +********************************* .. toctree:: :numbered: -- cgit 1.2.3-korg