JIRA: IPVSIX-29

Change-Id: I61ba2d8b29cc815125496a1015b3ac3ed998c301
Signed-off-by: Bin Hu <bh526r@att.com>

4 files changed, 26 insertions, 24 deletions

diff --git a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
index 695dbca..a134b7b 100644
--- a/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
+++ b/docs/setupservicevm/0-ipv6-configguide-prep-infra.rst
@@ -7,7 +7,7 @@ Architectural Design
 ********************
 
 The architectural design of using a service VM as an IPv6 vRouter is
-shown as follows :numref:`figure1`:
+shown as follows in :numref:`figure1`:
 
 .. figure:: images/ipv6-architecture.png
    :name: figure1
@@ -24,11 +24,10 @@ prepare 3 hosts, each of which has minimum 8GB RAM and 40GB storage. One host is
 Node. The second host is used as Open Daylight Controller Node. And the third one is used as
 OpenStack Compute Node.
 
-For exemplary purpose, we give them hostnames ``opnfv-odl-
-controller``,  ``opnfv-os-controller``, and ``opnfv-os-compute``
-respectively.
+For exemplary purpose, we give them hostnames ``opnfv-odl-controller``,
+``opnfv-os-controller``, and ``opnfv-os-compute`` respectively.
 
-The underlay network topology of those 3 hosts are shown as follows :numref:`figure2`:
+The underlay network topology of those 3 hosts are shown as follows in :numref:`figure2`:
 
 .. figure:: images/ipv6-topology.png
    :name: figure2
@@ -36,8 +35,8 @@ The underlay network topology of those 3 hosts are shown as follows :numref:`fig
 
    Underlay Network Topology
 
-**Please note that the IP address shown in ``:numref:`figure2```
-are for exemplary purpose. You need to configure your public IP
+**Please note that the IP address shown in** ``:numref:`figure2```
+**are for exemplary purpose. You need to configure your public IP
 address connecting to Internet according to your actual network
 infrastructure. And you need to make sure the private IP address are
-not conflicting with other subnets.
+not conflicting with other subnets**.
diff --git a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
index 27101bb..0a77f08 100644
--- a/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
+++ b/docs/setupservicevm/1-ipv6-configguide-odl-setup.rst
@@ -3,11 +3,11 @@ Setting Up Open Daylight Controller
 ===================================
 
 For exemplary purpose, we assume:
-* The hostname of Open Daylight Controller Node is ``opnfv-odl-
-controller``
+
+* The hostname of Open Daylight Controller Node is ``opnfv-odl-controller``
 * CentOS 7 is installed
 * We use ``opnfv`` as username to login.
-* Java 7 is installed in directory ``=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/``
+* Java 7 is installed in directory ``/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/``
 
 **ODL-1**: Login to Open Daylight Controller Node with username ``opnfv``.
 
@@ -35,9 +35,10 @@ firewalld as well. **If you intend to use firewalld, please skip this step and d
 |   ``sudo yum install -y iptables-services``
 |   ``sudo touch /etc/sysconfig/iptables``
 |   ``sudo systemctl enable iptables.service``
-|   ``sudo systemctl start iptables.service ``
+|   ``sudo systemctl start iptables.service``
 |   ``sudo iptables -I INPUT 1 -i ens160 -j ACCEPT``
-|   ``sudo iptables -I INPUT -m state --state NEW -p tcp --dport 8181 -j ACCEPT # For ODL DLUX UI``
+|   ``# For ODL DLUX UI``
+|   ``sudo iptables -I INPUT -m state --state NEW -p tcp --dport 8181 -j ACCEPT``
 |   ``sudo iptables-save > /etc/sysconfig/iptables``
 
 **ODL-6**: Open a screen session.
@@ -52,8 +53,9 @@ Daylight is installed. Here we use ``odl`` directory name and
 
 **ODL-8**: Set the JAVA environment variables.
 
-|   ``export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre``
-|   ``export PATH=$PATH:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin``
+   ``export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre``
+
+   ``export PATH=$PATH:/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin``
 
 **ODL-9**: Run the ``karaf`` shell.
 
@@ -83,7 +85,7 @@ feature.
 **ODL-13**: To enable ODL DLUX UI, install the following features.
 Then you can navigate to
 ``http://<opnfv-odl-controller IP address>:8181/index.html`` for DLUX
-UI. The default user-name and password is admin/admin.
+UI. The default user-name and password is ``admin/admin``.
 
     ``opendaylight-user@opnfv>feature:install odl-restconf odl-l2switch-switch odl-mdsal-apidocs odl-dlux-core``
 
diff --git a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
index debe65d..b5a3a6b 100644
--- a/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
+++ b/docs/setupservicevm/2-ipv6-configguide-os-controller.rst
@@ -3,8 +3,8 @@ Setting Up OpenStack Controller
 ===============================
 
 For exemplary purpose, we assume:
-* The hostname of OpenStack Controller Node is ``opnfv-os-
-controller``
+
+* The hostname of OpenStack Controller Node is ``opnfv-os-controller``
 * Ubuntu 14.04 is installed
 * We use ``opnfv`` as username to login.
 * We use ``devstack`` to install OpenStack Kilo
@@ -28,10 +28,10 @@ controller``
 
    ``http://fpaste.org/276949/39476214/``
 
-**Note 1**: you need to change the IP address of ``ODL_MGR_IP`` to
+   **Note 1**: you need to change the IP address of ``ODL_MGR_IP`` to
 point to your actual IP address of Open Daylight Controller.
 
-**Note 2**: You may have to change the value of
+   **Note 2**: You may have to change the value of
 ``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your
 actual network interfaces.
 
@@ -41,7 +41,7 @@ actual network interfaces.
 
 **OS-N-7**: If the setup is successful you would see the following logs on the console. Please note
 that the IP addresses are all for the purpose of example. Your IP addresses will match the ones
-assigned during the installation of OPNFV B Release base platform in prior chapters.
+of your actual network interfaces.
 
 |   ``This is your host ip: <opnfv-os-controller IP address>``
 |   ``Horizon is now available at http://<opnfv-os-controller IP address>/``
diff --git a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
index dd081ae..84768f0 100644
--- a/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
+++ b/docs/setupservicevm/3-ipv6-configguide-os-compute.rst
@@ -3,6 +3,7 @@ Setting Up OpenStack Compute Node
 =================================
 
 For exemplary purpose, we assume:
+
 * The hostname of OpenStack Compute Node is ``opnfv-os-compute``
 * Ubuntu 14.04 is installed
 * We use ``opnfv`` as username to login.
@@ -27,13 +28,13 @@ For exemplary purpose, we assume:
 
    ``http://fpaste.org/276958/44395955/``
 
-**Note 1**: you need to change the IP address of ``SERVICE_HOST`` to
+   **Note 1**: you need to change the IP address of ``SERVICE_HOST`` to
 point to your actual IP address of OpenStack Controller.
 
-**Note 2**: you need to change the IP address of ``ODL_MGR_IP`` to
+   **Note 2**: you need to change the IP address of ``ODL_MGR_IP`` to
 point to your actual IP address of Open Daylight Controller.
 
-**Note 3**: You may have to change the value of
+   **Note 3**: You may have to change the value of
 ``ODL_PROVIDER_MAPPINGS`` and ``PUBLIC_INTERFACE`` to match your
 actual network interface.