From 5f2d317ec991842f94a50c0b0c5397369df6362b Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 24 Nov 2003 20:33:28 +0000 Subject: [PATCH] Update files --- doc/guide/LICENSE | 10 +++++----- doc/guide/release/copyright.sdf | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/guide/LICENSE b/doc/guide/LICENSE index 65a3a21abf..05ad7571e4 100644 --- a/doc/guide/LICENSE +++ b/doc/guide/LICENSE @@ -1,11 +1,11 @@ The OpenLDAP Public License - Version 2.7, 7 September 2001 + Version 2.8, 17 August 2003 Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: -1. Redistributions of source code must retain copyright statements +1. Redistributions in source form must retain copyright statements and notices, 2. Redistributions in binary form must reproduce applicable copyright @@ -37,11 +37,11 @@ POSSIBILITY OF SUCH DAMAGE. The names of the authors and copyright holders must not be used in advertising or otherwise to promote the sale, use or other dealing in this Software without specific, written prior permission. Title -to copyright in this Software shall at all times remain with -copyright holders. +to copyright in this Software shall at all times remain with copyright +holders. OpenLDAP is a registered trademark of the OpenLDAP Foundation. -Copyright 1999-2001 The OpenLDAP Foundation, Redwood City, +Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, California, USA. All Rights Reserved. Permission to copy and distribute verbatim copies of this document is granted. diff --git a/doc/guide/release/copyright.sdf b/doc/guide/release/copyright.sdf index cab3254e4e..4464a652e6 100644 --- a/doc/guide/release/copyright.sdf +++ b/doc/guide/release/copyright.sdf @@ -16,10 +16,11 @@ H2: OpenLDAP Copyright Notice All rights reserved. Redistribution and use in source and binary forms are permitted -{{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. +{{only as authorized}} by the {{SECT:OpenLDAP Public License}}. + +A copy of this license is available in file {{F:LICENSE}} in the +top-level directory of the distribution or, alternatively, at at +{{URL:http://www.OpenLDAP.org/license.html}} OpenLDAP is a registered trademark of the OpenLDAP Foundation. -- 2.39.5