From 1601dd4a9bfaae67310bf28de6093f7372ac8b3d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Mon, 31 Mar 2014 07:09:23 +0000
Subject: [PATCH] SDK docs patch for OPENDJ-980: Allow copy/paste of formatted shell commands; OPENDJ-1376: Add <userinput> and potential <computeroutput> to <screen> content

---
 src/main/docbkx/dev-guide/man-ldifdiff.xml |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/docbkx/dev-guide/man-ldifdiff.xml b/src/main/docbkx/dev-guide/man-ldifdiff.xml
index cfe0014..c089a67 100644
--- a/src/main/docbkx/dev-guide/man-ldifdiff.xml
+++ b/src/main/docbkx/dev-guide/man-ldifdiff.xml
@@ -20,17 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2013 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <refentry xml:id='ldifdiff-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>ldifdiff</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -122,8 +121,10 @@
   <title>Examples</title>
   <para>The following example demonstrates use of the command with two
   small LDIF files.</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
@@ -133,10 +134,10 @@
 sn: User
 ou: People
 mail: newuser@example.com
-userPassword: changeme
+userPassword: changeme</computeroutput>
 
-$ cat /path/to/neweruser.ldif
-dn: uid=newuser,ou=People,dc=example,dc=com
+$ <userinput>cat /path/to/neweruser.ldif</userinput>
+<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
 uid: newuser
 objectClass: person
 objectClass: organizationalPerson
@@ -147,10 +148,10 @@
 ou: People
 mail: newuser@example.com
 userPassword: secret12
-description: A new description.
+description: A new description.</computeroutput>
 
-$ ldifdiff /path/to/newuser.ldif /path/to/neweruser.ldif
-dn: uid=newuser,ou=People,dc=example,dc=com
+$ <userinput>ldifdiff /path/to/newuser.ldif /path/to/neweruser.ldif</userinput>
+<computeroutput>dn: uid=newuser,ou=People,dc=example,dc=com
 changetype: modify
 add: userPassword
 userPassword: secret12
@@ -159,7 +160,7 @@
 userPassword: changeme
 -
 add: description
-description: A new description.
-</screen>
+description: A new description.</computeroutput>
+  </screen>
  </refsect1>
 </refentry>

--
Gitblit v1.10.0