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-ldifsearch.xml |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/opends/src/main/docbkx/admin-guide/man-ldifsearch.xml b/opends/src/main/docbkx/admin-guide/man-ldifsearch.xml
index 22f1375..d198561 100644
--- a/opends/src/main/docbkx/admin-guide/man-ldifsearch.xml
+++ b/opends/src/main/docbkx/admin-guide/man-ldifsearch.xml
@@ -20,17 +20,16 @@
   !
   ! CCPL HEADER END
   !
-  !      Copyright 2011-2012 ForgeRock AS
+  !      Copyright 2011-2014 ForgeRock AS
   !    
 -->
 <refentry xml:id='ldifsearch-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>ldifsearch</refentrytitle><manvolnum>1</manvolnum>
   <refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -195,8 +194,10 @@
  <refsect1>
   <title>Examples</title>
   <para>The following example demonstrates use of the command.</para>
-  <screen>$ ldifsearch -l /path/to/Example.ldif -b dc=example,dc=com uid=bjensen
-dn: uid=bjensen,ou=People,dc=example,dc=com
+
+  <screen>
+$ <userinput>ldifsearch -l /path/to/Example.ldif -b dc=example,dc=com uid=bjensen</userinput>
+<computeroutput>dn: uid=bjensen,ou=People,dc=example,dc=com
 objectClass: person
 objectClass: organizationalPerson
 objectClass: inetOrgPerson
@@ -217,8 +218,8 @@
 ou: Product Development
 ou: People
 uidNumber: 1076
-gidNumber: 1000
-</screen>
+gidNumber: 1000</computeroutput>
+  </screen>
 
   <para>You can also use <literal>@<replaceable
   >objectclass</replaceable></literal> notation in the attribute list to return
@@ -226,9 +227,10 @@
   how to return attributes of the <literal>posixAccount</literal> object
   class.</para>
 
-  <screen>$ ldifsearch --ldifFile /path/to/Example.ldif
- --baseDN dc=example,dc=com "(uid=bjensen)" @posixaccount
-dn: uid=bjensen,ou=People,dc=example,dc=com
+  <screen>
+$ <userinput>ldifsearch --ldifFile /path/to/Example.ldif \
+ --baseDN dc=example,dc=com "(uid=bjensen)" @posixaccount</userinput>
+<computeroutput>dn: uid=bjensen,ou=People,dc=example,dc=com
 objectClass: person
 objectClass: organizationalPerson
 objectClass: inetOrgPerson
@@ -240,6 +242,7 @@
 cn: Babs Jensen
 homeDirectory: /home/bjensen
 uidNumber: 1076
-gidNumber: 1000</screen>
+gidNumber: 1000</computeroutput>
+  </screen>
  </refsect1>
 </refentry>

--
Gitblit v1.10.0