Merge "Update git submodules for Promise"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Thu, 1 Nov 2018 22:49:06 +0000 (22:49 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 1 Nov 2018 22:49:06 +0000 (22:49 +0000)
1  2 
.gitmodules
docs/conf.py
docs/release/userguide.introduction.rst

diff --cc .gitmodules
Simple merge
diff --cc docs/conf.py
Simple merge
@@@ -72,10 -72,10 +72,10 @@@ Feature Configuration Guide
  - :ref:`OVN4NFV Configuration Guide <xyz-configguide>`
  - :ref:`OVNO Configuration Guide <ovno-configguide>`
  - :ref:`Parser Configuration Guide <parser-configguide>`
- - :ref:`Promise Configuration Guide <promise-configguide>`
+ - :ref:`Promise Configuration Guide <promise:promise-configguide>`
  - :ref:`SDNVPN Configuration Guide <sdnvpn-configguide>`
  - :ref:`SFC Configuration Guide <sfc-configguide>`
 -- :ref:`Stor4NFV Configuration Guide <stor4nfv-configguide>`
 +- :ref:`Stor4NFV Configuration Guide <stor4nfv:stor4nfv-configguide>`
  
  Feature User Guides
  ===================