From: Sofia Wallin <sofia.wallin@est.tech>
Date: Tue, 10 Sep 2019 13:48:43 +0000 (+0000)
Subject: Merge "DOC - Fixing doc linking issue"
X-Git-Tag: elalto.1.5.2~172
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=fba0011822b48126ff82846a2c28937d8dc98553;hp=2b23b1f4863a8d915fd4f5d7be300e9086d16494;p=doc.git

Merge "DOC - Fixing doc linking issue"
---

diff --git a/.gitmodules b/.gitmodules
index 5193b049f..ed846d4f7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -358,13 +358,13 @@
 	url = ../policy/parent
 	branch = .
 	ignore = dirty
-[submodule "docs/submodules/modeling/genericparser.git"]
-	path = docs/submodules/modeling/genericparser.git
-	url = ../modeling/genericparser
-	branch = .
-	ignore = dirty
 [submodule "docs/submodules/osa.git"]
 	path = docs/submodules/osa.git
 	url = ../osa
 	branch = master
 	ignore = dirty
+[submodule "docs/submodules/modeling/etsicatalog.git"]
+	path = docs/submodules/modeling/etsicatalog.git
+	url = ../modeling/etsicatalog
+	branch = master
+	ignore = dirty
diff --git a/docs/release/repolist.rst b/docs/release/repolist.rst
index 9f59f0027..30d94005b 100644
--- a/docs/release/repolist.rst
+++ b/docs/release/repolist.rst
@@ -93,4 +93,4 @@ Project/Components
    oom/offline-installer <../submodules/oom/offline-installer.git/docs/index>
    ccsdk/features <../submodules/ccsdk/features.git/docs/index>
    parent <../submodules/parent.git/docs/index>
-   modeling/genericparser <../submodules/modeling/genericparser.git/docs/index>
+   modeling/etsicatalog <../submodules/modeling/etsicatalog.git/docs/index>
diff --git a/docs/submodules/modeling/etsicatalog.git b/docs/submodules/modeling/etsicatalog.git
new file mode 160000
index 000000000..5fd2ae6a4
--- /dev/null
+++ b/docs/submodules/modeling/etsicatalog.git
@@ -0,0 +1 @@
+Subproject commit 5fd2ae6a4517980ce0f89247bb354220748ae67b
diff --git a/docs/submodules/modeling/genericparser.git b/docs/submodules/modeling/genericparser.git
deleted file mode 160000
index 05947d61c..000000000
--- a/docs/submodules/modeling/genericparser.git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05947d61cb8643ab41a394154ea8b73f12fb32fd
diff --git a/tox.ini b/tox.ini
index d1bbd48b3..17195d4ac 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ whitelist_externals =
 [testenv:local]
 deps = -r{toxinidir}/etc/requirements.txt
 commands =
-    git submodule update --depth 1 --init
+    git submodule update --depth 100 --init
     sphinx-build -j 4 -b html -n -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
     echo "Generated docs available in {toxinidir}/docs/_build/html"
 whitelist_externals =