Merge branch 'mdb.master' of ssh://git-master.openldap.org/~git/git/openldap

[openldap] / doc / guide / release / license.sdf

diff --git a/doc/guide/release/license.sdf b/doc/guide/release/license.sdf
index f5bab5c30d378948aada6d471e3b3891872d439c..36113a566974003d1896dc38bec4fbe2124a2c5e 100644 (file)
--- a/doc/guide/release/license.sdf
+++ b/doc/guide/release/license.sdf
@@ -1,61 +1,15 @@
 # $OpenLDAP$
-# Copyright 1999-2000, The OpenLDAP Foundation, All Rights Reserved.
+# Copyright 2000-2011 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: OpenLDAP Public License
 
-H1: The OpenLDAP Public License
-.Version 2.2.1, 1 March 2000
+#!block inline
+#<FONT FACE="Courier">
+#!endblock
 
-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
 
+#!block inline
+#</FONT>
+#!endblock