remove advertising clause

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7463 ec53bebd-3082-4978-b11e-865c3cabbd6b
1999-12-02 16:58:55 +00:00
parent 58571937fe
commit 3ca5f8150f
185 changed files with 185 additions and 1110 deletions
--- a/appl/ftp/common/buffer.c
+++ b/appl/ftp/common/buffer.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/common/common.h
+++ b/appl/ftp/common/common.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/common/sockbuf.c
+++ b/appl/ftp/common/sockbuf.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftp/ftp_locl.h
+++ b/appl/ftp/ftp/ftp_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftp/gssapi.c
+++ b/appl/ftp/ftp/gssapi.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/ftp/ftp/kauth.c
+++ b/appl/ftp/ftp/kauth.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftp/krb4.c
+++ b/appl/ftp/ftp/krb4.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftp/security.c
+++ b/appl/ftp/ftp/security.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftp/security.h
+++ b/appl/ftp/ftp/security.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/ftp/ftpd/ftpd_locl.h
+++ b/appl/ftp/ftpd/ftpd_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/ftp/ftpd/gss_userok.c
+++ b/appl/ftp/ftpd/gss_userok.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/ftp/ftpd/kauth.c
+++ b/appl/ftp/ftpd/kauth.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/ftp/ftpd/logwtmp.c
+++ b/appl/ftp/ftpd/logwtmp.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/common.c
+++ b/appl/kx/common.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/context.c
+++ b/appl/kx/context.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/krb4.c
+++ b/appl/kx/krb4.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/krb5.c
+++ b/appl/kx/krb5.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/kx.h
+++ b/appl/kx/kx.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/otp/otp.c
+++ b/appl/otp/otp.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/otp/otp_locl.h
+++ b/appl/otp/otp_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/otp/otpprint.c
+++ b/appl/otp/otpprint.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/popper/maildir.c
+++ b/appl/popper/maildir.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/popper/pop_debug.c
+++ b/appl/popper/pop_debug.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/popper/pop_uidl.c
+++ b/appl/popper/pop_uidl.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/appl/push/push.c
+++ b/appl/push/push.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/push/push_locl.h
+++ b/appl/push/push_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/appl/telnet/telnet/telnet_locl.h
+++ b/appl/telnet/telnet/telnet_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/auth/afskauthlib/verify.c
+++ b/lib/auth/afskauthlib/verify.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/auth/pam/pam.c
+++ b/lib/auth/pam/pam.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/auth/sia/krb4+c2_matrix.conf
+++ b/lib/auth/sia/krb4+c2_matrix.conf
@@ -13,12 +13,7 @@
 #    notice, this list of conditions and the following disclaimer in the 
 #    documentation and/or other materials provided with the distribution. 
 #
-# 3. All advertising materials mentioning features or use of this software 
+# 3. Neither the name of the Institute nor the names of its contributors 
 #    must display the following acknowledgement: 
 #      This product includes software developed by Kungliga Tekniska 
 #      H<>gskolan and its contributors. 
 #
 # 4. Neither the name of the Institute nor the names of its contributors 
 #    may be used to endorse or promote products derived from this software 
 #    without specific prior written permission. 
 #
--- a/lib/auth/sia/krb4_matrix.conf
+++ b/lib/auth/sia/krb4_matrix.conf
@@ -13,12 +13,7 @@
 #    notice, this list of conditions and the following disclaimer in the 
 #    documentation and/or other materials provided with the distribution. 
 #
-# 3. All advertising materials mentioning features or use of this software 
+# 3. Neither the name of the Institute nor the names of its contributors 
 #    must display the following acknowledgement: 
 #      This product includes software developed by Kungliga Tekniska 
 #      H<>gskolan and its contributors. 
 #
 # 4. Neither the name of the Institute nor the names of its contributors 
 #    may be used to endorse or promote products derived from this software 
 #    without specific prior written permission. 
 #
