[deployment-guide: 71/185] Various corrections.

Jaromir Hradilek jhradile at fedoraproject.org
Sun May 15 21:16:58 UTC 2011


commit 8323583d83480c67db1d56b302ada63c30a07c4f
Author: Jaromir Hradilek <jhradile at redhat.com>
Date:   Wed Feb 2 14:09:37 2011 +0100

    Various corrections.
    
    Thanks, Andrew.

 en-US/Book_Info.xml |    2 +-
 en-US/OpenLDAP.xml  |   34 ++++++++++++++--------------------
 2 files changed, 15 insertions(+), 21 deletions(-)
---
diff --git a/en-US/Book_Info.xml b/en-US/Book_Info.xml
index 2c5cf6c..f1fd30b 100644
--- a/en-US/Book_Info.xml
+++ b/en-US/Book_Info.xml
@@ -7,7 +7,7 @@
   <productname>Red Hat Enterprise Linux</productname>
   <productnumber>6</productnumber>
   <edition>1</edition>
-  <pubsnumber>83</pubsnumber>
+  <pubsnumber>84</pubsnumber>
   <abstract>
     <para>The <citetitle>Deployment Guide</citetitle> documents relevant information regarding the deployment, configuration and administration of &MAJOROSVER;.</para>
   </abstract>
diff --git a/en-US/OpenLDAP.xml b/en-US/OpenLDAP.xml
index ac882a6..457b65c 100644
--- a/en-US/OpenLDAP.xml
+++ b/en-US/OpenLDAP.xml
@@ -26,7 +26,7 @@
     Like X.500, LDAP organizes information in a hierarchal manner using directories. These directories can store a variety of information such as names, addresses, or phone numbers, and can even be used in a manner similar to the <firstterm>Network Information Service</firstterm> (<acronym>NIS</acronym>), enabling anyone to access their account from any machine on the LDAP enabled network.
   </para>
   <para>
-    LDAP is commonly used for centrally managed users and groups, user authentication, or system configuration. It can also serve as a virtual phone directory, allowing users to easily access contact information for other users. Additionally, it can refer a user to another LDAP servers throughout the world, and thus provide an ad-hoc global repository of information. However, it is most frequently used within individual organizations such as universities, government departments, and private companies.
+    LDAP is commonly used for centrally managed users and groups, user authentication, or system configuration. It can also serve as a virtual phone directory, allowing users to easily access contact information for other users. Additionally, it can refer a user to other LDAP servers throughout the world, and thus provide an ad-hoc global repository of information. However, it is most frequently used within individual organizations such as universities, government departments, and private companies.
   </para>
   <para>
     This section covers the installation and configuration of <application>OpenLDAP 2.4</application>, an open source implementation of the LDAPv2 and LDAPv3 protocols.
@@ -626,8 +626,13 @@ Stopping slapd:                                            [  OK  ]</screen>
         <secondary>configuration</secondary>
         <tertiary>global</tertiary>
       </indexterm>
+      <indexterm>
+        <primary>OpenLDAP</primary>
+        <secondary>files</secondary>
+        <tertiary><filename>/etc/openldap/slapd.d/cn=config.ldif</filename></tertiary>
+      </indexterm>
       <para>
-        The following directives are commonly used in the global configuration of the LDAP server:
+        Global configuration options for the LDAP server are stored in the <filename>/etc/openldap/slapd.d/cn=config.ldif</filename> file. The following directives are commonly used:
       </para>
       <variablelist>
         <varlistentry>
@@ -925,14 +930,6 @@ Stopping slapd:                                            [  OK  ]</screen>
           </listitem>
         </varlistentry>
       </variablelist>
-      <indexterm>
-        <primary>OpenLDAP</primary>
-        <secondary>files</secondary>
-        <tertiary><filename>/etc/openldap/slapd.d/cn=config.ldif</filename></tertiary>
-      </indexterm>
-      <para>
-        The global configuration options for the LDAP server are stored in the <filename>/etc/openldap/slapd.d/cn=config.ldif</filename> file.
-      </para>
     </section>
     <section id="s3-ldap-configuration-database">
       <title>Changing the Database-Specific Configuration</title>
@@ -941,8 +938,13 @@ Stopping slapd:                                            [  OK  ]</screen>
         <secondary>configuration</secondary>
         <tertiary>database</tertiary>
       </indexterm>
+      <indexterm>
+        <primary>OpenLDAP</primary>
+        <secondary>files</secondary>
+        <tertiary><filename>/etc/openldap/slapd.d/cn=config/olcDatabase={1}bdb.ldif</filename></tertiary>
+      </indexterm>
       <para>
-        The following directives are commonly used in a database-specific configuration:
+        By default, the OpenLDAP server uses Berkeley DB (BDB) as a database back end. The configuration for this database is stored in the <filename>/etc/openldap/slapd.d/cn=config/olcDatabase={1}bdb.ldif</filename> file. The following directives are commonly used in a database-specific configuration:
       </para>
       <variablelist>
         <varlistentry>
@@ -1042,14 +1044,6 @@ Re-enter new password:
           </listitem>
         </varlistentry>
       </variablelist>
-      <indexterm>
-        <primary>OpenLDAP</primary>
-        <secondary>files</secondary>
-        <tertiary><filename>/etc/openldap/slapd.d/cn=config/olcDatabase={1}bdb.ldif</filename></tertiary>
-      </indexterm>
-      <para>
-        By default, the OpenLDAP server uses Berkeley DB (BDB) as a database back end. The configuration for this database is stored in the <filename>/etc/openldap/slapd.d/cn=config/olcDatabase={1}bdb.ldif</filename> file.
-      </para>
     </section>
     <section id="s3-ldap-configuration-schema">
       <title>Extending Schema</title>
@@ -1163,7 +1157,7 @@ slapd (pid  3672) is running...</screen>
       </para>
       <screen>~]# <command>yum install migrationtools</command></screen>
       <para>
-        This will install the scripts to the <filename class="directory">/usr/share/migrationtools/</filename> directory. Once installed, open the <filename>/usr/share/migrationtools/migrate_common.ph</filename> file in the text editor such as <application>vi</application> or <application>nano</application>, and change the following lines to reflect the correct domain, for example:
+        This will install the scripts to the <filename class="directory">/usr/share/migrationtools/</filename> directory. Once installed, edit the <filename>/usr/share/migrationtools/migrate_common.ph</filename> file and change the following lines to reflect the correct domain, for example:
       </para>
       <screen># Default DNS domain
 $DEFAULT_MAIL_DOMAIN = "example.com";


More information about the docs-commits mailing list