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-setup.xml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/opends/src/main/docbkx/admin-guide/man-setup.xml b/opends/src/main/docbkx/admin-guide/man-setup.xml
index 1c5687c..20b6013 100644
--- a/opends/src/main/docbkx/admin-guide/man-setup.xml
+++ b/opends/src/main/docbkx/admin-guide/man-setup.xml
@@ -20,17 +20,16 @@
!
! CCPL HEADER END
!
- ! Copyright 2011-2013 ForgeRock AS
+ ! Copyright 2011-2014 ForgeRock AS
!
-->
<refentry xml:id='setup-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>setup</refentrytitle><manvolnum>1</manvolnum>
<refmiscinfo class="software">OpenDJ</refmiscinfo>
@@ -325,11 +324,13 @@
<title>Examples</title>
<para>The following command installs OpenDJ directory server, enabling
StartTLS and importing 100 example entries without interaction.</para>
- <screen>$ /path/to/opendj/setup --cli -b dc=example,dc=com -d 100
- -D "cn=Directory Manager" -w password -h opendj.example.com -p 1389
- --generateSelfSignedCertificate --enableStartTLS -n
-OpenDJ <?eval ${docTargetVersion}?>
+ <screen>
+<userinput>$ /path/to/opendj/setup --cli -b dc=example,dc=com -d 100 \
+ -D "cn=Directory Manager" -w password -h opendj.example.com -p 1389 \
+ --generateSelfSignedCertificate --enableStartTLS -n</userinput>
+
+<computeroutput>OpenDJ <?eval ${docTargetVersion}?>
Please wait while the setup program initializes...
See /var/.../opends-setup-484...561.log for a detailed log of this operation.
@@ -340,6 +341,7 @@
Starting Directory Server .......... Done.
To see basic server configuration status and configuration you can launch
- /path/to/opendj/bin/status</screen>
+ /path/to/opendj/bin/status</computeroutput>
+ </screen>
</refsect1>
</refentry>
--
Gitblit v1.10.0