--- a/lib/com_err/com_err.c
+++ b/lib/com_err/com_err.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/com_err.h
+++ b/lib/com_err/com_err.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/com_right.h
+++ b/lib/com_err/com_right.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/compile_et.c
+++ b/lib/com_err/compile_et.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/compile_et.h
+++ b/lib/com_err/compile_et.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/error.c
+++ b/lib/com_err/error.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/lex.l
+++ b/lib/com_err/lex.l
@@ -15,12 +15,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/parse.y
+++ b/lib/com_err/parse.y
@@ -15,12 +15,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/com_err/roken_rename.h
+++ b/lib/com_err/roken_rename.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/des/dllmain.c
+++ b/lib/des/dllmain.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/key_par.c
+++ b/lib/des/key_par.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/md4.c
+++ b/lib/des/md4.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/md4.h
+++ b/lib/des/md4.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/md5.c
+++ b/lib/des/md5.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/md5.h
+++ b/lib/des/md5.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/md5crypt_test.c
+++ b/lib/des/md5crypt_test.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/mdtest.c
+++ b/lib/des/mdtest.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/passwd_dlg.c
+++ b/lib/des/passwd_dlg.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/passwd_dlg.h
+++ b/lib/des/passwd_dlg.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/rnd_keys.c
+++ b/lib/des/rnd_keys.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/sha.c
+++ b/lib/des/sha.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/des/sha.h
+++ b/lib/des/sha.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/editline/edit_compat.c
+++ b/lib/editline/edit_compat.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/editline/roken_rename.h
+++ b/lib/editline/roken_rename.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/kafs/afskrb.c
+++ b/lib/kafs/afskrb.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/afskrb5.c
+++ b/lib/kafs/afskrb5.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/afslib.c
+++ b/lib/kafs/afslib.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/afssys.c
+++ b/lib/kafs/afssys.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/afssysdefs.h
+++ b/lib/kafs/afssysdefs.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/common.c
+++ b/lib/kafs/common.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/kafs/kafs.h
+++ b/lib/kafs/kafs.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/kafs/kafs_locl.h
+++ b/lib/kafs/kafs_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp.c
+++ b/lib/otp/otp.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp.h
+++ b/lib/otp/otp.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_challenge.c
+++ b/lib/otp/otp_challenge.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_db.c
+++ b/lib/otp/otp_db.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_locl.h
+++ b/lib/otp/otp_locl.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_md.c
+++ b/lib/otp/otp_md.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_md.h
+++ b/lib/otp/otp_md.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_parse.c
+++ b/lib/otp/otp_parse.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_print.c
+++ b/lib/otp/otp_print.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otp_verify.c
+++ b/lib/otp/otp_verify.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/otptest.c
+++ b/lib/otp/otptest.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/otp/roken_rename.h
+++ b/lib/otp/roken_rename.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/roken/base64.c
+++ b/lib/roken/base64.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/base64.h
+++ b/lib/roken/base64.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/chown.c
+++ b/lib/roken/chown.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/concat.c
+++ b/lib/roken/concat.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/copyhostent.c
+++ b/lib/roken/copyhostent.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/emalloc.c
+++ b/lib/roken/emalloc.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/eread.c
+++ b/lib/roken/eread.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/erealloc.c
+++ b/lib/roken/erealloc.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/err.c
+++ b/lib/roken/err.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/err.h
+++ b/lib/roken/err.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/err.hin
+++ b/lib/roken/err.hin
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/errx.c
+++ b/lib/roken/errx.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/estrdup.c
+++ b/lib/roken/estrdup.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/ewrite.c
+++ b/lib/roken/ewrite.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/fchown.c
+++ b/lib/roken/fchown.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/flock.c
+++ b/lib/roken/flock.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/freehostent.c
+++ b/lib/roken/freehostent.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/get_default_username.c
+++ b/lib/roken/get_default_username.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/roken/get_window_size.c
+++ b/lib/roken/get_window_size.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/getarg.c
+++ b/lib/roken/getarg.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/roken/getarg.h
+++ b/lib/roken/getarg.h
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the 
 *    documentation and/or other materials provided with the distribution. 
 *
- * 3. All advertising materials mentioning features or use of this software 
+ * 3. Neither the name of the Institute nor the names of its contributors 
 *    must display the following acknowledgement: 
 *      This product includes software developed by Kungliga Tekniska 
 *      H<>gskolan and its contributors. 
 *
 * 4. Neither the name of the Institute nor the names of its contributors 
 *    may be used to endorse or promote products derived from this software 
 *    without specific prior written permission. 
 *
--- a/lib/roken/getcwd.c
+++ b/lib/roken/getcwd.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -14,12 +14,7 @@
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 
- * 3. All advertising materials mentioning features or use of this software
+ * 3. Neither the name of the Institute nor the names of its contributors
 *    must display the following acknowledgement:
 *      This product includes software developed by the Kungliga Tekniska
 *      H<>gskolan and its contributors.
 * 
 * 4. Neither the name of the Institute nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 * 
--- a/Show More
+++ b/Show More