summaryrefslogtreecommitdiffstats
path: root/docs/development/devtools/devtools.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/development/devtools/devtools.rst')
-rw-r--r--docs/development/devtools/devtools.rst13
1 files changed, 10 insertions, 3 deletions
diff --git a/docs/development/devtools/devtools.rst b/docs/development/devtools/devtools.rst
index 0654b3a5..dff8819d 100644
--- a/docs/development/devtools/devtools.rst
+++ b/docs/development/devtools/devtools.rst
@@ -276,6 +276,12 @@ familiar with the Policy Framework components and test any local changes.
.. toctree::
:maxdepth: 1
+<<<<<<< HEAD (25d5a6 Merge "Refactor s3p documents" into istanbul)
+=======
+ policy-gui-controlloop-smoke.rst
+
+ db-migrator-smoke.rst
+>>>>>>> CHANGE (33149a Added doc for smoke testing db-migrator)
..
api-smoke.rst
@@ -326,6 +332,10 @@ the Policy Framework works in a full ONAP deployment.
.. toctree::
:maxdepth: 1
+ clamp-policy.rst
+
+ clamp-dcae.rst
+
..
api-pairwise.rst
@@ -344,9 +354,6 @@ the Policy Framework works in a full ONAP deployment.
..
distribution-pairwise.rst
-..
- clamp-pairwise.rst
-
Generating Swagger Documentation
********************************