diff --git a/Doc/Sdi/ldap.xml b/Doc/Sdi/ldap.xml
index eb408cdb8a85a3f9e179a4c97702cefd4738d70f..8da0a6e232ff9d69ae5c0de7f7e93b82450b1297 100644
--- a/Doc/Sdi/ldap.xml
+++ b/Doc/Sdi/ldap.xml
@@ -457,7 +457,8 @@ userPassword:: e3NtZDV9YVhKL2JlVkF2TDRENk9pMFRLcDhjM3ovYTZQZzBXeHA=</programlist
     </section>
 
     <section xml:id="ldapTest">
-      <title>Accessing <acronym>LDAP</acronym> data by a mail client</title>
+      <title>Accessing <xref linkend="glo_LDAP"/> data by a mail
+      client</title>
 
       <para>The directory studio allows to reread the directory tree. As a
       different approach you shall configure your local mail client (e.g.
@@ -599,7 +600,7 @@ modifying entry "olcDatabase={0}config,cn=config"</programlisting>
         <para>Thus creating a separate <filename>ldap.log</filename> file
         requires <link
         xlink:href="http://www.tldp.org/HOWTO/LDAP-HOWTO/logs.html">configuring
-        your system's syslog daemon appropriately</link>. </para>
+        your system's syslog daemon appropriately</link>.</para>
       </caution>
     </section>
 
diff --git a/Doc/Sdi/samba.xml b/Doc/Sdi/samba.xml
index 038104d25960cbad00e83a51d2cf2fc983221aaa..ffed09067dd28aee1bd00bcfaa86f2546ddf76ce 100644
--- a/Doc/Sdi/samba.xml
+++ b/Doc/Sdi/samba.xml
@@ -107,6 +107,22 @@ Filesystem                            1K-blocks   Used Available Use% Mounted on
 
         <tip>
           <itemizedlist>
+            <listitem>
+              <para>Before you start make sure your OS does have <xref
+              linkend="glo_LDAP"/> user support. Choose a user e.g.
+              <quote>ldaptest</quote> which exists on your <xref
+              linkend="glo_LDAP"/> server but not as a local user provided by
+              <filename>/etc/passwd</filename>. The following should
+              work:</para>
+
+              <programlisting language="none">$ id ldaptest
+uid=1001(ldaptest) gid=1001(ldaptest) groups=1001(ldaptest)</programlisting>
+
+              <para>A <quote>id: ‘ldaptest’: no such user</quote> message
+              indicates your <xref linkend="glo_LDAP"/> setup does not yet
+              work.</para>
+            </listitem>
+
             <listitem xml:id="sdiHintBugMissingSmbldapPackage">
               <para>As being mentioned in <uri
               xlink:href="https://bugs.launchpad.net/ubuntu/+source/smbldap-tools/+bug/997172">https://bugs.launchpad.net/ubuntu/+source/smbldap-tools/+bug/997172</uri>