summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Bennett <rb2745@att.com>2017-11-24 08:42:31 -0500
committerRich Bennett <rb2745@att.com>2017-11-24 08:45:26 -0500
commit0463c5d86cc67e7d89b9282049bd00ce2e51c0fa (patch)
treec3e641b309abb55fa15757c5499a31f43ce0174f
parent22aaec84223f90eb18707ccd861bb545f0ea09c5 (diff)
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>
-rw-r--r--.gitmodules5
-rw-r--r--docs/conf.py4
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index d26fcafbd..5ea3cb147 100644
--- 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 f8bc45863..d6c6b0384 100644
--- 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.