commit f396105a6bec9e38e2cb338fdcfe5784592a61b4
Author: Stephen Wadeley <swadeley(a)redhat.com>
Date: Sat Feb 28 09:52:03 2015 +0100
More style & markup improvements to OpenLDAP
en-US/OpenLDAP.xml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/en-US/OpenLDAP.xml b/en-US/OpenLDAP.xml
index 364c5fd..e4159cc 100644
--- a/en-US/OpenLDAP.xml
+++ b/en-US/OpenLDAP.xml
@@ -1102,13 +1102,14 @@ Re-enter new password:
<secondary>stopping</secondary>
</indexterm>
<para>
- To stop the running <systemitem class="service">slapd</systemitem> service, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
+ To stop the running <systemitem class="service">slapd</systemitem> service in the current session, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
</para>
- <screen><command>systemctl stop slapd.service</command></screen>
+ <screen>~]# <command>systemctl stop slapd.service</command></screen>
<para>
- To prevent the service from starting automatically at the boot time, type:
+ To prevent the service from starting automatically at the boot time, type as <systemitem class="username">root</systemitem>:
</para>
- <screen><command>systemctl disable slapd.service</command></screen>
+ <screen>~]# <command>systemctl disable slapd.service</command>
+rm '/etc/systemd/system/multi-user.target.wants/slapd.service'</screen>
<para>
See <xref linkend="ch-Services_and_Daemons" /> for more information on how to configure services in &MAJOROS;.
</para>
@@ -1122,21 +1123,22 @@ Re-enter new password:
<para>
To restart the running <systemitem class="service">slapd</systemitem> service, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
</para>
- <screen><command>systemctl restart slapd.service</command></screen>
+ <screen>~]# <command>systemctl restart slapd.service</command></screen>
<para>
- This stops the service, and then starts it again. Use this command to reload the configuration.
+ This stops the service and immediately starts it again. Use this command to reload the configuration.
</para>
</section>
<section id="s3-ldap-running-status">
- <title>Checking the Service Status</title>
+ <title>Verifying the Service Status</title>
<indexterm>
<primary>OpenLDAP</primary>
<secondary>checking status</secondary>
</indexterm>
<para>
- To check whether the service is running, type the following at a shell prompt:
+ To verify that the <systemitem class="service">slapd</systemitem> service is running, type the following at a shell prompt:
</para>
- <screen><command>systemctl is-active slapd.service</command></screen>
+ <screen>~]$ <command>systemctl is-active slapd.service</command>
+active</screen>
</section>
</section>
<section id="s2-ldap-pam">
@@ -1144,7 +1146,7 @@ Re-enter new password:
<para>
In order to configure a system to authenticate using OpenLDAP, make sure that the appropriate packages are installed on both LDAP server and client machines. For information on how to set up the server, follow the instructions in <xref linkend="s2-ldap-installation" /> and <xref linkend="s2-ldap-configuration" />. On a client, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
</para>
- <screen><command>yum install openldap openldap-clients nss-pam-ldapd</command></screen>
+ <screen>~]# <command>yum install openldap openldap-clients nss-pam-ldapd</command></screen>
<section id="s3-ldap-migrationtools">
<title>Migrating Old Authentication Information to LDAP Format</title>
@@ -1155,7 +1157,7 @@ Re-enter new password:
<para>
The <package>migrationtools</package> package provides a set of shell and Perl scripts to help you migrate authentication information into an LDAP format. To install this package, type the following at a shell prompt as <systemitem class="username">root</systemitem>:
</para>
- <screen><command>yum install migrationtools</command></screen>
+ <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, edit the <filename>/usr/share/migrationtools/migrate_common.ph</filename> file and change the following lines to reflect the correct domain, for example:
</para>
@@ -1167,10 +1169,10 @@ $DEFAULT_BASE = "dc=example,dc=com";</programlisting>
<para>
Alternatively, you can specify the environment variables directly on the command line. For example, to run the <filename>migrate_all_online.sh</filename> script with the default base set to <literal>dc=example,dc=com</literal>, type:
</para>
- <screen><command>export DEFAULT_BASE="dc=example,dc=com" \</command>
+ <screen>~]# <command>export DEFAULT_BASE="dc=example,dc=com" \</command>
<command>/usr/share/migrationtools/migrate_all_online.sh</command></screen>
<para>
- To decide which script to run in order to migrate the user database, refer to <xref linkend="table-ldap-migrationtools"/>.
+ To decide which script to run in order to migrate the user database, see <xref linkend="table-ldap-migrationtools"/>.
</para>
<table id="table-ldap-migrationtools">
<title>Commonly used LDAP migration scripts</title>
@@ -1262,7 +1264,7 @@ $DEFAULT_BASE = "dc=example,dc=com";</programlisting>
</tgroup>
</table>
<para>
- For more information on how to use these scripts, refer to the <filename>README</filename> and the <filename>migration-tools.txt</filename> files in the <filename>/usr/share/doc/migrationtools/</filename> directory.
+ For more information on how to use these scripts, see the <filename>README</filename> and the <filename>migration-tools.txt</filename> files in the <filename>/usr/share/doc/migrationtools/</filename> directory.
</para>
</section>
</section>