From ae57abea41b1a1c805fee27ffcfeabc0ae07e969 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Mon, 31 Mar 2014 07:17:12 +0000
Subject: [PATCH] Backport CR-3283 Fix for Server docs patch for OPENDJ-980: Allow copy/ paste of formatted shell commands; OPENDJ-1376: Add <userinput> and potential <computeroutput> to <screen> content
---
opends/src/main/docbkx/shared/screen-upgrade.xml | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/opends/src/main/docbkx/shared/screen-upgrade.xml b/opends/src/main/docbkx/shared/screen-upgrade.xml
index 292efaf..d75f0f3 100644
--- a/opends/src/main/docbkx/shared/screen-upgrade.xml
+++ b/opends/src/main/docbkx/shared/screen-upgrade.xml
@@ -18,25 +18,24 @@
!
! CCPL HEADER END
!
- ! Copyright 2013 ForgeRock AS
+ ! Copyright 2013-2014 ForgeRock AS
!
-->
<screen xml:id="upgrade-earliest-supported"
xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
- xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
- xmlns:xlink='http://www.w3.org/1999/xlink'
- xmlns:xinclude='http://www.w3.org/2001/XInclude'
->$ /path/to/OpenDJ-2.4.5/bin/stop-ds --quiet
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+ http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ >$ <userinput>/path/to/OpenDJ-2.4.5/bin/stop-ds --quiet</userinput>
... msg=The backend userRoot is now taken offline
... msg=The Directory Server is now stopped
-$ cd /path/to
-$ zip -rq OpenDJ-backup.zip OpenDJ-2.4.5
-$ unzip -q ~/Downloads/OpenDJ-2.6.0.zip
-$ cp -r opendj/* OpenDJ-2.4.5/
-$ rm -rf opendj
-$ mv OpenDJ-2.4.5 opendj
-$ /path/to/opendj/upgrade --no-prompt --acceptLicense
+$ <userinput>cd /path/to</userinput>
+$ <userinput>zip -rq OpenDJ-backup.zip OpenDJ-2.4.5</userinput>
+$ <userinput>unzip -q ~/Downloads/OpenDJ-2.6.0.zip</userinput>
+$ <userinput>cp -r opendj/* OpenDJ-2.4.5/</userinput>
+$ <userinput>rm -rf opendj</userinput>
+$ <userinput>mv OpenDJ-2.4.5 opendj</userinput>
+$ <userinput>/path/to/opendj/upgrade --no-prompt --acceptLicense</userinput>
>>>> OpenDJ Upgrade Utility
@@ -93,5 +92,5 @@
>>>> OpenDJ was successfully upgraded from version 2.4.5.7743 to 2.6.0.9086
* See '/path/to/opendj/upgrade.log' for a detailed log of this operation
-$ /path/to/opendj/bin/start-ds --quiet
+$ <userinput>/path/to/opendj/bin/start-ds --quiet</userinput>
$ </screen>
--
Gitblit v1.10.0