Misc. cleanup

diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index a61ce6fe80b5138102816aabf1f4687214cf9e11..bfd35393466c83d8d2ba29ad627a76abb104abcb 100644 (file)
--- a/doc/guide/admin/preface.sdf
+++ b/doc/guide/admin/preface.sdf
@@ -13,6 +13,12 @@ Copyright 1998-2002, The {{ORG[expand]OLF}}, {{All Rights Reserved}}.
 
 Copyright 1992-1996, Regents of the {{ORG[expand]UM}}, {{All Rights Reserved}}.
 
+This document is considered a part of OpenLDAP Software.  This
+document is subject to terms of conditions set forth in {{SECT:OpenLDAP
+Software Copyright Notices}} and the {{SECT:OpenLDAP Public License}}.
+Complete copies of the notices and associated license can be found
+in Appendix B and C, respectively.
+
 
 P2[notoc] Scope of this Document
 

diff --git a/doc/guide/admin/security.sdf b/doc/guide/admin/security.sdf
index 632871aac4be6273a4bff9e959d660bf614c1d78..e4848a6a1def9acbe73108cff388c26764df8010 100644 (file)
--- a/doc/guide/admin/security.sdf
+++ b/doc/guide/admin/security.sdf
@@ -145,9 +145,9 @@ used only in tightly controlled systems or when the LDAP session
 is protected by other means (e.g., TLS, {{TERM:IPSEC}}).  Where the
 administrator relies on TLS to protect the password, it is recommended
 that unprotected authentication be disabled.  This is done by setting
-"{{EX:disallow bind_simple_unprotected}} in {{slapd.conf}}(5).   The
-user/password authenticated bind mechanism can be completely disabled
-by setting "{{EX:disallow bind_simple}}".
+"{{EX:disallow bind_simple_unprotected}}" in {{slapd.conf}}(5).
+The user/password authenticated bind mechanism can be completely
+disabled by setting "{{EX:disallow bind_simple}}".
 
 Note:  An unsuccessful bind always results in the session having
 an {{anonymous}} authorization state.

diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf
index 9e6ec6c124ad4a243442c3a76baa09e644100ad2..d755491ee5d8aab68ba7136a525464b8b7e511a5 100644 (file)
--- a/doc/guide/release/copyright.sdf
+++ b/doc/guide/release/copyright.sdf
@@ -12,11 +12,11 @@ H1: OpenLDAP Software Copyright Notices
 
 H2: OpenLDAP Copyright Notice
 
-[[copyright]] 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+[[copyright]] 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
 All rights reserved.
 
 Redistribution and use in source and binary forms are permitted
-{{only as authorized}} by the OpenLDAP Public License.  A copy of
+{{only as authorized}} by the {{SECT:OpenLDAP Public License}}.  A copy of
 this license is available at {{URL:http://www.OpenLDAP.org/license.html}}
 or in file {{F:LICENSE}} in the top-level directory of the
 distribution.

diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf
index b930b09c34f3d00a5b92b439bb752d74b131631f..21f212d2bb9e295d47a0693920b342f80fa62924 100644 (file)
--- a/doc/guide/release/license.sdf
+++ b/doc/guide/release/license.sdf
@@ -2,7 +2,7 @@
 # Copyright 2000-2001, The OpenLDAP Foundation, All Rights Reserved.
 # COPYING RESTRICTIONS APPLY, see COPYRIGHT.
 
-H1: The OpenLDAP Public License
+H1: OpenLDAP Public License
 
 #!block inline
 #<FONT FACE="Courier">