Merge "Update the wiki page link"

4 files changed, 70 insertions, 63 deletions

diff --git a/docs/configguide/configguide.rst b/docs/configguide/configguide.rst
index 3f1c035b..29466776 100644
--- a/docs/configguide/configguide.rst
+++ b/docs/configguide/configguide.rst
@@ -20,7 +20,7 @@ When setting up an OPNFV community lab ...
 * Update the Pharos Wiki with lab details
 
   * Lab map, organization, contacts, status, location, resources, role, etc.
-  * https://wiki.opnfv.org/pharos#community_labs
+  * `Community labs <https://wiki.opnfv.org/display/pharos#PharosHome-Overview>`_
   * :ref:`pharos_wiki`
 
 * Update the Pharos project information file "Current Labs"
diff --git a/docs/configguide/lab_update_guide.rst b/docs/configguide/lab_update_guide.rst
index 3f90d5cc..98aec638 100644
--- a/docs/configguide/lab_update_guide.rst
+++ b/docs/configguide/lab_update_guide.rst
@@ -11,8 +11,10 @@ Updating Pharos Documents
 
 Details about each Community Lab is found in 3 places:
 
- - Summary of lab including location, contacts, status, etc. on the `Pharos Project Wiki page <https://wiki.opnfv.org/pharos>`_
- - Lab specific details are provided with dedicated Wiki pages, see this `Example Lab <https://wiki.opnfv.org/get_started/intel_hosting>`_
+ - Summary of lab including location, contacts, status, etc.
+   on the `Pharos Project Wiki page <https://wiki.opnfv.org/display/pharos>`_
+ - Lab specific details are provided with dedicated Wiki pages,
+   see this `Example Lab <https://wiki.opnfv.org/display/pharos/Intel+Hosting>`_
  - Pharos repo docs ...
 
     - docs/information/pharos.rst ... project information file
@@ -35,18 +37,22 @@ Edit Wiki page
 
  * https://wiki.opnfv.org/pharos
  * Look for {{scrape>http://artifacts.opnfv.org/pharos/docs/information/pharos.html}}
- * Click "Preview" and see if your change is shown; if shown add a short "Edit summary" and click "Save" (Wiki does not auto update content)
+ * Click "Preview" and see if your change is shown; if shown add a short "Edit summary" and click "Save"
+   (Wiki does not auto update content)
 
-You will see a section of code as shown below. Add your page to the bullet list with wiki link, nice name, and location summary
+You will see a section of code as shown below. Add your page to the bullet list with wiki link,
+nice name, and location summary
 
 Update the map info on the Pharos Project Page https://wiki.opnfv.org/pharos?&#community_labs
 
- * You will see a section of code as shown below. Add your lab infomation to the list with a comma separated list as follows:
+ * You will see a section of code as shown below. Add your lab infomation to the list with a comma separated
+   list as follows:
 
     * longitude
     * latitude
     * .8 <- for size
-    * marker color png ([[marker-green.png|marker-green.png]], [[marker-blue.png|marker-blue.png]], [[marker-red.png|marker-red.png]], [[marker-gold.png|marker-gold.png]])
+    * marker color png ([[marker-green.png|marker-green.png]], [[marker-blue.png|marker-blue.png]],
+      [[marker-red.png|marker-red.png]], [[marker-gold.png|marker-gold.png]])
     * Nice Format Lab Name
     * '';''
     * Location Summary
diff --git a/docs/information/pharos.rst b/docs/information/pharos.rst
index 2f13f7ed..87739dd0 100644
--- a/docs/information/pharos.rst
+++ b/docs/information/pharos.rst
@@ -13,7 +13,8 @@ Pharos Project Information
 Introduction
 ------------
 
-The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ deals with developing an OPNFV lab infrastructure that is geographically and technically diverse.
+The `Pharos Project <https://www.opnfv.org/developers/pharos>`_ deals with developing an OPNFV lab infrastructure
+that is geographically and technically diverse.
 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
@@ -31,15 +32,15 @@ operational issues as well as for Pharos project activities.
 Future lab capabilities are currently focussed on 1) Deployment automation 2) Dashboards (for capability and usage)
 3) *Virtual Labs* for developer on-boarding.
 
