Ugly hack to replicated content in both UG and GSG

Change-Id: Ie0473b78741e366c2c475cc6bf638b9fe4b95cfc
Signed-off-by: Colin Dixon <colin@colindixon.com>
(cherry picked from commit 41ef9834629220eceaa6cce17b1af325619ae1ca)

diff --git a/manuals/getting-started-guide/src/main/asciidoc/ch-clustering.adoc b/manuals/getting-started-guide/src/main/asciidoc/ch-clustering.adoc
index 73ad273a72d184fd7d2905941af1a81dfb573db4..150f3b64b6fcc6ea2ddb40791f5983ea816978f0 100755 (executable)
--- a/manuals/getting-started-guide/src/main/asciidoc/ch-clustering.adoc
+++ b/manuals/getting-started-guide/src/main/asciidoc/ch-clustering.adoc
@@ -30,8 +30,7 @@ multiple OpenDaylight instances.
 To enable clustering on a single instance of OpenDaylight, perform the
 following steps:
 
-. Download, install, and run OpenDaylight as
-  <<_getting_and_installing_opendaylight_lithium,described above>>
+. Download, unzip, and run the OpenDaylight distribution
 . Install the clustering feature:
 +
  feature:install odl-mdsal-clustering

diff --git a/manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc b/manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc
index ab2ff89019e2157242720f524d7c7787ccd629aa..fb4c13ff773fe49989e0378ce65c1896fc9427e0 100644 (file)
--- a/manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc
+++ b/manuals/user-guide/src/main/asciidoc/bk-user-guide.adoc
@@ -15,6 +15,13 @@ This first part of the user guide covers the basic user operations of the OpenDa
 
 include::ch-introduction.adoc[OpenDaylight Controller Overview]
 
+//TODO: these three includes are a hugely ugly hack that needs to go
+include::../../../../getting-started-guide/src/main/asciidoc/ch-dlux.adoc[]
+
+include::../../../../getting-started-guide/src/main/asciidoc/ch-xsql-commands.adoc[]
+
+include::../../../../getting-started-guide/src/main/asciidoc/ch-clustering.adoc[]
+
 = Applications and Plugins
 
 [partintro]

diff --git a/manuals/user-guide/src/main/resources/images/dlux-login.png b/manuals/user-guide/src/main/resources/images/dlux-login.png
new file mode 100755 (executable)
index 0000000..f72c213
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-login.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-topology.png b/manuals/user-guide/src/main/resources/images/dlux-topology.png
new file mode 100755 (executable)
index 0000000..3cfd423
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-topology.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-api-specification.png b/manuals/user-guide/src/main/resources/images/dlux-yang-api-specification.png
new file mode 100755 (executable)
index 0000000..deced64
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-api-specification.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-list-button1.png b/manuals/user-guide/src/main/resources/images/dlux-yang-list-button1.png
new file mode 100755 (executable)
index 0000000..f99aa18
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-list-button1.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-list-elements.png b/manuals/user-guide/src/main/resources/images/dlux-yang-list-elements.png
new file mode 100755 (executable)
index 0000000..3a7c663
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-list-elements.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-list-warning.png b/manuals/user-guide/src/main/resources/images/dlux-yang-list-warning.png
new file mode 100755 (executable)
index 0000000..9d016db
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-list-warning.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-sub-api-screen.png b/manuals/user-guide/src/main/resources/images/dlux-yang-sub-api-screen.png
new file mode 100755 (executable)
index 0000000..8089a14
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-sub-api-screen.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-topology.png b/manuals/user-guide/src/main/resources/images/dlux-yang-topology.png
new file mode 100755 (executable)
index 0000000..9893028
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-topology.png differ

diff --git a/manuals/user-guide/src/main/resources/images/dlux-yang-ui-screen.png b/manuals/user-guide/src/main/resources/images/dlux-yang-ui-screen.png
new file mode 100755 (executable)
index 0000000..e6f5cd6
Binary files /dev/null and b/manuals/user-guide/src/main/resources/images/dlux-yang-ui-screen.png differ