summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDaniel Smith <daniel.smith@ericsson.com>2016-08-04 02:49:28 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-04 02:49:28 +0000
commit239f046417ef3d1766343db10b39cc92de077c06 (patch)
treec51cdf47de4349124904bce68e095a44a169b1cb /docs
parent35c34c690ae9616d791c39fa218fe1621fa8d8d2 (diff)
parentc2433a00e41df7195c6184c03085664be04c37c7 (diff)
Merge "Add community labs information into"
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/index.rst6
-rw-r--r--docs/labs/orange-paris-lab/orange_paris.rst15
-rw-r--r--docs/labs/orange-paris-lab/orange_paris_lab_description.rst (renamed from docs/labs/orange_paris_lab_description.rst)0
-rw-r--r--docs/labs/orange-paris-lab/orange_paris_pod1_description.rst (renamed from docs/labs/orange_paris_pod1_description.rst)0
4 files changed, 21 insertions, 0 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 56a58dc..47a09bb 100755
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,6 +21,12 @@ OPNFV Community Lab Infrastructure
./specification/pharosspec.rst
./lab-description/templates.rst
./configguide/pharosconfig.rst
+ ./labs/Dell.rst
+ ./labs/huawei-us-lab/huawei-us-lab.rst
+ ./labs/OOL.rst
+ ./labs/orange-paris-lab/orange_paris.rst
+ ./labs/spirent.rst
+
Indices
=======
diff --git a/docs/labs/orange-paris-lab/orange_paris.rst b/docs/labs/orange-paris-lab/orange_paris.rst
new file mode 100644
index 0000000..113d581
--- /dev/null
+++ b/docs/labs/orange-paris-lab/orange_paris.rst
@@ -0,0 +1,15 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+.. http://creativecommons.org/licenses/by/4.0
+.. (c) 2016 OPNFV.
+
+.. Top level of Pharos templates and configuration files
+
+***********************************************
+Orange Paris Pharos Lab and Configuration Files
+***********************************************
+
+
+.. toctree::
+
+ ./orange_paris_lab_description.rst
+ ./orange_paris_pod1_description.rst
diff --git a/docs/labs/orange_paris_lab_description.rst b/docs/labs/orange-paris-lab/orange_paris_lab_description.rst
index c59ec2a..c59ec2a 100644
--- a/docs/labs/orange_paris_lab_description.rst
+++ b/docs/labs/orange-paris-lab/orange_paris_lab_description.rst
diff --git a/docs/labs/orange_paris_pod1_description.rst b/docs/labs/orange-paris-lab/orange_paris_pod1_description.rst
index 65dea32..65dea32 100644
--- a/docs/labs/orange_paris_pod1_description.rst
+++ b/docs/labs/orange-paris-lab/orange_paris_pod1_description.rst