summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2016-07-30 23:15:56 +0800
committerJulien <zhang.jun3g@zte.com.cn>2016-07-30 23:27:55 +0800
commitc2433a00e41df7195c6184c03085664be04c37c7 (patch)
tree244f861020fd069fe98e37e7bf57e2788429cf89
parent7ae1f204de947a3c12804c04f32e20d45eb99eba (diff)
Add community labs information into
Add community labs information alphabetically into release documents. Add orange_**paris path** and organge_paris.rst, so that the lab and pod documents can be shown in the same chapter of the release document. JIRA: PHAROS-241 Change-Id: I9fcfaf89cd652c86d84a56e7a948c04a3c158d29 Signed-off-by: Julien <zhang.jun3g@zte.com.cn>
-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 56a58dc1..47a09bbb 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 00000000..113d5815
--- /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 c59ec2ad..c59ec2ad 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 65dea329..65dea329 100644
--- a/docs/labs/orange_paris_pod1_description.rst
+++ b/docs/labs/orange-paris-lab/orange_paris_pod1_description.rst