20 files changed, 60 insertions, 20 deletions
diff --git a/ldap/cm/v3confs/ns-calendar-globopt.conf b/ldap/cm/v3confs/ns-calendar-globopt.conf
index 6b13bb4b..9b49a483 100644
--- a/ldap/cm/v3confs/ns-calendar-globopt.conf
+++ b/ldap/cm/v3confs/ns-calendar-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-calendar-schema.conf b/ldap/cm/v3confs/ns-calendar-schema.conf
index 527034bb..1c6b9b4c 100644
--- a/ldap/cm/v3confs/ns-calendar-schema.conf
+++ b/ldap/cm/v3confs/ns-calendar-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-certificate-globopt.conf b/ldap/cm/v3confs/ns-certificate-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-certificate-globopt.conf
+++ b/ldap/cm/v3confs/ns-certificate-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-certificate-schema.conf b/ldap/cm/v3confs/ns-certificate-schema.conf
index be88fe89..e24ae45d 100644
--- a/ldap/cm/v3confs/ns-certificate-schema.conf
+++ b/ldap/cm/v3confs/ns-certificate-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-compass-globopt.conf b/ldap/cm/v3confs/ns-compass-globopt.conf
index 755c213f..6c56c350 100644
--- a/ldap/cm/v3confs/ns-compass-globopt.conf
+++ b/ldap/cm/v3confs/ns-compass-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-compass-schema.conf b/ldap/cm/v3confs/ns-compass-schema.conf
index d0cd0b0e..52997ea4 100644
--- a/ldap/cm/v3confs/ns-compass-schema.conf
+++ b/ldap/cm/v3confs/ns-compass-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-directory-globopt.conf b/ldap/cm/v3confs/ns-directory-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-directory-globopt.conf
+++ b/ldap/cm/v3confs/ns-directory-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-directory-schema.conf b/ldap/cm/v3confs/ns-directory-schema.conf
index 3cc6d2b2..335dc675 100644
--- a/ldap/cm/v3confs/ns-directory-schema.conf
+++ b/ldap/cm/v3confs/ns-directory-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-mail-globopt.conf b/ldap/cm/v3confs/ns-mail-globopt.conf
index d712ae3f..5c1075d9 100644
--- a/ldap/cm/v3confs/ns-mail-globopt.conf
+++ b/ldap/cm/v3confs/ns-mail-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-mail-schema.conf b/ldap/cm/v3confs/ns-mail-schema.conf
index 9c84dfdf..d55a2ca4 100644
--- a/ldap/cm/v3confs/ns-mail-schema.conf
+++ b/ldap/cm/v3confs/ns-mail-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-media-globopt.conf b/ldap/cm/v3confs/ns-media-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-media-globopt.conf
+++ b/ldap/cm/v3confs/ns-media-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-media-schema.conf b/ldap/cm/v3confs/ns-media-schema.conf
index c4c43f8a..01b2cf95 100644
--- a/ldap/cm/v3confs/ns-media-schema.conf
+++ b/ldap/cm/v3confs/ns-media-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-news-globopt.conf b/ldap/cm/v3confs/ns-news-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v3confs/ns-news-globopt.conf
+++ b/ldap/cm/v3confs/ns-news-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-news-schema.conf b/ldap/cm/v3confs/ns-news-schema.conf
index 541fb148..9d15c19e 100644
--- a/ldap/cm/v3confs/ns-news-schema.conf
+++ b/ldap/cm/v3confs/ns-news-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-proxy-globopt.conf b/ldap/cm/v3confs/ns-proxy-globopt.conf
index 6f830117..16158da2 100644
--- a/ldap/cm/v3confs/ns-proxy-globopt.conf
+++ b/ldap/cm/v3confs/ns-proxy-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-proxy-schema.conf b/ldap/cm/v3confs/ns-proxy-schema.conf
index 6cc14784..3151c9c7 100644
--- a/ldap/cm/v3confs/ns-proxy-schema.conf
+++ b/ldap/cm/v3confs/ns-proxy-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-web-globopt.conf b/ldap/cm/v3confs/ns-web-globopt.conf
index 9c387d8c..46dd80f7 100644
--- a/ldap/cm/v3confs/ns-web-globopt.conf
+++ b/ldap/cm/v3confs/ns-web-globopt.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/ns-web-schema.conf b/ldap/cm/v3confs/ns-web-schema.conf
index f77ef7f0..3b8b0435 100644
--- a/ldap/cm/v3confs/ns-web-schema.conf
+++ b/ldap/cm/v3confs/ns-web-schema.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/slapd.at.conf b/ldap/cm/v3confs/slapd.at.conf
index 191c8182..5e01e752 100644
--- a/ldap/cm/v3confs/slapd.at.conf
+++ b/ldap/cm/v3confs/slapd.at.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
diff --git a/ldap/cm/v3confs/slapd.oc.conf b/ldap/cm/v3confs/slapd.oc.conf
index f136b3e1..f1d75e7b 100644
--- a/ldap/cm/v3confs/slapd.oc.conf
+++ b/ldap/cm/v3confs/slapd.oc.conf
@@ -27,7 +27,9 @@
 # in conjunction with the Program except the Non-GPL Code covered by this
 # exception. If you modify this file, you may extend this exception to your
 # version of the file, but you are not obligated to do so. If you do not wish to
-# do so, delete this exception statement from your version. 
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception. 
 # 
 # 
 # Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.