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-ldifmodify.xml |   34 ++++++++++++++++++----------------
 1 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/opends/src/main/docbkx/admin-guide/man-ldifmodify.xml b/opends/src/main/docbkx/admin-guide/man-ldifmodify.xml
index fd011ac..e83b0d7 100644
--- a/opends/src/main/docbkx/admin-guide/man-ldifmodify.xml
+++ b/opends/src/main/docbkx/admin-guide/man-ldifmodify.xml
@@ -20,17 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2012 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <refentry xml:id='ldifmodify-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-2012</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>ldifmodify</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -107,8 +106,10 @@
  <refsect1>
   <title>Examples</title>
   <para>The following example demonstrates use of the command.</para>
-  <screen>$ cat /path/to/newuser.ldif 
-dn: uid=newuser,ou=People,dc=example,dc=com
+
+  <screen>
+$ <userinput>cat /path/to/newuser.ldif</userinput>
+<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
 uid: newuser
 objectClass: person
 objectClass: organizationalPerson
@@ -118,10 +119,10 @@
 sn: User
 ou: People
 mail: newuser@example.com
-userPassword: changeme
+userPassword: changeme</computeroutput>
   
-$ cat /path/to/newdiff.ldif 
-dn: uid=newuser,ou=People,dc=example,dc=com
+$ <userinput>cat /path/to/newdiff.ldif</userinput>
+<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
 changetype: modify
 add: userPassword
 userPassword: secret12
@@ -130,11 +131,12 @@
 userPassword: changeme
 -
 add: description
-description: A new description.
+description: A new description.</computeroutput>
 
-$ ldifmodify -s /path/to/newuser.ldif -m /path/to/newdiff.ldif -t neweruser.ldif
-$ cat neweruser.ldif 
-dn: uid=newuser,ou=People,dc=example,dc=com
+$ <userinput>ldifmodify -s /path/to/newuser.ldif -m /path/to/newdiff.ldif -t neweruser.ldif</userinput>
+
+$ <userinput>cat neweruser.ldif</userinput>
+<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
 objectClass: person
 objectClass: inetOrgPerson
 objectClass: organizationalPerson
@@ -145,8 +147,8 @@
 sn: User
 userPassword: secret12
 mail: newuser@example.com
-ou: People
+ou: People</computeroutput>
 
-</screen>
+  </screen>
  </refsect1>
 </refentry>

--
Gitblit v1.10.0