Removing duplicate DLUX GSG info and fixing formatting

Change-Id: I3fa70ab78f0392a62edd3c8549986f04b2747e11
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/manuals/getting-started-guide/src/main/asciidoc/general_installation.adoc b/manuals/getting-started-guide/src/main/asciidoc/general_installation.adoc
index 45dabdacb691e6cd753e42e596ab66373b476b9f..f3b900297e6fe7833640ed85e4eb9dd82e307718 100755 (executable)
--- a/manuals/getting-started-guide/src/main/asciidoc/general_installation.adoc
+++ b/manuals/getting-started-guide/src/main/asciidoc/general_installation.adoc
@@ -174,16 +174,20 @@ support by installing the `odl-restconf` feature.
 //
 // TBD
 
-=== Installing the DLUX web interface
-
-The OpenDaylight web interface; DLUX, draws information from topology and host databases to display information about the topology of the network,
-flow statistics, host locations. You can either use DLUX as a stand-alone plug-in or integrate with OpenDaylight.
-To install DLUX as a standalone application, refer to  https://wiki.opendaylight.org/view/OpenDaylight_DLUX:Setup_and_Run
-To integrate with OpenDaylight you must enable DLUX Karaf feature. You can enable AD-SAL, MD-SAL and various other bundles within Karaf depending on the features you
-would like to access using DLUX. Each feature can be enabled or disabled separately.
-[Important]
-Ensure that you have created a topology and enabled MD-SAL feature in the Karaf distribution before you use DLUX for network management.
-For more information about enabling the Karaf features for DLUX, refer to https://wiki.opendaylight.org/view/OpenDaylight_DLUX:DLUX_Karaf_Feature
+// Commenting this out as it appears to be out of date and there is already
+// information about installing and using DLUX above.
+//
+//=== Installing the DLUX web interface
+//
+//The OpenDaylight web interface; DLUX, draws information from topology and host databases to display information about the topology of the network,
+//flow statistics, host locations. You can either use DLUX as a stand-alone plug-in or integrate with OpenDaylight.
+//To install DLUX as a standalone application, refer to  https://wiki.opendaylight.org/view/OpenDaylight_DLUX:Setup_and_Run
+//To integrate with OpenDaylight you must enable DLUX Karaf feature. You can enable AD-SAL, MD-SAL and various other bundles within Karaf depending on the features you
+//would like to access using DLUX. Each feature can be enabled or disabled separately.
+//
+//[IMPORTANT]
+//Ensure that you have created a topology and enabled MD-SAL feature in the Karaf distribution before you use DLUX for network management.
+//For more information about enabling the Karaf features for DLUX, refer to https://wiki.opendaylight.org/view/OpenDaylight_DLUX:DLUX_Karaf_Feature
 
 === Installing MD-SAL clustering
 The MD-SAL clustering feature has "special" compatibility criteria. You *must*

diff --git a/manuals/getting-started-guide/src/main/asciidoc/ovsdb/ovsdb-openstack-install.adoc b/manuals/getting-started-guide/src/main/asciidoc/ovsdb/ovsdb-openstack-install.adoc
index 514d27f6439b1f8bd3fc2746abbe1cef265fdb31..449c1c68c24e91d81f862db8a41ab73fd43d70f3 100644 (file)
--- a/manuals/getting-started-guide/src/main/asciidoc/ovsdb/ovsdb-openstack-install.adoc
+++ b/manuals/getting-started-guide/src/main/asciidoc/ovsdb/ovsdb-openstack-install.adoc
@@ -25,7 +25,7 @@ http://www.opendaylight.org/software/downloads[Download OpenDaylight]
 . Install the required features with these commands:
 feature:install odl-ovsdb-openstack
 
-===== Sample output from the Karaf console
+==== Sample output from the Karaf console
 ----
 opendaylight-user@root>feature:list -i | grep ovsdb
 odl-ovsdb-southbound-api             | 1.1.0-SNAPSHOT   | x         | odl-ovsdb-southbound-1.1.0-SNAPSHOT