Fix up a SASL terms and links

diff --git a/doc/guide/admin/install.sdf b/doc/guide/admin/install.sdf
index 3cfd771ec462d4cce0ede3579a355d0ae40810a3..7c97d2a872ebbe3c397219d70b2eefc01019fabd 100644 (file)
--- a/doc/guide/admin/install.sdf
+++ b/doc/guide/admin/install.sdf
@@ -72,13 +72,14 @@ Kerberos, is highly recommended.
 
 H3: {{TERM[expand]SASL}}
 
-OpenLDAP clients and servers require installation of {{PRD:Cyrus}}
-SASL libraries to provide {{TERM[expand]SASL}} services.  Though
+OpenLDAP clients and servers require installation of {{PRD:Cyrus}}'s
+{{PRD:SASL}} libraries to provide {{TERM[expand]SASL}} services.  Though
 some operating systems may provide this library as part of the
 base system or as an optional software component, Cyrus SASL
 often requires separate installation.
 
-Cyrus SASL is available from {{URL:http://asg.cmu.edu/cyrus/sasl/}}.
+Cyrus SASL is available from
+{{URL:http://asg.web.cmu.edu/sasl/sasl-library.html}}.
 Cyrus SASL will make use of OpenSSL and Kerberos/GSSAPI libraries
 if preinstalled.
 

diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf
index c216f5646e94304c22d7ce07114b260ba31925e8..ce8b021d96165f10c8fb2a5f4a1718536f49a799 100644 (file)
--- a/doc/guide/admin/intro.sdf
+++ b/doc/guide/admin/intro.sdf
@@ -157,8 +157,9 @@ clients.  {{slapd}} supports both IPv4 and IPv6 protocols.
 
 {{B:{{TERM[expand]SASL}}}}: {{slapd}} supports
 strong authentication services through the use of SASL.  {{slapd}}'s
-SASL implementation utilizes {{PRD:Cyrus}} software which supports
-a number of mechanisms including DIGEST-MD5, EXTERNAL, and GSSAPI.
+SASL implementation utilizes {{PRD:Cyrus}} {{PRD:SASL}} software
+which supports a number of mechanisms including
+DIGEST-MD5, EXTERNAL, and GSSAPI.
 
 {{B:{{TERM[expand]TLS}}}}: {{slapd}} provides privacy and 
 integrity protections through the use of TLS (or SSL).  {{slapd}}'s

diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf
index 739475bbb8d2e89f82feef9f3f1121b6e52b9ca5..9f3151a0db4c4d944cd422e6ffd3c8223412c980 100644 (file)
--- a/doc/guide/admin/slapdconfig.sdf
+++ b/doc/guide/admin/slapdconfig.sdf
@@ -290,7 +290,7 @@ given. Kerberos authentication requires a valid srvtab file.
 The {{EX:credentials=}} parameter, which is only required if using
 simple authentication, gives the password for {{EX:binddn}} on the
 slave slapd.  Simple authentication is deprecated in favor of
-SASL based authentication services.
+{{TERM:SASL}} based authentication services.
 
 The {{EX:srvtab=}} parameter is deprecated in favor of SASL
 based authentication services.

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 41b57ef2b574ac508e058a3eb7e29ceba4f6ca07..a4a85e312a25bab862dd437f2c021c3b62207ad4 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -44,7 +44,7 @@ ISO    International Standards Organisation   http://www.iso.org/
 ITU     International Telephone Union          http://www.itu.int/
 RFC     RFC Editor                             http://www.rfc-editor.org/
 OpenSSL  OpenSSL                               http://www.openssl.org/
-Cyrus   Cyrus                                  http://asg.cmu.edu/cyrus/
+Cyrus   Cyrus                                  http://asg.web.cmu.edu/cyrus/
 Sleepy  Sleepycat Software                     http://www.sleepycat.com/
 FSF     Free Software Foundation               http://www.fsf.org/
 GNU     Gnu Not Unix                           http://www.gnu.org/
@@ -54,7 +54,7 @@ GNU    Gnu Not Unix                           http://www.gnu.org/
 Name           Jump
 BerkeleyDB     http://www.sleepycat.com/
 CVS            http://www.cyclic.com/
-Cyrus          http://asg.cmu.edu/cyrus/sasl/
+Cyrus          http://asg.web.cmu.edu/cyrus/
 GNU            http://www.gnu.org/software/
 GDBM           http://www.gnu.org/software/gdbm/
 Heimdal                http://www.pdc.kth.se/heimdal/
@@ -62,6 +62,7 @@ MIT Kerberos  http://web.mit.edu/kerberos/www/
 OpenLDAP       http://www.openldap.org/software/
 OpenSSL                http://www.openssl.org/
 Perl           http://www.perl.com/
+SASL           http://asg.web.cmu.edu/sasl/
 SQL            http://www.sql.com/
 TCL            http://www.tcl.com/
 !endblock
@@ -92,7 +93,7 @@ IPSEC Internet Protocol Security
 ITS    Issue Tracking System
 LBER   Lightweight BER
 LDAP   Lightweight Directory Access Protocol
-LDIF   LDAP Directory Interchange Format
+LDIF   LDAP Data Interchange Format
 LDBM   LDAP Database Manager
 OID    Object Identifier
 OSI    OSI