From 9c3e8d03df676b56dba73d156abb274d507e242b Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 25 Jun 2013 14:56:15 +0000
Subject: [PATCH] Review comments by IM from Christophe
---
opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml | 6 +++---
opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml | 8 +++-----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
index 293f812..6974eeb 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
@@ -503,9 +503,9 @@
<para>Before you install OpenDJ, install a Java runtime environment if none
is installed yet.</para>
- <screen>$ java -version
-java version ...
-OpenJDK Runtime Environment ...</screen>
+ <screen>$ su
+Password:
+# rpm -ivh jdk-*.rpm</screen>
</step>
<step>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
index df9004e..1581491 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
@@ -34,13 +34,11 @@
<para>This chapter covers upgrade from OpenDJ 2.4.5 and later versions.</para>
- <para>For upgrades from earlier versions, upgrade first to OpenDJ
- <?eval ${stableServerVersion}?>, and then follow the procedures in this
- chapter. See <link xlink:show="new"
+ <para>For upgrades from earlier versions, upgrade first to at least OpenDJ
+ 2.4.5, and then follow the procedures in this chapter. See <link xlink:show="new"
xlink:href="https://wikis.forgerock.org/confluence/display/OPENDJ/OpenDJ+Installation+Guide#OpenDJInstallationGuide-UpgradingOpenDJDirectoryServer"
>Upgrading OpenDJ Directory Server</link> in the OpenDJ Wiki for details on
- upgrading to OpenDJ <?eval ${stableServerVersion}?> from earlier
- versions.</para>
+ upgrading to OpenDJ 2.4.5 from earlier versions.</para>
<procedure xml:id="before-you-upgrade">
<title>Before You Upgrade</title>
--
Gitblit v1.10.0