From 3bcfcd82040f06c50dbd7f3dcf5ab33fce83a88f Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 28 May 2013 06:03:38 +0000
Subject: [PATCH] Fix for OPENDJ-947: Install Guide: some reference to 2.4.6 should be replaced with 2.4.5

---
 opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml |   65 --------------------------------
 1 files changed, 1 insertions(+), 64 deletions(-)

diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml b/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml
index 3edb446..055b829 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml
@@ -202,70 +202,7 @@
   <para>The following example shows the upgrade process for OpenDJ directory
   server installed from the cross-platform (.zip) delivery.</para>
 
-  <!--
-   Intentionally not using <?eval ${stableServerVersion}?> instead of 2.4.6:
-
-   Once the ${stableServerVersion} has moved to the new file name,
-   the directory names will change, so 2.4.6 is not a variable here,
-   but instead an example that should be common for the first release
-   with the new upgrade command.
-
-   Perhaps people will forgive details missing in this upgrade that happened
-   after the example was run.
-  -->
-
-  <screen>$ cd /path/to
-$ ls
-OpenDJ-2.4.6
-$ ./OpenDJ-2.4.6/bin/stop-ds --quiet
-... msg=The backend userRoot is now taken offline
-... msg=The Directory Server is now stopped
-$ zip -rq OpenDJ-backup.zip OpenDJ-2.4.6
-$ unzip -q ~/Downloads/OpenDJ-<?eval ${docTargetVersion}?>.zip
-$ cp -r opendj/* OpenDJ-2.4.6/
-$ rm -rf opendj
-$ mv OpenDJ-2.4.6 opendj
-$ ./opendj/upgrade --no-prompt
-
->>>> OpenDJ Upgrade Utility
-
- * OpenDJ will be upgraded from version 2.4.6.8102 to <?eval ${docTargetVersion}?>.<replaceable>revision</replaceable>
- * See '/path/to/opendj/upgrade.log' for a detailed log of this operation
-
->>>> Preparing to upgrade
-
-  OpenDJ <?eval ${docTargetVersion}?> modified the default configuration of the 'isMemberOf' virtual
-  attribute so that it is included with group entries. This was done in order
-  to make it easier for users to determine which groups a 'nested' group
-  belongs to.
-  Do you want to make this configuration change? (yes/no) yes
-
-  The upgrade is ready to proceed. Do you wish to continue? (yes/no) yes
-
-
->>>> Performing upgrade
-
-  Fixing de-DE collation matching rule OID............................   100%
-  Updating password policy configurations.............................   100%
-  Updating audit log publisher configuration..........................   100%
-  Adding 'etag' virtual attribute schema..............................   100%
-  Configuring 'etag' virtual attribute................................   100%
-  Configuring 'ds-pwp-password-expiration-time' virtual attribute.....   100%
-  Updating certificate syntax configuration...........................   100%
-  Updating JPEG syntax configuration..................................   100%
-  Updating country string syntax configuration........................   100%
-  Modifying filter in 'isMemberOf' virtual attribute configuration....   100%
-  Updating dictionary password validator configuration................   100%
-  Updating attribute value password validator configuration...........   100%
-  Adding PBKDF2 password storage scheme configuration.................   100%
-  Replacing schema file '02-config.ldif'..............................   100%
-  Archiving concatenated schema.......................................   100%
-
->>>> OpenDJ was successfully upgraded from version 2.4.6.8102 to <?eval ${docTargetVersion}?>.<replaceable>revision</replaceable>
-
- * See '/path/to/opendj/upgrade.log' for a detailed log of this operation
-$ ./opendj/bin/start-ds --quiet
-$ </screen>
+  <xinclude:include href="screen-upgrade.xml" />
 
   <para>Native packages (.deb, .rpm) perform more of the upgrade process,
   stopping OpenDJ if it is running, overwriting older files with newer files,

--
Gitblit v1.10.0