From e07183904636c36f0bebd8af1cf9add8b8b4edb2 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 14 Sep 2011 08:23:49 +0000
Subject: [PATCH] Fix some literallayout occurrences affecting output formats from FO. http://www.docbook.org/tdg51/en/html/literallayout.html says: "Unlike programlisting and screen, which usually imply a font change, literallayout does not. How spaces are to be represented faithfully in a proportional font is not addressed by DocBook."
---
opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml | 8 ++++----
opendj-sdk/opendj3/src/main/docbkx/shared/man-manage-account.xml | 2 +-
opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml | 2 +-
opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml | 2 +-
opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
index bc7c14b..f63c206 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-account-lockout.xml
@@ -110,7 +110,7 @@
<para>For the following examples, the directory admin user, Kirsten Vaughan,
has <literal>ds-privilege-name: password-reset</literal>, and the following
ACI on <literal>ou=People,dc=example,dc=com</literal>.</para>
- <literallayout>(target="ldap:///ou=People,dc=example,dc=com") (targetattr ="*||+")(
+ <literallayout class="monospaced">(target="ldap:///ou=People,dc=example,dc=com") (targetattr ="*||+")(
version 3.0;acl "Admins can run amok"; allow(all) groupdn =
"ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)</literallayout>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
index d0cd10f..f898451 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-privileges-acis.xml
@@ -69,7 +69,7 @@
Although ACI attribute values can become difficult to read in LDIF, the
basic syntax is simple.</para>
- <literallayout><replaceable>targets</replaceable>(version 3.0;acl "<replaceable>name</replaceable>";<replaceable>permissions</replaceable> <replaceable>subjects</replaceable>;)</literallayout>
+ <literallayout class="monospaced"><replaceable>targets</replaceable>(version 3.0;acl "<replaceable>name</replaceable>";<replaceable>permissions</replaceable> <replaceable>subjects</replaceable>;)</literallayout>
<para>The following list briefly explains the variables in the syntax above.</para>
@@ -170,7 +170,7 @@
particular attributes.</para>
<para>Here <replaceable>expression</replaceable> takes one of the
following forms. Separate expressions with semicolons, ;.</para>
- <literallayout><replaceable>op</replaceable>=<replaceable>attr1</replaceable>:<replaceable>filter1</replaceable>[&& <replaceable>attr2</replaceable>:<replaceable>filter2</replaceable> ...][;<replaceable>op</replaceable>=<replaceable>attr3</replaceable>:<replaceable>filter3</replaceable>[&& <replaceable>attr4</replaceable>:<replaceable>filter4</replaceable> ...] ...]</literallayout>
+ <literallayout class="monospaced"><replaceable>op</replaceable>=<replaceable>attr1</replaceable>:<replaceable>filter1</replaceable>[&& <replaceable>attr2</replaceable>:<replaceable>filter2</replaceable> ...][;<replaceable>op</replaceable>=<replaceable>attr3</replaceable>:<replaceable>filter3</replaceable>[&& <replaceable>attr4</replaceable>:<replaceable>filter4</replaceable> ...] ...]</literallayout>
<para>Here <replaceable>op</replaceable> can be either
<literal>add</literal> for operations creating attributes, or
<literal>delete</literal> for operations removing them.
@@ -218,8 +218,8 @@
<para>ACI permission definitions take one of the following forms.</para>
- <literallayout>allow(<replaceable>action</replaceable>[, <replaceable>action</replaceable> ...])</literallayout>
- <literallayout>deny(<replaceable>action</replaceable>[, <replaceable>action</replaceable> ...])</literallayout>
+ <literallayout class="monospaced">allow(<replaceable>action</replaceable>[, <replaceable>action</replaceable> ...])</literallayout>
+ <literallayout class="monospaced">deny(<replaceable>action</replaceable>[, <replaceable>action</replaceable> ...])</literallayout>
<tip>
<para>Although <literal>deny</literal> is supported, avoid restricting
diff --git a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
index 131bfe7..e59ede0 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
@@ -79,7 +79,7 @@
the operation. The log location differs by operating system, but look for
lines in the command output of the following form.</para>
- <literallayout>See /var/....log for a detailed log of this operation.</literallayout>
+ <literallayout class="monospaced">See /var/....log for a detailed log of this operation.</literallayout>
</section>
<section>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
index d8a5665..409df57 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-upgrade.xml
@@ -85,7 +85,7 @@
the end of the file, and taking care not to add additional spaces at the end
of the lines you add. <emphasis>If the result is not valid LDIF, your fix
will fail.</emphasis></para>
- <literallayout>ldapSyntaxes: ( 1.3.6.1.4.1.26027.1.3.6 DESC '
+ <literallayout class="monospaced">ldapSyntaxes: ( 1.3.6.1.4.1.26027.1.3.6 DESC '
Collective Conflict Behavior' X-ENUM ( 'real-overrides-virtual' '
virtual-overrides-real' 'merge-real-and-virtual' ) X-SCHEMA-FILE '
00-core.ldif' )</literallayout>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/shared/man-manage-account.xml b/opendj-sdk/opendj3/src/main/docbkx/shared/man-manage-account.xml
index a0c3e50..ce0d111 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/shared/man-manage-account.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/shared/man-manage-account.xml
@@ -350,7 +350,7 @@
<para>For the following examples, the directory admin user, Kirsten Vaughan,
has <literal>ds-privilege-name: password-reset</literal>, and the following
ACI on <literal>ou=People,dc=example,dc=com</literal>.</para>
- <literallayout>(target="ldap:///ou=People,dc=example,dc=com") (targetattr ="*||+")(
+ <literallayout class="monospaced">(target="ldap:///ou=People,dc=example,dc=com") (targetattr ="*||+")(
version 3.0;acl "Admins can run amok"; allow(all) groupdn =
"ldap:///cn=Directory Administrators,ou=Groups,dc=example,dc=com";)</literallayout>
<para>The following command locks a user account.</para>
--
Gitblit v1.10.0