diff options
Diffstat (limited to 'docs/scenarios/index.rst')
| -rw-r--r-- | docs/scenarios/index.rst | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/docs/scenarios/index.rst b/docs/scenarios/index.rst index ed2289b..5a8353f 100644 --- a/docs/scenarios/index.rst +++ b/docs/scenarios/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 Gap Analysis of High Availability ======================================= @@ -8,3 +22,15 @@ Contents: :maxdepth: 4 GAP_Analysis_Colorado.rst +<<<<<<< HEAD +======= + +Indices and tables +================== + +* :ref:`search` + +Revision: _sha1_ + +Build date: |today| +>>>>>>> 011d936... Update the docs folder |