From 3109bc5137e98c010787ed070efab536b96bc8b3 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 7 Nov 2018 16:15:30 +0100
Subject: [PATCH] Changing section sequence, uid=bean consistency

---
 Doc/Sdi/ldap.xml | 108 +++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/Doc/Sdi/ldap.xml b/Doc/Sdi/ldap.xml
index 563625541..ae9716190 100644
--- a/Doc/Sdi/ldap.xml
+++ b/Doc/Sdi/ldap.xml
@@ -423,7 +423,7 @@ objectClass: top
 objectClass: organizationalUnit
 ou: testing
 
-dn: uid=smith,ou=devel,ou=software,ou=departments,dc=betrayer,dc=com
+dn: uid=bean,ou=devel,ou=software,ou=departments,dc=betrayer,dc=com
 objectClass: top
 objectClass: person
 objectClass: organizationalPerson
@@ -443,7 +443,7 @@ userPassword:: e3NtZDV9YVhKL2JlVkF2TDRENk9pMFRLcDhjM3ovYTZQZzBXeHA=</programlist
       xlink:href="https://directory.apache.org/studio">Apache Directory
       Studio</productname> to supply a <property>userPassword</property> to
       e.g.
-      <code>uid=beam,ou=devel,ou=software,ou=departments,dc=betrayer;dc=com</code>
+      <code>uid=bean,ou=devel,ou=software,ou=departments,dc=betrayer;dc=com</code>
       (still binding as <code>cn=admin,dc=betrayer,dc=com</code>).</para>
 
       <para>Then configure a second <productname
@@ -574,7 +574,7 @@ modifying entry "olcDatabase={0}config,cn=config"</screen>
       tab. Then configure "cn=config" in the <quote>Base DN:</quote>
       manually.</para>
 
-      <para>We may now dynamically alter server configuration parameters
+      <para>We may now dynamically alter ourserver configuration parameters
       remotely using e.g. <link
       xlink:href="https://directory.apache.org/studio">Apache directory
       studio</link>:</para>
@@ -629,13 +629,63 @@ modifying entry "olcDatabase={0}config,cn=config"</screen>
       <title>Extending an existing entry</title>
 
       <para>The entry
-      <code>uid=beam,ou=devel,ou=software,ou=departments,dc=betrayer;dc=com</code>
+      <code>uid=bean,ou=devel,ou=software,ou=departments,dc=betrayer;dc=com</code>
       may be extended by the <code>objectclass</code>
       <code>posixAccount</code>. Construct a <acronym>LDIF</acronym> file to
       add the attributes <code>uidNumber</code>, <code>gidNumber</code> and
       <code>homeDirectory</code> by a modify/add operation.</para>
     </section>
 
+    <section xml:id="sdiSectLdapOsSupport">
+      <title><xref linkend="glo_LDAP"/> based user login</title>
+
+      <para>Configure your second VM (the one without <xref
+      linkend="glo_LDAP"/> Server) to allow for user login purely based on
+      <xref linkend="glo_LDAP"/>.</para>
+
+      <itemizedlist>
+        <listitem>
+          <para>Activation of OS level <xref linkend="glo_LDAP"/> user and
+          group support is being outlined in <link
+          xlink:href="https://wiki.debian.org/LDAP/PAM">Configuring LDAP
+          Authentication</link>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Follow the »newer« <link
+          xlink:href="https://wiki.debian.org/LDAP/PAM#PAM_Setup_with_libpam-ldapd">PAM
+          Setup with libpam-ldapd approach</link> rather than using the older
+          <package>libpam-ldap</package> package.</para>
+        </listitem>
+
+        <listitem>
+          <para>First step will allow for viewing user meta data on the client
+          side:</para>
+
+          <screen>$ id ldaptest
+uid=1001(ldaptest) gid=1001(ldaptest) groups=1001(ldaptest)</screen>
+
+          <para>A <quote>id: ‘ldaptest’: no such user</quote> message
+          indicates your <xref linkend="glo_LDAP"/> setup does not yet
+          work.</para>
+        </listitem>
+
+        <listitem>
+          <para>Create the required user home directory manually and change
+          owner and group accordingly.</para>
+        </listitem>
+      </itemizedlist>
+
+      <tip>
+        <para><xref linkend="glo_LDAP"/> user information
+        (<property>uid</property>, common name, numerical id, group
+        information ...) will reside on your <xref linkend="glo_LDAP"/> Server
+        rather than locally in <filename>/etc/passwd</filename>,
+        <filename>/etc/group</filename> and
+        <filename>/etc/shadow</filename>.</para>
+      </tip>
+    </section>
+
     <section xml:id="diSectLdapBackupRestore">
       <title>Backup and recovery / restore</title>
 
@@ -721,56 +771,6 @@ olcModulePath: /usr/lib/ldap</programlisting>
       </note>
     </section>
 
-    <section xml:id="sdiSectLdapOsSupport">
-      <title><xref linkend="glo_LDAP"/> based user login</title>
-
-      <para>Configure your second VM (the one without <xref
-      linkend="glo_LDAP"/> Server) to allow for user login purely based on
-      <xref linkend="glo_LDAP"/>.</para>
-
-      <itemizedlist>
-        <listitem>
-          <para>Activation of OS level <xref linkend="glo_LDAP"/> user and
-          group support is being outlined in <link
-          xlink:href="https://wiki.debian.org/LDAP/PAM">Configuring LDAP
-          Authentication</link>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Follow the »newer« <link
-          xlink:href="https://wiki.debian.org/LDAP/PAM#PAM_Setup_with_libpam-ldapd">PAM
-          Setup with libpam-ldapd approach</link> rather than using the older
-          <package>libpam-ldap</package> package.</para>
-        </listitem>
-
-        <listitem>
-          <para>First step will allow for viewing user meta data on the client
-          side:</para>
-
-          <screen>$ id ldaptest
-uid=1001(ldaptest) gid=1001(ldaptest) groups=1001(ldaptest)</screen>
-
-          <para>A <quote>id: ‘ldaptest’: no such user</quote> message
-          indicates your <xref linkend="glo_LDAP"/> setup does not yet
-          work.</para>
-        </listitem>
-
-        <listitem>
-          <para>Create the required user home directory manually and change
-          owner and group accordingly.</para>
-        </listitem>
-      </itemizedlist>
-
-      <tip>
-        <para><xref linkend="glo_LDAP"/> user information
-        (<property>uid</property>, common name, numerical id, group
-        information ...) will reside on your <xref linkend="glo_LDAP"/> Server
-        rather than locally in <filename>/etc/passwd</filename>,
-        <filename>/etc/group</filename> and <filename>/etc/shadow</filename>.
-        </para>
-      </tip>
-    </section>
-
     <section xml:id="sdiSectLdapByJava">
       <title>Accessing <xref linkend="glo_LDAP"/> by a <xref
       linkend="glo_Java"/> application.</title>
-- 
GitLab