Merge "Adding missing step"

diff --git a/.gitmodules b/.gitmodules
index f0511b5..063fc1b 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -238,9 +238,6 @@
        url = https://gerrit.opnfv.org/gerrit/calipso
        branch = .
        ignore = dirty
-[submodule "docs/submodules/stor4nfv"]
-       path = docs/submodules/stor4nfv
-       url = https://gerrit.opnfv.org/gerrit/stor4nfv
 [submodule "docs/submodules/clover"]
        path = docs/submodules/clover
        url = https://gerrit.opnfv.org/gerrit/clover

diff --git a/docs/how-to-use-docs/files/conf.py b/docs/how-to-use-docs/files/conf.py
index 3c4453e..eb12e74 100644 (file)
--- a/docs/how-to-use-docs/files/conf.py
+++ b/docs/how-to-use-docs/files/conf.py
@@ -1 +1 @@
-from docs_conf.conf import *
+from docs_conf.conf import *  # noqa: F401,F403

diff --git a/docs/how-to-use-docs/local-build-transition.rst b/docs/how-to-use-docs/local-build-transition.rst
index 5d2c806..147cb27 100644 (file)
--- a/docs/how-to-use-docs/local-build-transition.rst
+++ b/docs/how-to-use-docs/local-build-transition.rst
@@ -49,7 +49,7 @@ In your project repo:
 
    .. literalinclude:: files/tox.ini
 
-   *.gitignore*::
+   *.gitignore*
 
       .tox/
       docs/_build/*

diff --git a/docs/submodules/barometer b/docs/submodules/barometer
index ec05bfd..dda0e18 160000 (submodule)
--- a/docs/submodules/barometer
+++ b/docs/submodules/barometer
@@ -1 +1 @@
-Subproject commit ec05bfdf4721bec6abab0b912cee721c5cc54e1d
+Subproject commit dda0e18b1dd1a9a2397f43262124d4de3dc424e7

diff --git a/docs/submodules/fuel b/docs/submodules/fuel
index 9857a81..2dde16c 160000 (submodule)
--- a/docs/submodules/fuel
+++ b/docs/submodules/fuel
@@ -1 +1 @@
-Subproject commit 9857a8101115487a0e1d460ad8f774b93fef334d
+Subproject commit 2dde16ca1276a4982602dd303c5cf6d6324daa6f

diff --git a/docs/submodules/sdnvpn b/docs/submodules/sdnvpn
index 785fed1..e97d0c5 160000 (submodule)
--- a/docs/submodules/sdnvpn
+++ b/docs/submodules/sdnvpn
@@ -1 +1 @@
-Subproject commit 785fed155091a3eeca81dd07c2d308145ef2d98d
+Subproject commit e97d0c53a5b15e590e03ba86972eed26db4009c0