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/admin-guide/man-restore.xml |   45 ++++++++++++++++++++++++++-------------------
 1 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/opends/src/main/docbkx/admin-guide/man-restore.xml b/opends/src/main/docbkx/admin-guide/man-restore.xml
index 145e9ef..354c776 100644
--- a/opends/src/main/docbkx/admin-guide/man-restore.xml
+++ b/opends/src/main/docbkx/admin-guide/man-restore.xml
@@ -20,17 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <refentry xml:id='restore-1'
  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'>
- <info><copyright><year>2011-2013</year><holder>ForgeRock AS</holder></copyright></info>
+ xsi:schemaLocation='http://docbook.org/ns/docbook
+                     http://docbook.org/xml/5.0/xsd/docbook.xsd'>
+ <info><copyright><year>2011-2014</year><holder>ForgeRock AS</holder></copyright></info>
  <refmeta>
   <refentrytitle>restore</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -294,29 +293,37 @@
   <title>Examples</title>
   <para>The following example schedules a restore as a task to begin
   immediately while OpenDJ directory server is online.</para>
-  <screen>$ restore -p 4444 -D "cn=Directory Manager" -w password
+
+  <screen>
+$ restore -p 4444 -D "cn=Directory Manager" -w password
  -d /path/to/opendj/bak -I 20110613080032 -t 0
-Restore task 20110613155052932 scheduled to start Jun 13, 2011 3:50:52 PM CEST</screen>
+Restore task 20110613155052932 scheduled to start Jun 13, 2011 3:50:52 PM CEST
+  </screen>
 
   <para>The following example restores data while OpenDJ is offline.</para>
-  <screen>$ stop-ds
-Stopping Server...
-...
-$ restore --backupDirectory /path/to/opendj/bak/userRoot
- --listBackups
-Backup ID:          20120928102414Z
+
+  <screen>
+$ <userinput>stop-ds</userinput>
+<computeroutput>Stopping Server...
+...</computeroutput>
+
+$ <userinput>restore --backupDirectory /path/to/opendj/bak/userRoot \
+ --listBackups</userinput>
+<computeroutput>Backup ID:          20120928102414Z
 Backup Date:        28/Sep/2012:12:24:17 +0200
 Is Incremental:     false
 Is Compressed:      false
 Is Encrypted:       false
 Has Unsigned Hash:  false
 Has Signed Hash:    false
-Dependent Upon:     none
+Dependent Upon:     none</computeroutput>
 
-$ restore --backupDirectory /path/to/opendj/bak/userRoot
- --backupID 20120928102414Z
-[28/Sep/2012:12:26:20 +0200] ... msg=Restored: 00000000.jdb (size 355179)
-$ start-ds
-[28/Sep/2012:12:27:29 +0200] ... The Directory Server has started successfully</screen>
+$ <userinput>restore --backupDirectory /path/to/opendj/bak/userRoot \
+ --backupID 20120928102414Z</userinput>
+<computeroutput>[28/Sep/2012:12:26:20 +0200] ... msg=Restored: 00000000.jdb (size 355179)</computeroutput>
+
+$ <userinput>start-ds</userinput>
+<computeroutput>[28/Sep/2012:12:27:29 +0200] ... The Directory Server has started successfully</computeroutput>
+  </screen>
  </refsect1>
 </refentry>

--
Gitblit v1.10.0