X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=web%2Fdoc-general.wml;h=697847b8019b5ae0dda66c244aa15716f77bb2d2;hb=701528fc8153f150dae52787cca172d8ab4f4bfb;hp=50962bd3b1930ab742b1afaca4570d2547162597;hpb=fb6e12faf7e0f8dde1e42b0904a019c30bd68779;p=mirror%2Fuserdir-ldap.git

diff --git a/web/doc-general.wml b/web/doc-general.wml
index 50962bd..697847b 100644
--- a/web/doc-general.wml
+++ b/web/doc-general.wml
@@ -1,26 +1,26 @@
 #use wml::debian::template title="General LDAP Documentation"
 <p>
-debian.org uses a single LDAP driven directory for account managment across
+debian.org uses a single LDAP driven directory for account management across
 all the project run <a href="/machines.cgi">machines</a>. This directory
-also provides services for leaving vacation notices, updating 
+also provides services for leaving vacation notices, updating
 <a href="http://www.debian.org/devel/developers.loc">xplanet</a> coordinates,
 email forwarding, ssh authentication keys and other information.
 
 <p>
-Note: master and va do not presently use the LDAP directory. Only lully
-uses replicated SSH RSA authentication keys and master does not use the
-email forwarding field (but all other machines do)
+Note: the 'passwd' program and 'chfn' do not work with LDAP information.
+Please use the web page or email gateway for the time being. All machines 
+running OpenSSH are using replicated SSH RSA authentication keys.
 
 <h1>Security and Privacy</h1>
 Three levels of information security are provided by the database. The first
 is completely public information that anyone can see either by issuing an
-LDAP query or by visiting the web site. The next level is "maintainer-only"
+LDAP query or by visiting the web site. The next level is "developer-only"
 information that requires authentication to the directory before it can be
 accessed. The final level is admin-only or user-only information; this
 information can only be viewed by the user or an administrator. 
 
 <p>
-Maintainer-only information includes precise location information
+developer-only information includes precise location information
 [postalcode, postal address, lat/long] telephone numbers, and the vacation
 message.
 
@@ -36,7 +36,7 @@ key can make any change to the directory through the mail interface.
 <h1>Access</h1>
 The directory has several means to access it:
 <ul>
-<li><a href="https://db.debian.org/login.cgi">SSL Web Forms</a>
+<li><a href="https://db.debian.org/login.html">SSL Web Forms</a>
 <li>Finger gateway, <tt>finger foo@debian.org</tt>
 <li><a href="doc-mail.html">Mail gateway</a>
 <li><a href="doc-direct.html">Direct LDAP Access</a>