From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 4 Oct 2002 19:08:10 +0000 (+0000)
Subject: Misc. cleanup
X-Git-Tag: NO_SLAP_OP_BLOCKS~928
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c46e00a34ca01175cb1e4ef8f0001ac3cd33b183;p=openldap

Misc. cleanup
---

diff --git a/doc/guide/admin/preface.sdf b/doc/guide/admin/preface.sdf
index a61ce6fe80..bfd3539346 100644
--- 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 632871aac4..e4848a6a1d 100644
--- 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 9e6ec6c124..d755491ee5 100644
--- 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 b930b09c34..21f212d2bb 100644
--- 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">