diff options
| author |   joehuang <joehuang@huawei.com> | 2016-09-20 05:20:31 -0400 |
|---|---|---|
| committer | joehuang <joehuang@huawei.com> | 2016-09-20 05:27:44 -0400 |
| commit | 3f7394289faa2945e8f36d008cfb7dacf06279d6 (patch) | |
| tree | de4c58563b7db1ebb33122ae1b4367b640e801eb /docs/userguide | |
| parent | b50a7a8c4d2f4a1e63b7dce077f9d3f726661a15 (diff) | |
Cherry Pick the update from the master branch to stable/colorado branch
These patches should be cherry picked to colorado branch:
https://gerrit.opnfv.org/gerrit/#/c/20077/
https://gerrit.opnfv.org/gerrit/#/c/20635/
https://gerrit.opnfv.org/gerrit/#/c/19833/
https://gerrit.opnfv.org/gerrit/#/c/19587/
But because the structure of the folder was changed in
https://gerrit.opnfv.org/gerrit/#/c/19833/
cherry pick using gerrit will lead to merge conflict,
has to update the colorado branch through this patch.
Change-Id: I971eb28520b47b14de52a761269518b959c6921c
Signed-off-by: joehuang <joehuang@huawei.com>
Diffstat (limited to 'docs/userguide')
| -rw-r--r-- | docs/userguide/index.rst | 4 | ||||
| -rw-r--r-- | docs/userguide/multisite.admin.usage.rst (renamed from docs/userguide/multisite-admin-user-guide.rst) | 0 | ||||
| -rw-r--r-- | docs/userguide/multisite.kingbird.usage.rst (renamed from docs/userguide/multisite.kingbird.user.guide.rst) | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/docs/userguide/index.rst b/docs/userguide/index.rst index 1429b33..25de482 100644 --- a/docs/userguide/index.rst +++ b/docs/userguide/index.rst @@ -9,5 +9,5 @@ Multisite Admin User Guide :numbered: :maxdepth: 4 - multisite-admin-user-guide.rst - multisite.kingbird.user.guide.rst + multisite.admin.usage.rst + multisite.kingbird.usage.rst diff --git a/docs/userguide/multisite-admin-user-guide.rst b/docs/userguide/multisite.admin.usage.rst index 41f23c0..41f23c0 100644 --- a/docs/userguide/multisite-admin-user-guide.rst +++ b/docs/userguide/multisite.admin.usage.rst diff --git a/docs/userguide/multisite.kingbird.user.guide.rst b/docs/userguide/multisite.kingbird.usage.rst index 6ae3881..c5bb3eb 100644 --- a/docs/userguide/multisite.kingbird.user.guide.rst +++ b/docs/userguide/multisite.kingbird.usage.rst @@ -1,6 +1,5 @@ .. This work is licensed under a Creative Commons Attribution 4.0 International License. .. http://creativecommons.org/licenses/by/4.0 -.. (c) OPNFV ============================= Multisite.Kingbird user guide |