Revert

diff --git a/doc/guide/COPYRIGHT b/doc/guide/COPYRIGHT
index 3dbe303979014d7221f95bd0ff6b9c7fcd200782..e628d6b59dfa199bf22349f85aedcbb38cf3e861 100644 (file)
--- a/doc/guide/COPYRIGHT
+++ b/doc/guide/COPYRIGHT
@@ -5,9 +5,7 @@ Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
 Public License.  A copy of this license is available at
 http://www.OpenLDAP.org/license.html or in file LICENSE in the
-top-level directory of the distribution.  The name of the OpenLDAP
-Foundation may not be used to endorse or promote products derived
-from this work.
+top-level directory of the distribution.
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 

diff --git a/doc/guide/admin/master.sdf b/doc/guide/admin/master.sdf
index c7a54b008a4219b78967a194b5df5d3e93d57ac3..1214bbe8ad9f876e270ab360190360d292e42eb4 100644 (file)
--- a/doc/guide/admin/master.sdf
+++ b/doc/guide/admin/master.sdf
@@ -33,8 +33,8 @@ PB:
 !include "config.sdf"; chapter
 PB:
 
-!include "security.sdf"; chapter
-PB:
+# !include "security.sdf"; chapter
+# PB:
 
 !include "install.sdf"; chapter
 PB:

diff --git a/doc/guide/preamble.sdf b/doc/guide/preamble.sdf
index 4f2d253939e81ca6402e35705fba4ada89e6719c..cdbab0bf5bab2120c6fb39581e7ce14d7ec56909 100644 (file)
--- a/doc/guide/preamble.sdf
+++ b/doc/guide/preamble.sdf
@@ -113,7 +113,7 @@ ISO|International Organization for Standardization|http://www.iso.ch/
 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.web.cmu.edu/cyrus/
+Cyrus|Cyrus Electronic Mail Project|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/
@@ -131,7 +131,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/
+SASL|http://asg.web.cmu.edu/sasl/sasl-library.html
 SQL|http://www.jcc.com/SQLPages/jccs_sql.htm
 TCL|http://tcl.activestate.com/
 !endblock