-* Pharos page: https://www.opnfv.org/developers/pharos
-* Pharos project Wiki: https://wiki.opnfv.org/pharos
-* `Pharos Planning <https://wiki.opnfv.org/pharos_rls_b_plan>`_
+* `Pharos page <https://www.opnfv.org/developers/pharos>`_
+* `Pharos project Wiki <https://wiki.opnfv.org/display/pharos>`_
+* `Pharos Planning <https://wiki.opnfv.org/display/pharos/Pharos+Colorado+Plan>`_
 
 Project Communication
 ---------------------
 
 * `Jira <https://jira.opnfv.org/projects/PHAROS/summary>`_
-* `Weekly Pharos meeting <https://wiki.opnfv.org/meetings#pharos_meetings>`_
+* `Weekly Pharos meeting <https://wiki.opnfv.org/display/INF/Infra+Working+Group>`_
 * `Weekly coordination meeting for Test related projects <https://wiki.opnfv.org/meetings/test>`_
 * IRC: freenode.net #opnfv-pharos http://webchat.freenode.net/?channels=opnfv-pharos
 * Mailing List: use opnfv-tech-discuss and tag your emails with [Pharos] in the subject for filtering
@@ -54,9 +55,9 @@ Project Release Artifacts
 Pharos Lab Process
 ------------------
 
-* Process for requesting lab access and support https://wiki.opnfv.org/pharos_rls_b_support
-* Pharos Lab Governance and Policies https://wiki.opnfv.org/pharos_policies
-* Status of Community labs https://wiki.opnfv.org/pharos_rls_b_labs
+* Process for requesting lab access and support https://wiki.opnfv.org/display/pharos/Pharos+Rls+B+Support
+* Pharos Lab Governance and Policies https://wiki.opnfv.org/display/pharos/Pharos+Policies
+* Status of Community labs https://wiki.opnfv.org/display/pharos/#PharosHome-Overview
 
 Current Labs
 ------------
@@ -64,49 +65,49 @@ Current Labs
 An interactive map of OPNFV lab locations, lab owners and other lab information is maintained on the `Pharos Wiki
 <https://wiki.opnfv.org/pharos#community_labs>`_
 
-+----+---------------+----------------------------------------------------------+----------------------+
-|    | **Hosted by** |  **Home page**                                           | **Location**         |
-| #  |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 1  | Linux         | https://wiki.opnfv.org/get_started/lflab_hosting         | Portland, Oregon     |
-|    |  Foundation   |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 2  | Spirent       | https://wiki.opnfv.org/pharos/spirentvctlab              | Nephoscale, CA       |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 3  | China Mobile  | https://wiki.opnfv.org/lab2_chinamobile_hosting          | Beijing, China       |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 4  | Dell          | https://wiki.opnfv.org/dell_hosting                      | Santa Clara, CA      |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 5  | Enea          | https://wiki.opnfv.org/enea-pharos-lab                   | Kista, Sweden        |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 6  | Ericsson      | https://wiki.opnfv.org/get_started/ericsson_hosting      | Montreal, Canada     |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 7  | Huawei        | https://wiki.opnfv.org/lab4_huawei                       | Xi an, China         |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 8  | Huawei        | https://wiki.opnfv.org/get_started/huawei_sc_hosting     | Santa Clara, CA      |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 9  | Intel         | https://wiki.opnfv.org/get_started/intel_hosting         | Hillsboro, Oregon    |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 10 | Orange        | https://wiki.opnfv.org/opnfv-orange                      | Lannion, France      |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 11 | Orange        | https://wiki.opnfv.org/opnfv-orange                      | Paris, France        |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 12 | ZTE           | https://wiki.opnfv.org/zte-nj-testlab                    | Nan Jing, China      |
-|    |               |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
-| 13 | Okinawa       | https://wiki.opnfv.org/display/pharos/OOL+TestLab        | Okinawa              |
-|    |   Open Lab    |                                                          |                      |
-+----+---------------+----------------------------------------------------------+----------------------+
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| #  | **Hosted by** |  **Home page**                                                             | **Location**      |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 1  | Linux         | https://wiki.opnfv.org/display/pharos/Lflab+Hosting                        | Portland, Oregon  |
+|    | Foundation    |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 2  | Spirent       | https://wiki.opnfv.org/display/pharos/Spirentvctlab                        | Nephoscale, CA    |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 3  | China Mobile  | https://wiki.opnfv.org/display/pharos/Lab2+Chinamobile+Hosting             | Beijing, China    |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 4  | Dell          | https://wiki.opnfv.org/display/pharos/Dell+Hosting                         | Santa Clara, CA   |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 5  | Enea          | https://wiki.opnfv.org/display/pharos/Enea-pharos-lab                      | Kista, Sweden     |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 6  | Ericsson      | https://wiki.opnfv.org/display/pharos/Ericsson+Hosting+and+Request+Process | Montreal, Canada  |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 7  | Huawei        | https://wiki.opnfv.org/display/pharos/Lab4+Huawei                          | Xi an, China      |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 8  | Huawei        | https://wiki.opnfv.org/display/pharos/Huawei+Sc+Hosting                    | Santa Clara, CA   |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 9  | Intel         | https://wiki.opnfv.org/display/pharos/Intel+Hosting                        | Hillsboro, Oregon |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 10 | Orange        | https://wiki.opnfv.org/display/pharos/Opnfv-orange                         | Lannion, France   |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 11 | Orange        | https://wiki.opnfv.org/display/pharos/Opnfv-orange                         | Paris, France     |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 12 | ZTE           | https://wiki.opnfv.org/display/pharos/ZTE+NJ+Testlab                       | Nan Jing, China   |
+|    |               |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
+| 13 | Okinawa       | https://wiki.opnfv.org/display/pharos/OOL+TestLab                          | Okinawa           |
+|    | Open Lab      |                                                                            |                   |
++----+---------------+----------------------------------------------------------------------------+-------------------+
 
 
 
