From 3e07682f74495391ebef394b49d44e6b976a9ca2 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 14 Oct 2011 14:48:43 +0000
Subject: [PATCH] Documentation review comments from Sachiko Wallace

---
 opendj3/src/main/docbkx/install-guide/chap-install-gui.xml     |   21 +++++++++++++++------
 opendj3/src/main/docbkx/install-guide/images/missing-java6.png |    0 
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml b/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
index b8d482f..b4dac97 100644
--- a/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
+++ b/opendj3/src/main/docbkx/install-guide/chap-install-gui.xml
@@ -47,18 +47,27 @@
  WebStart installer.</para>
 
  <note><para>OpenDJ directory server relies on Java 6, so if your browser
- picks up an old installation of Java 5 for example, installation can fail.
- Currently also if you are on a Linux system, you need to get Sun Java 6
- before you use OpenDJ directory server.</para>
+ picks up an old installation of Java 5 for example, installation can
+ fail. You might see an application error messages such as this:</para>
+
+ <mediaobject>
+  <alt>Application error due to old Java version</alt>
+  <imageobject>
+   <imagedata fileref="images/missing-java6.png" format="PNG" />
+  </imageobject>
+  <textobject>
+   <para>Message showing the browser is unable to launch the application</para>
+  </textobject>
+ </mediaobject>
 
  <para>If the WebStart installation does not work in your browser, copy
  the WebStart URL, ending in <literal>QuickSetup.jnlp</literal>, from the
  OpenDJ download page. This is the first link in the list of links for
  a version of OpenDJ. Next, pass the link as an argument to the
  <command>javaws</command> command in a terminal window to start the
-  installer.</para>
+ installer.</para>
 
- <screen>$ export PATH=/path/to/sun-java6/bin:$PATH
+ <screen>$ export PATH=/path/to/java6/bin:$PATH
 $ javaws http://www.forgerock.org/downloads/opendj/<?eval ${docTargetVersion}?>/install/QuickSetup.jnlp</screen>
 
  <para>The WebStart installer corresponds to what you start if you download
@@ -105,7 +114,7 @@
   <imageobject>
    <imagedata fileref="images/QuickSetup-jvmopts.png" format="PNG" />
   </imageobject>
-  <caption><para>For a real installation, you adjust JVM parameters for
+  <caption><para>For a real installation, you can adjust JVM parameters for
   your server, for example to allow OpenDJ to use more memory.</para></caption>
  </mediaobject>
 
diff --git a/opendj3/src/main/docbkx/install-guide/images/missing-java6.png b/opendj3/src/main/docbkx/install-guide/images/missing-java6.png
new file mode 100644
index 0000000..d31c8cd
--- /dev/null
+++ b/opendj3/src/main/docbkx/install-guide/images/missing-java6.png
Binary files differ

--
Gitblit v1.10.0