From a26c1b2faa98866dcc505fe94021f67d77a0d5fe Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Fri, 20 Jul 2012 15:03:42 +0000
Subject: [PATCH] Fix for OpenDJ-547: Manual typos and odd wording

---
 opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml b/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
index 547e390..d83ebbf 100644
--- a/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
+++ b/opendj3/src/main/docbkx/admin-guide/chap-troubleshooting.xml
@@ -284,13 +284,15 @@
   the <option>--skipSchemaValidation</option> with the
   <command>import-ldif</command> command.</para>
   
-  <para>OpenDJ also ensures by default that entries have only one inheritance
-  of structural object classes. You can relax this behavior by using the
-  advanced global configuration property,
+  <para>OpenDJ also ensures by default that entries have only one structural
+  object class. You can relax this behavior by using the advanced global
+  configuration property,
   <literal>single-structural-objectclass-behavior</literal>. This can be useful
   when importing data exported from Sun Directory Server. For example, to
   warn when entries have more than one structural object class instead of
-  reject such entries being added, set the property as follows.</para>
+  reject such entries being added, set
+  <literal>single-structural-objectclass-behavior:warn</literal> as
+  follows.</para>
   
   <screen>$ dsconfig
  set-global-configuration-prop
@@ -615,10 +617,8 @@
    <para>Alternatively, stop OpenDJ, edit the corresponding ACI carefully in
    <filename>/path/to/OpenDJ/config/config.ldif</filename>, and restart OpenDJ.
    <footnote><para>Unlike the <command>dsconfig</command> command, the
-   <filename>config.ldif</filename> file is not a public interface. In this
-   particular case, however, the <command>dsconfig</command> command is such a
-   pain in the nether regions that you might as well edit the LDIF instead
-   (unless you are doing this in production).</para></footnote></para>
+   <filename>config.ldif</filename> file is not a public interface, so this
+   alternative should not be used in production.</para></footnote></para>
   </section>
  </section>
 

--
Gitblit v1.10.0