Add .gitmodule entry for vvp

Update sphinx conf.py to show master branch

Change-Id: Ib62ff4699b179c6acaf3fe2ffb11372d9b56bc85
Issue-ID: DOC-58
Signed-off-by: Rich Bennett <rb2745@att.com>

diff --git a/.gitmodules b/.gitmodules
index d26fcaf..5ea3cb1 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -263,3 +263,8 @@
        url = ../modeling/toscaparsers
        branch = .
        ignore = dirty
+[submodule "docs/submodules/vvp/documentation.git"]
+       path = docs/submodules/vvp/documentation.git
+       url = ../vvp/documentation
+       branch = .
+       ignore = dirty

diff --git a/docs/conf.py b/docs/conf.py
index f8bc458..d6c6b03 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,9 +73,9 @@ author = u'Open Network Automation Platform'
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 # The short X.Y version.
-version = '1.0.0'
+version = 'master branch'
 # The full version, including alpha/beta/rc tags.
-release = 'Amsterdam'
+release = 'master branch'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.