@@ -115,5 +116,5 @@ Pharos project Key Facts
 
 **Key Project Facts are maintained in the Pharos INFO file in the project repo**
 
-  * Can be viewed on the project Wiki `INFO <https://wiki.opnfv.org/pharos?&#pharos_project_-_key_facts>`_
-  * Project key facts in repo: pharos/INFO
+     * Can be viewed on the project Wiki `INFO <https://wiki.opnfv.org/display/pharos/#PharosHome-KeyProjectFacts>`_
+     * Project key facts in repo: pharos/INFO
diff --git a/docs/specification/remoteaccess.rst b/docs/specification/remoteaccess.rst
index 51950da4..185eaa89 100644
--- a/docs/specification/remoteaccess.rst
+++ b/docs/specification/remoteaccess.rst
@@ -37,8 +37,8 @@ Lights-out management network requirements:
 
 Linux Foundation Lab is a UCS-M hardware environment with controlled access *as needed*
 
-    * `Access rules and procedure <https://wiki.opnfv.org/pharos/lf_lab>`_ are maintained on the Wiki
-    * `A list of people <https://wiki.opnfv.org/pharos/lf_lab#opnfv_community_members_with_access_to_opnfv_lf_lab>`_ with access is maintained on the Wiki
+    * `Access rules and procedure <https://wiki.opnfv.org/display/pharos/Lflab+Hosting>`_ are maintained on the Wiki
+    * `A list of people <https://wiki.opnfv.org/display/pharos/Lf+Support>`_ with access is maintained on the Wiki
     * Send access requests to infra-steering@lists.opnfv.org with the following information ...
 
       * Name:
@@ -50,6 +50,6 @@ Linux Foundation Lab is a UCS-M hardware environment with controlled access *as
       * What specific POD/machines will be accessed:
       * What support is needed from LF admins and LF community support team:
 
-    * Once access is approved please follow instructions for setting up VPN access ... https://wiki.opnfv.org/get_started/lflab_hosting
+    * Once access is approved please follow instructions for setting up VPN access
     * The people who require VPN access must have a valid PGP key bearing a valid signature from LF
     * When issuing OpenVPN credentials, LF will be sending TLS certificates and 2-factor authentication tokens, encrypted to each recipient's PGP key