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-uninstall.xml |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/opends/src/main/docbkx/admin-guide/man-uninstall.xml b/opends/src/main/docbkx/admin-guide/man-uninstall.xml
index 3d96c9a..b119c72 100644
--- a/opends/src/main/docbkx/admin-guide/man-uninstall.xml
+++ b/opends/src/main/docbkx/admin-guide/man-uninstall.xml
@@ -20,17 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <refentry xml:id='uninstall-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>uninstall</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -288,16 +287,20 @@
   <title>Examples</title>
   <para>The following command removes OpenDJ directory server without
   interaction.</para>
-  <screen>$ /path/to/opendj/uninstall -a --cli -I admin -w password -n
 
-Stopping Directory Server ..... Done.
+  <screen>
+$ <userinput>/path/to/opendj/uninstall -a --cli -I admin -w password -n</userinput>
+
+<computeroutput>Stopping Directory Server ..... Done.
 Deleting Files under the Installation Path ..... Done.
 
 The Uninstall Completed Successfully.
 To complete the uninstallation, you must delete manually the following files
 and directories:
 /path/to/opendj/lib
-See /var/.../opends-uninstall-3...0.log for a detailed log of this operation.
-$ rm -rf opendj</screen>
+See /var/.../opends-uninstall-3...0.log for a detailed log of this operation.</computeroutput>
+
+$ <userinput>rm -rf /path/to/opendj</userinput>
+  </screen>
  </refsect1>
 </refentry>

--
Gitblit v1.10.0