diff options
| author |   Sofia Wallin <sofia.wallin@ericsson.com> | 2016-10-25 15:29:23 +0200 |
|---|---|---|
| committer |   fuqiao <fuqiao@chinamobile.com> | 2017-01-06 14:49:07 +0800 |
| commit | d277b81849655402ed050bd67be8a960de2d1d51 (patch) | |
| tree | 58388d6e894b84f998fa8b2925618fd66db72b4d | |
| parent | 071dde61d08d021891b1e77e3fa0376a8f16b9b0 (diff) | |
Documentation update
Index files updated to enable correct documentation rendering.
JIRA: DOCS-85
Change-Id: Icde6808f4ae6e6426c58acf5fc3c6f6dee297302
Signed-off-by: fuqiao@chinamobile.com
| -rw-r--r-- | docs/scenarios/index.rst | 6 | ||||
| -rw-r--r-- | docs/userguide/index.rst | 6 |
2 files changed, 12 insertions, 0 deletions
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) <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 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) <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 |