summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorTrevor Cooper <trevor.cooper@intel.com>2016-01-29 18:00:42 -0800
committerTrevor Cooper <trevor.cooper@intel.com>2016-01-29 18:00:42 -0800
commitcf3fcd5e4d2e571e0927ccc7f322423eead226e0 (patch)
treed7159133aaae2f012a8d371cfe7df38fbbf41f3b /docs
parent83f037c1959efde4bf3fba48dfcc03d0f4871956 (diff)
Cleaned up docs for toolchain errors.
Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Cleaned up docs for toolchain errors. Change-Id: I4d40b58d447671437b2ac8e0ba7f8293c057d204 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Fixed doc formatting errors Change-Id: Ice15401d1c09b9a29e163cbec53e72f53d12b294 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com> Doc formatting issues fixed Change-Id: Id50e3c93fefa3aed492352db013bad3a827b2877 Signed-off-by: Trevor Cooper <trevor.cooper@intel.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/information/pharos.rst12
-rw-r--r--docs/specification/objectives.rst5
2 files changed, 0 insertions, 17 deletions
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst
index 20f96b4..f65d215 100644
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -2,19 +2,11 @@ Pharos Project: OPNFV Lab Infrastructure
########################################
The **Pharos Project** deals with developing an OPNFV lab infrastructure that is geographically and technically diverse.
-<<<<<<< HEAD
This will greatly assist in developing a highly robust and stable OPNFV platform. Community labs are hosted by
individual companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access for key
development and production activities. The **Pharos Specification** defines a "compliant" deployment and test
environment. Pharos is responsible for defining lab capabilities, developing management/usage policies and process;
and a support plan for reliable access to project and release resources. Community labs are provided as a service
-=======
-This will greatly assist in developing a highly robust and stable OPNFV platform. Community labs are hosted by
-individual companies and there is also an OPNFV lab hosted by the Linux Foundation that has controlled access for key
-development and production activities. The **Pharos Specification** defines a "compliant" deployment and test
-environment. Pharos is responsible for defining lab capabilities, developing management/usage policies and process;
-and a support plan for reliable access to project and release resources. Community labs are provided as a service
->>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
by companies and are not controlled by Pharos however our goal is to provide easy visibility of all lab capabilities
and their usage at all-times.
@@ -48,11 +40,7 @@ A map of OPNFV lab locations, lab owners and other individual lab information is
| # | Organization | | |
+----+---------------+----------------------------------------------------------+----------------------+
| 1 | Linux | https://wiki.opnfv.org/get_started/lflab_hosting | Portland, Oregon |
-<<<<<<< HEAD
| | Foundation | | |
-=======
-| | Foundation | | |
->>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
+--- +---------------+----------------------------------------------------------+----------------------+
| 2 | Cable Labs | Internal use only at present | Denver, Colorado |
| | | | |
diff --git a/docs/specification/objectives.rst b/docs/specification/objectives.rst
index 40460ff..4d7c119 100644
--- a/docs/specification/objectives.rst
+++ b/docs/specification/objectives.rst
@@ -1,13 +1,8 @@
Objectives / Scope
-------------------
-<<<<<<< HEAD
-The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
-platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
-=======
The **Pharos Specification** defines a hardware environment for deployment and testing of the **Brahmaputra**
platform release. The **Pharos Project** is also responsible for defining lab capabilities, developing
->>>>>>> 6978e2f... Cleaned up docs for toolchain errors.
management/usage policies and process; and a support plan for reliable access to project and release resources.
Community labs are provided as a service by companies and are not controlled by Pharos however our objective is
to provide easy visibility of all lab capabilities and their usage at all-times.