3 files changed, 34 insertions, 13 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/jumpserverinstall.rst b/docs/configguide/jumpserverinstall.rst
index 19a659a2..e51e9469 100644
--- a/docs/configguide/jumpserverinstall.rst
+++ b/docs/configguide/jumpserverinstall.rst
@@ -28,9 +28,9 @@ may be outdated (please refer to Fuel Installer documents).
 
   ``service network restart``
 
-6. Edit /etc/resolv.conf and add a nameserver
+6. Edit /etc/resolv.conf and add a nameserver, for example 8.8.8.8
 
-  ``vi /etc/resolv.conf``
+  ``echo nameserver 8.8.8.8 >> /etc/resolv.conf``
 
 7. Install libvirt & kvm
 
@@ -42,13 +42,26 @@ may be outdated (please refer to Fuel Installer documents).
 
   ``shutdown -r now``
 
-9. If you wish to avoid annoying delay when use ssh to log in, disable DNS lookups:
+9. Configure SSHD
 
-  ``vi /etc/ssh/sshd_config``
+  If you wish to avoid annoying delay when use ssh to log in, disable DNS lookups:
 
-  Uncomment "UseDNS yes", change 'yes' to 'no'.
+  When **UseDNS** is existed in the config file, update it:
 
-  Save
+  ``sed -i -e 's/^#*UseDNS\ \+yes/UseDNS no/' /etc/ssh/sshd_config``
+
+  or append the setting when not existed:
+
+  ``echo UseDNS no >> /etc/ssh/ssd_config``
+
+  Disable Password Authenticaion for security:
+
+  ``sed -i -e 's/^#PasswordAuthentication\ \+yes/PasswordAuthentication no/' /etc/ssh/sshd_config``
+
+  If you want to disable IPv6 connections, comment IPv6 ListenAddress and change AddressFamily to inet:
+
+  ``sed -i -e 's/^ListenAddress\ \+::/#ListenAddress ::/' /etc/ssh/sshd_config``
+  ``sed -i -e 's/^AddressFamily\ \+any/AddressFamily inet/' /etc/ssh/sshd_config``
 
 10. Restart sshd
 
@@ -62,6 +75,8 @@ may be outdated (please refer to Fuel Installer documents).
 
 13. Create a bridge using the interface on the PXE network, for example: br0
 
+  ``brctl addbr br0``
+
 14. Make a directory owned by qemu:
 
   ``mkdir /home/qemu; mkdir -p /home/qemu/VMs/fuel-6.0/disk``
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