summaryrefslogtreecommitdiffstats
path: root/docs/development/overview/index.rst
diff options
context:
space:
mode:
authorfuqiao <fuqiao@chinamobile.com>2017-03-30 10:13:21 +0800
committerfuqiao <fuqiao@chinamobile.com>2017-03-31 12:45:53 +0800
commit08274b14ccc7531208693a9a09d8c9ab3bdf8b3b (patch)
treec0c72f82b0e3dc63477f02cb6ba4eca856ee34c3 /docs/development/overview/index.rst
parent4260b10e3a7c7780385a61d6d708a9480d208a1a (diff)
Modify format issues
Modify format issues JIRA: HA-28 Change-Id: I5ab2bee17801d3b0741b83497391935f28602057 Signed-off-by: fuqiao@chinamobile.com Conflicts: docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst docs/development/overview/OPNFV_HA_Guest_APIs-Overview_HLD.rst.bak docs/development/overview/index.rst Change-ID: I5ab2bee17801d3b0741b83497391935f28602057 Signed-off-by: fuqiao@chinamobile.com
Diffstat (limited to 'docs/development/overview/index.rst')
-rw-r--r--docs/development/overview/index.rst10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst
index 71bdbf4..97fc100 100644
--- a/docs/development/overview/index.rst
+++ b/docs/development/overview/index.rst
@@ -2,12 +2,18 @@
.. http://creativecommons.org/licenses/by/4.0
.. (c) <optionally add copywriters name>
+<<<<<<< HEAD
*********************************
OPNFV HA Guest APIs -- Overview
*********************************
+=======
+
+*********************************************************************
+PROPOSAL: Reach-thru Guest Monitoring and Services for High Availability
+*********************************************************************
+>>>>>>> e83e826... Modify format issues
.. toctree::
- :numbered:
- :maxdepth: 2
+ :maxdepth: 4
OPNFV_HA_Guest_APIs-Overview_HLD.rst