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 <agardner@linuxfoundation.org>

2 files changed, 7 insertions, 58 deletions

diff --git a/docs/release/installation/featureconfig.rst b/docs/release/installation/featureconfig.rst
deleted file mode 100644
index e47e0c0..0000000
--- a/docs/release/installation/featureconfig.rst
+++ /dev/null
@@ -1,43 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-
-.. image:: ../etc/opnfv-logo.png
-  :height: 40
-  :width: 200
-  :alt: OPNFV
-  :align: left
-.. these two pipes are to seperate the logo from the first title
-|
-|
-Domino Configuration
-====================
-Domino Server and Clients can be configured via (i) passing command line options
-(see API documentation) and (ii) the configuration file "domino_conf.py" under the
-main directory.
-
-* The default file for logging is set as none and log level set as "WARNING".
-
-Domino Server
--------------
-* The default server unique user ID is set as 0 in the configuration file.
-
-* The default TCP port for RPC calls is set as 9090 in the configuration file.
-
-* The default database file for Domino Server is set as "dominoserver.db" under the main directory
-
-* The default folder for keeping published TOSCA files and pushed parts is set as "toscafiles" in the configuration file via variable TOSCADIR.
-
-* The default log level (WARNING) can be changed by passing the flags --log or -l followed by a log level, e.g., ERROR, WARNING, INFO, or DEBUG.
-
-Domino Client
--------------
-* The default mode of CLI is non-interactive (i.e., Domino CLI Utility is used). Passing --iac=TRUE would begin the client in interactive mode.
-
-* The default log level (WARNING) can be changed by passing the flags --log or -l followed by a log level, e.g., ERROR, WARNING, INFO, or DEBUG.
-
-* The default Domino Server IP is set as "localhost". This can be overwritten at the time of launching DominoClient via the option flags -i or --ipaddr followed by the IP address of the actual server hosting the Domino Server.
-
-* The default Domino Client TCP port for RPC calls is set as 9091 in the configuration file. It can be overwritten when the DominoClient is launched by passing the flags --port or -p followed by the port number.
-
-* The default folder for keeping preceived TOSCA files is set as "toscafiles" in the configuration file via variable TOSCA_RX_DIR.
-
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