From: Kurt Zeilenga Date: Fri, 28 Jul 2000 21:07:43 +0000 (+0000) Subject: Use verbatim license X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2319 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fd3171ff92b0559f32928977a12876fa77d46014;p=openldap Use verbatim license --- diff --git a/doc/guide/release/license-plain.sdf b/doc/guide/release/license-plain.sdf deleted file mode 100644 index 58d46d87fe..0000000000 --- a/doc/guide/release/license-plain.sdf +++ /dev/null @@ -1,10 +0,0 @@ -# $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. -# COPYING RESTRICTIONS APPLY, see COPYRIGHT. - -# -# Plain License for Software Distribution -# -!define HTML_TITLE "OpenLDAP Public License" -!include "../plain.sdf" -!include "license.sdf"; plain diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf index f5bab5c30d..9737e61eef 100644 --- a/doc/guide/release/license.sdf +++ b/doc/guide/release/license.sdf @@ -1,61 +1,6 @@ # $OpenLDAP$ -# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved. +# Copyright 2000, The OpenLDAP Foundation, All Rights Reserved. # COPYING RESTRICTIONS APPLY, see COPYRIGHT. -!if OPT_PP_HTML -!define copyright '[[c]] Copyright' -!else -!define copyright 'Copyright' -!endif - H1: The OpenLDAP Public License -.Version 2.2.1, 1 March 2000 - -Redistribution and use of this software and associated documentation -("Software"), with or without modification, are permitted provided -that the following conditions are met: - -^ Redistributions of source code must retain copyright statements -and notices. Redistributions must also contain a copy of this -document. - -+ Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in -the documentation and/or other materials provided with the -distribution. - -+ The name "OpenLDAP" must not be used to endorse or promote -products derived from this Software without prior written permission -of the OpenLDAP Foundation. - -+ Products derived from this Software may not be called "OpenLDAP" -nor may "OpenLDAP" appear in their names without prior written -permission of the OpenLDAP Foundation. - -+ Due credit should be given to the OpenLDAP Project -({{URL:http://www.openldap.org/}}). - -+ The OpenLDAP Foundation may revise this license from time to -time. Each revision is distinguished by a version number. You -may use the Software under terms of this license revision or under -the terms of any subsequent revision of the license. - -THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT -NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -THE OPENLDAP FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -OpenLDAP is a trademark of the OpenLDAP Foundation. - -Copyright 1999-2000 The OpenLDAP Foundation, Redwood City, -California, USA. All Rights Reserved. Permission to copy and -distributed verbatim copies of this document is granted. - +!include "../LICENSE" ; verbatim