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/development/overview/feature.overview.rst | 1 + docs/development/overview/index.rst | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'docs/development/overview') diff --git a/docs/development/overview/feature.overview.rst b/docs/development/overview/feature.overview.rst index 4ef8d16..7980459 100644 --- a/docs/development/overview/feature.overview.rst +++ b/docs/development/overview/feature.overview.rst @@ -1,5 +1,6 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 OPNFV ================== Domino Description diff --git a/docs/development/overview/index.rst b/docs/development/overview/index.rst index 84b729f..6790b6c 100644 --- a/docs/development/overview/index.rst +++ b/docs/development/overview/index.rst @@ -1,11 +1,12 @@ -.. _domino-overview: - .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 +.. (c) 2017 OPNFV + +.. _domino-overview: -***************** -Domino User Guide -***************** +*********************** +Domino Project Overview +*********************** .. toctree:: :maxdepth: 3 -- cgit 1.2.3-korg