From d277b81849655402ed050bd67be8a960de2d1d51 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: Icde6808f4ae6e6426c58acf5fc3c6f6dee297302 Signed-off-by: fuqiao@chinamobile.com --- docs/scenarios/index.rst | 6 ++++++ docs/userguide/index.rst | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst index 24e6b3d..f299246 100644 --- a/docs/scenarios/index.rst +++ b/docs/scenarios/index.rst @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= .. OPNFV Release Engineering documentation, created by sphinx-quickstart on Tue Jun 9 19:12:31 2015. @@ -20,6 +21,11 @@ Gap Analysis of High Availability .. http://creativecommons.org/licenses/by/4.0 .. (c) >>>>>>> 593ef4f... Documentation update +======= +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) +>>>>>>> 593ef4f... Documentation update ********************************* Gap Analysis of High Availability diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 17ed443..7dc7811 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -1,5 +1,6 @@ <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= .. OPNFV Release Engineering documentation, created by sphinx-quickstart on Tue Jun 9 19:12:31 2015. @@ -20,6 +21,11 @@ HA Deployment Framework Guideline .. http://creativecommons.org/licenses/by/4.0 .. (c) >>>>>>> 593ef4f... Documentation update +======= +.. This work is licensed under a Creative Commons Attribution 4.0 International License. +.. http://creativecommons.org/licenses/by/4.0 +.. (c) +>>>>>>> 593ef4f... Documentation update ********************************* HA Deployment Framework Guideline -- cgit 1.2.3-korg