Merge branch 'fordsa' of https://git.adam-barratt.org.uk/git/mirror/userdir-ldap-cgi

[mirror/userdir-ldap-cgi.git] / html / doc-direct.wml

diff --git a/html/doc-direct.wml b/html/doc-direct.wml
index da7912a..d8fa039 100644 (file)
--- a/html/doc-direct.wml
+++ b/html/doc-direct.wml
@@ -17,12 +17,12 @@ The LDAP utilities package (<a href="https://packages.debian.org/ldap-utils">\
 ldap-utils</a>) provides an utility called ldapsearch that can be used
 to execute direct queries to the database. This is done by supplying
 the following arguments to ldapsearch: <strong>-x -H
-ldap://db.debian.org -b dc=debian,dc=org</strong>. Alternatively, the
+ldaps://db.debian.org -b dc=debian,dc=org</strong>. Alternatively, the
 <strong>-H</strong> and <strong>-b</strong> options can be put in
 one's ~/.ldaprc, in the following form:
 </p><pre>
 [ dbharris@people: ~/ ]$ cat ~/.ldaprc
-HOST db.debian.org
+URI ldaps://db.debian.org
 BASE dc=debian,dc=org
 </pre>
 
@@ -47,7 +47,7 @@ return. If you only specify the query, but don't provide any attributes to
 return, all readable attributes are returned. While the example was quite
 simple, complex queries can be performed as well:
 </p><pre>
-[ dbharris@people: ~/ ]$ ldapsearch -x -H ldap://db.debian.org -b dc=debian,dc=org '(&amp;(!(loginshell=/bin/bash))(uid=*))' loginshell
+[ dbharris@people: ~/ ]$ ldapsearch -x -H ldaps://db.debian.org -b dc=debian,dc=org '(&amp;(!(loginshell=/bin/bash))(uid=*))' loginshell
 </pre>
 
 <p>
@@ -58,7 +58,7 @@ interesting queries are:</p>
 <tt>(&amp;(keyfingerprint=*)(supplementaryGid=Debian))</tt></li>
 <li>Show people in a certain group <tt>gidmembership=adm</tt></li>
 <li>People named james <tt>cn=james</tt></li>
-<li>Someone whos last name phonetically sounds like 'Ackerma'
+<li>Someone whose last name phonetically sounds like 'Ackerma'
 <tt>sn~=ackerm</tt></li>
 <li>All the sparcs <tt>host=sparc</tt></li>
 </ul>