From f7841473125aae1ec3c105e5df070011d667ac5d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 13 Dec 2013 01:44:42 +0000
Subject: [PATCH] Workaround for OPENDJ-1198: make-ldif example template shows markup

---
 src/main/docbkx/dev-guide/man-makeldif-template.xml           |   30 +++++++-------
 opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml |   33 ++++++++--------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml b/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml
index d4285e5..c7b62ae 100644
--- a/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml
+++ b/opends/src/main/docbkx/admin-guide/man-make-ldif-template.xml
@@ -28,8 +28,7 @@
  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'>
+ xmlns:xlink='http://www.w3.org/1999/xlink'>
  <info><copyright><year>2012-2013</year><holder>ForgeRock AS</holder></copyright></info>
  <refmeta>
   <refentrytitle>make-ldif.template</refentrytitle><manvolnum>5</manvolnum>
@@ -397,7 +396,7 @@
   <para>The following example generates 10 organization units, each containing
   50 entries.</para>
 
-  <programlisting language="ldif">define suffix=dc=example,dc=com
+  <programlisting language="plain"><![CDATA[define suffix=dc=example,dc=com
 define maildomain=example.com
 define numusers=50
 define numorgs=10
@@ -412,7 +411,7 @@
 template: orgunit
 subordinateTemplate: person:[numusers]
 rdnAttr: ou
-ou: Org-&lt;sequential:0&gt;
+ou: Org-<sequential:0>
 objectClass: top
 objectClass: organizationalUnit
 description: This is the {ou} organizational unit
@@ -423,24 +422,24 @@
 objectClass: person
 objectClass: organizationalPerson
 objectClass: inetOrgPerson
-givenName: &lt;first&gt;
-sn: &lt;last&gt;
+givenName: <first>
+sn: <last>
 cn: {givenName} {sn}
-initials: {givenName:1}&lt;random:chars:ABCDEFGHIJKLMNOPQRSTUVWXYZ:1&gt;{sn:1}
-employeeNumber: &lt;sequential:0&gt;
+initials: {givenName:1}<random:chars:ABCDEFGHIJKLMNOPQRSTUVWXYZ:1>{sn:1}
+employeeNumber: <sequential:0>
 uid: user.{employeeNumber}
 mail: {uid}@[maildomain]
 userPassword: password
-telephoneNumber: &lt;random:telephone&gt;
-homePhone: &lt;random:telephone&gt;
-pager: &lt;random:telephone&gt;
-mobile: &lt;random:telephone&gt;
-street: &lt;random:numeric:5&gt; &lt;file:streets&gt; Street
-l: &lt;file:cities&gt;
-st: &lt;file:states&gt;
-postalCode: &lt;random:numeric:5&gt;
+telephoneNumber: <random:telephone>
+homePhone: <random:telephone>
+pager: <random:telephone>
+mobile: <random:telephone>
+street: <random:numeric:5> <file:streets> Street
+l: <file:cities>
+st: <file:states>
+postalCode: <random:numeric:5>
 postalAddress: {cn}${street}${l}, {st}  {postalCode}
-description: This is the description for {cn}.</programlisting>
+description: This is the description for {cn}.]]></programlisting>
  </refsect1>
  <refsect1>
   <title>See Also</title>
diff --git a/src/main/docbkx/dev-guide/man-makeldif-template.xml b/src/main/docbkx/dev-guide/man-makeldif-template.xml
index 8bb8f94..d4ae264 100644
--- a/src/main/docbkx/dev-guide/man-makeldif-template.xml
+++ b/src/main/docbkx/dev-guide/man-makeldif-template.xml
@@ -553,7 +553,7 @@
    needed to generate the output.
   </para>
 
-  <programlisting language="ldif">define suffix=dc=example,dc=com
+  <programlisting language="plain"><![CDATA[define suffix=dc=example,dc=com
 define maildomain=example.com
 define numusers=50
 define numorgs=10
@@ -568,7 +568,7 @@
 template: orgunit
 subordinateTemplate: person:[numusers]
 rdnAttr: ou
-ou: Org-&lt;sequential:0>
+ou: Org-<sequential:0>
 objectClass: top
 objectClass: organizationalUnit
 description: This is the {ou} organizational unit
@@ -579,24 +579,24 @@
 objectClass: person
 objectClass: organizationalPerson
 objectClass: inetOrgPerson
-givenName: &lt;first>
-sn: &lt;last>
+givenName: <first>
+sn: <last>
 cn: {givenName} {sn}
-initials: {givenName:1}&lt;random:chars:ABCDEFGHIJKLMNOPQRSTUVWXYZ:1>{sn:1}
-employeeNumber: &lt;sequential:0>
+initials: {givenName:1}<random:chars:ABCDEFGHIJKLMNOPQRSTUVWXYZ:1>{sn:1}
+employeeNumber: <sequential:0>
 uid: user.{employeeNumber}
 mail: {uid}@[maildomain]
 userPassword: password
-telephoneNumber: &lt;random:telephone>
-homePhone: &lt;random:telephone>
-pager: &lt;random:telephone>
-mobile: &lt;random:telephone>
-street: &lt;random:numeric:5> &lt;file:streets> Street
-l: &lt;file:cities>
-st: &lt;file:states>
-postalCode: &lt;random:numeric:5>
+telephoneNumber: <random:telephone>
+homePhone: <random:telephone>
+pager: <random:telephone>
+mobile: <random:telephone>
+street: <random:numeric:5> <file:streets> Street
+l: <file:cities>
+st: <file:states>
+postalCode: <random:numeric:5>
 postalAddress: {cn}${street}${l}, {st}  {postalCode}
-description: This is the description for {cn}.</programlisting>
+description: This is the description for {cn}.]]></programlisting>
  </refsect1>
 
  <refsect1>

--
Gitblit v1.10.0