From d8620c0f3d8c46579cf8ea6c9499d80931ac1ef4 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 28 May 2013 08:06:00 +0000
Subject: [PATCH] Again attempt to avoid java.lang.StackOverflowError in Saxon
---
opendj-sdk/opends/resource/man/man1/upgrade.1 | 8 ++++----
opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml | 8 ++++----
2 files changed, 8 insertions(+), 8 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 e7f6fb7..caf67a5 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/shared/man-upgrade.xml
@@ -210,7 +210,7 @@
... msg=The backend userRoot is now taken offline
... msg=The Directory Server is now stopped
$ zip -rq OpenDJ-backup.zip OpenDJ-2.4.5
-$ unzip -q ~/Downloads/OpenDJ-<?eval ${docTargetVersion}?>.zip
+$ unzip -q ~/Downloads/OpenDJ-<replaceable>version</replaceable>.zip
$ cp -r opendj/* OpenDJ-2.4.5/
$ rm -rf opendj
$ mv OpenDJ-2.4.5 opendj
@@ -218,12 +218,12 @@
>>>> OpenDJ Upgrade Utility
- * OpenDJ will be upgraded from version 2.4.5.7743 to <?eval ${docTargetVersion}?>.<replaceable>revision</replaceable>
+ * OpenDJ will be upgraded from version 2.4.5.7743 to <replaceable>version</replaceable>.<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
+ OpenDJ <replaceable>version</replaceable> 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.
@@ -253,7 +253,7 @@
Replacing schema file '02-config.ldif'.............................. 100%
Archiving concatenated schema....................................... 100%
->>>> OpenDJ was successfully upgraded from version 2.4.5.7743 to <?eval ${docTargetVersion}?>.<replaceable>revision</replaceable>
+>>>> OpenDJ was successfully upgraded from version 2.4.5.7743 to <replaceable>version</replaceable>.<replaceable>revision</replaceable>
* See '/path/to/opendj/upgrade.log' for a detailed log of this operation
$ ./opendj/bin/start-ds --quiet
diff --git a/opendj-sdk/opends/resource/man/man1/upgrade.1 b/opendj-sdk/opends/resource/man/man1/upgrade.1
index 7eab236..e0655ff 100644
--- a/opendj-sdk/opends/resource/man/man1/upgrade.1
+++ b/opendj-sdk/opends/resource/man/man1/upgrade.1
@@ -202,7 +202,7 @@
\&.\&.\&. msg=The backend userRoot is now taken offline
\&.\&.\&. msg=The Directory Server is now stopped
$ zip \-rq OpenDJ\-backup\&.zip OpenDJ\-2\&.4\&.5
-$ unzip \-q ~/Downloads/OpenDJ\-2\&.6\&.0\&.zip
+$ unzip \-q ~/Downloads/OpenDJ\-\fIversion\fR\&.zip
$ cp \-r opendj/* OpenDJ\-2\&.4\&.5/
$ rm \-rf opendj
$ mv OpenDJ\-2\&.4\&.5 opendj
@@ -210,12 +210,12 @@
>>>> OpenDJ Upgrade Utility
- * OpenDJ will be upgraded from version 2\&.4\&.5\&.7743 to 2\&.6\&.0\&.\fIrevision\fR
+ * OpenDJ will be upgraded from version 2\&.4\&.5\&.7743 to \fIversion\fR\&.\fIrevision\fR
* See \*(Aq/path/to/opendj/upgrade\&.log\*(Aq for a detailed log of this operation
>>>> Preparing to upgrade
- OpenDJ 2\&.6\&.0 modified the default configuration of the \*(AqisMemberOf\*(Aq virtual
+ OpenDJ \fIversion\fR modified the default configuration of the \*(AqisMemberOf\*(Aq 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 \*(Aqnested\*(Aq group
belongs to\&.
@@ -245,7 +245,7 @@
Replacing schema file \*(Aq02\-config\&.ldif\*(Aq\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
Archiving concatenated schema\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
->>>> OpenDJ was successfully upgraded from version 2\&.4\&.5\&.7743 to 2\&.6\&.0\&.\fIrevision\fR
+>>>> OpenDJ was successfully upgraded from version 2\&.4\&.5\&.7743 to \fIversion\fR\&.\fIrevision\fR
* See \*(Aq/path/to/opendj/upgrade\&.log\*(Aq for a detailed log of this operation
$ \&./opendj/bin/start\-ds \-\-quiet
--
Gitblit v1.10.0