Removed some spurious copyright info from the openldap

schema.  This text applied to the RFC from which the schema was
derived, not the schema itself.
See also: http://revu.tauware.de/details.py?upid=5180

diff --git a/citadel/openldap/citadel.schema b/citadel/openldap/citadel.schema
index 65ace5f04a197dab31a4410e9aeb69e6b098c5a4..938f166ac1bb226cb34df933c31a3093adb53543 100644 (file)
--- a/citadel/openldap/citadel.schema
+++ b/citadel/openldap/citadel.schema
@@ -1,4 +1,4 @@
-# $Id: citadel.schema,v 1.16 2005/12/27 13:04:53 martin Exp $
+# $Id$
 
 # (c) 2006 Art Cancro <ajc@uncensored.citadel.org>
 

diff --git a/citadel/openldap/rfc2739.schema b/citadel/openldap/rfc2739.schema
index f0d1fca0a966f0d118cc2558a74f2e6ee41d86c7..0f666f1bcb8ca85f272f8884597f15a71961c7fb 100644 (file)
--- a/citadel/openldap/rfc2739.schema
+++ b/citadel/openldap/rfc2739.schema
@@ -2,43 +2,17 @@
 # (c) 2006 Art Cancro <ajc@uncensored.citadel.org>
 
 # This schema is derived from RFC 2739 and may act as a substitute
-# when used with OpenLDAP as the original schema from RFC 2739 
+# when used with OpenLDAP, as the original schema from RFC 2739 
 # is syntactically not accepted by OpenLDAP 2.2.14
-#
-# Copyright (C) The Internet Society (2000).  All Rights Reserved.
-#
-#  This document and translations of it may be copied and furnished to
-#  others, and derivative works that comment on or otherwise explain it
-#  or assist in its implementation may be prepared, copied, published
-#  and distributed, in whole or in part, without restriction of any
-#  kind, provided that the above copyright notice and this paragraph are
-#  included on all such copies and derivative works.  However, this
-#  document itself may not be modified in any way, such as by removing
-#  the copyright notice or references to the Internet Society or other
-#  Internet organizations, except as needed for the purpose of
-#  developing Internet standards in which case the procedures for
-#  copyrights defined in the Internet Standards process must be
-#  followed, or as required to translate it into languages other than
-#  English.
-#
-#  The limited permissions granted above are perpetual and will not be
-#  revoked by the Internet Society or its successors or assigns.
-#
-#  This document and the information contained herein is provided on an
-#  "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
-#  TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
-#  BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
-#  HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
-#  MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 
-# slapd.conf then looks like
+# If you are using OpenLDAP, slapd.conf should declare schemas like this:
+#
 #  include /etc/openldap/schema/core.schema
 #  include /etc/openldap/schema/cosine.schema
 #  include /etc/openldap/schema/inetorgperson.schema
 #  include /etc/openldap/schema/rfc2739.schema
 #  include /etc/openldap/schema/citadel.schema
 
-#
 ################################
 # rfc 2739 calendar attributes #
 ################################