From 6c80ac7ca497424ec867c86e43159b3e7f5800c0 Mon Sep 17 00:00:00 2001 From: agardner Date: Thu, 30 Mar 2017 15:16:55 -0400 Subject: bring danube branch up to date with master Gerrit doesn't like merge commits eg: this wont work git merge origin/master --no-commit git commit -sv git review stable/danube So I took the diff git diff origin/stable/danube..master and checked out the files that were changed git checkout origin/master -- featureconfig.rst normally you should checkout the change sets and resolve the merge conflitcs, but in this case we dont care. Change-Id: I2a02e8ae7237825911f22663a5c65cdb9f5c5e4f Signed-off-by: agardner --- docs/release/installation/index.rst | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'docs/release/installation/index.rst') diff --git a/docs/release/installation/index.rst b/docs/release/installation/index.rst index a8a0a0a..db9f506 100644 --- a/docs/release/installation/index.rst +++ b/docs/release/installation/index.rst @@ -1,23 +1,15 @@ -.. _domino-installation: - .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 OPNFV + +.. _domino-installation: -.. image:: ../etc/opnfv-logo.png - :height: 40 - :width: 200 - :alt: OPNFV - :align: left -| -| -********************** -Installation procedure -********************** -Colorado 1.0 ------------- +******************************* +Domino Installation Instruction +******************************* .. toctree:: :maxdepth: 2 + :numbered: installation.instructions.rst - featureconfig.rst -- cgit 1.2.3-korg