diff options
| author |   fuqiao <fuqiao@chinamobile.com> | 2016-09-21 11:18:34 +0800 |
|---|---|---|
| committer | fuqiao <fuqiao@chinamobile.com> | 2016-09-22 17:45:31 +0800 |
| commit | 63479c68ccc97c60f2f7a119f65090f9e84492f5 (patch) | |
| tree | 673c2b3d091d02970c43a6814ee44687b0ebfa3e /docs/userguide/index.rst | |
| parent | c3e4073831e2f461bed7ad076db6bf768fa58fee (diff) | |
Update the docs folder
Update the docs folder to include the two release docs
JIRA: HA-24
Change-Id: I2d50fb84b9e54ae6b6e05d0f9466e920a8dae1d4
Signed-off-by: fuqiao@chinamobile.com
Diffstat (limited to 'docs/userguide/index.rst')
| -rw-r--r-- | docs/userguide/index.rst | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 6a7fe44..12e6a75 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -1,3 +1,17 @@ +<<<<<<< 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 ======================================= @@ -8,3 +22,15 @@ Contents: :maxdepth: 4 Deployment_Guideline.rst +<<<<<<< HEAD +======= + +Indices and tables +================== + +* :ref:`search` + +Revision: _sha1_ + +Build date: |today| +>>>>>>> 011d936... Update the docs folder |