Remove the BSD advertising clause. As mentioned in the ChangeLog only

one left is in scripts/expn.* and I am not sure why this is distributed
as part of am-utils.

diff --git a/COPYING b/COPYING
index 8144014f5c88fbdc5d14cf11626fd64bcf88368b..f54191d75fea7072decd380ea382ecea5635a044 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -15,12 +15,7 @@ are met:
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
-   must display the following acknowledgment:
-     This product includes software developed by the University of
-     California, Berkeley and its contributors, as well as the Trustees of
-     Columbia University.
-4. Neither the name of the University nor the names of its contributors
+3. Neither the name of the University nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 

diff --git a/ChangeLog b/ChangeLog
index 73201a4e596496e9c011e02ab7665460eb4cb522..0d3aa514384625b262ad605101f1b3787010ad04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 
+2014-03-09  Christos Zoulas <christos@zoulas.com>
+
+       * Remove BSD advertising clause. The only advertising clause left
+         is in scripts/expn.*, and I am not sure why these are part of
+         am-utils.
+
 2013-12-05  Christos Zoulas <christos@zoulas.com>
 
        * Change the way we handle multiple lex scanners and yacc parsers

diff --git a/amd/am_ops.c b/amd/am_ops.c
index 612c87c37f37697b58a794451e8e802ee6053b44..4d07dc807d903330f962bc9d0b128f579f6baeb4 100644 (file)
--- a/amd/am_ops.c
+++ b/amd/am_ops.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amd.8 b/amd/amd.8
index d8b9c0381394259fe227d69fce71ba98af7d6660..0440c7b8d4639808d22f26ceee74f10509471cd5 100644 (file)
--- a/amd/amd.8
+++ b/amd/amd.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/amd/amd.c b/amd/amd.c
index 7a03aca4139d97c23769d738920dd3c19140afa5..f697917ca3ae9c85974d4e3b09e773e68418cc4f 100644 (file)
--- a/amd/amd.c
+++ b/amd/amd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amd.h b/amd/amd.h
index 0decc8bde40506fb016c6f13759b6a03b576cbf4..883a67a66d770b0f691e5610896860085e18e4d7 100644 (file)
--- a/amd/amd.h
+++ b/amd/amd.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_auto.c b/amd/amfs_auto.c
index 41a2aa13e1b7265f5310a94407501ff06a557828..34fdb00f501cd62b80b0bac63569fa4e1901d87b 100644 (file)
--- a/amd/amfs_auto.c
+++ b/amd/amfs_auto.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_direct.c b/amd/amfs_direct.c
index ba693b5daab82fbd48be4436a5605027331b7ab4..b911c2a1e2cea4e3872bf9f225126d35d96f0bfe 100644 (file)
--- a/amd/amfs_direct.c
+++ b/amd/amfs_direct.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_error.c b/amd/amfs_error.c
index 6a34c0405765b08f4baf5823cb2451c3dffdbfed..8e015ed94ad2c572a1daed0b2470572878bba2b1 100644 (file)
--- a/amd/amfs_error.c
+++ b/amd/amfs_error.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_generic.c b/amd/amfs_generic.c
index d66e5a00f896b9da4ef7924872c338085ca637d6..1ba3c8b5f00100da3060447712d7d367d6d889f5 100644 (file)
--- a/amd/amfs_generic.c
+++ b/amd/amfs_generic.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_host.c b/amd/amfs_host.c
index 85cbc9b9f46122d3afc4226c4d6b4e96e89e3825..a3468ecd4b65d8754fc48060a1768ecbf4d83353 100644 (file)
--- a/amd/amfs_host.c
+++ b/amd/amfs_host.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_link.c b/amd/amfs_link.c
index 00d9c57dd0ca03c1ce041751c3a681eec870cc56..0751dd7047a0252342087ddbbea9d717df69cb17 100644 (file)
--- a/amd/amfs_link.c
+++ b/amd/amfs_link.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_linkx.c b/amd/amfs_linkx.c
index a31de6a5ad3fd8276c565138761cb4293ac2b10e..be95fe5e1a27d37c0e4cc3bac1d4ed0944100eac 100644 (file)
--- a/amd/amfs_linkx.c
+++ b/amd/amfs_linkx.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_nfsl.c b/amd/amfs_nfsl.c
index 7a7e09264dd886ccaf693e6496f0b6017873e04d..c70a3eeb97c46f3235efdfa69b25a35944c16203 100644 (file)
--- a/amd/amfs_nfsl.c
+++ b/amd/amfs_nfsl.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_nfsx.c b/amd/amfs_nfsx.c
index 000ef1cd1bbd51f8e69bd165077de21015be7504..db1b9fafd11963c4576720bc0257fb07f2e3c06e 100644 (file)
--- a/amd/amfs_nfsx.c
+++ b/amd/amfs_nfsx.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_program.c b/amd/amfs_program.c
index fae411aa87f628368f586628038d824904bb195d..6bf003fb2cf79ef73f3b96d33ae4e61c5a67720b 100644 (file)
--- a/amd/amfs_program.c
+++ b/amd/amfs_program.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_root.c b/amd/amfs_root.c
index 8c3828db0da06527706a72d3da554facbcb5ff2d..f06c43ce0bac92464b5b0c4450737d3a3765b778 100644 (file)
--- a/amd/amfs_root.c
+++ b/amd/amfs_root.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_toplvl.c b/amd/amfs_toplvl.c
index 577807bde45c67cf860ad2948f7fe13e06f374ea..1b143157b4c7393a643df978b9b9be21f73602f3 100644 (file)
--- a/amd/amfs_toplvl.c
+++ b/amd/amfs_toplvl.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amfs_union.c b/amd/amfs_union.c
index 568f66e8543eb8e62428f403c0015c6185035dea..9f37a1b04dd19f282bc65a6a6abd428cb305e440 100644 (file)
--- a/amd/amfs_union.c
+++ b/amd/amfs_union.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amq_subr.c b/amd/amq_subr.c
index 66561bb712d4a65f1dc89f63f9001801ae85128e..8783611056520913b219a48380aa408734ea6212 100644 (file)
--- a/amd/amq_subr.c
+++ b/amd/amq_subr.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/amq_svc.c b/amd/amq_svc.c
index e5c54e3ee1ebe6c73aea7409d0008cdde1bf8d29..04755bc6c7a82f1183dc317e3267af71b5caab6b 100644 (file)
--- a/amd/amq_svc.c
+++ b/amd/amq_svc.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/autil.c b/amd/autil.c
index 10ac0ccf9054a9fe4dc548f479916b7e109634ae..7320188375f2d166c6bce1a1426f4f13312440e1 100644 (file)
--- a/amd/autil.c
+++ b/amd/autil.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/clock.c b/amd/clock.c
index b42276565867d09f449c1861f5246739e780562a..4c6aa5413763b0cbeef81fa6c3946ae2684d4018 100644 (file)
--- a/amd/clock.c
+++ b/amd/clock.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/conf.c b/amd/conf.c
index 8a886e575ff3b42d4cd2073f95960e2075cf5d34..8cf65577d371a7173391fe56d73c88d8feb12a36 100644 (file)
--- a/amd/conf.c
+++ b/amd/conf.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/conf_parse.y b/amd/conf_parse.y
index e5526d94500741850da61d7780e1703ddc53d30c..26c1b7ac79033ab1677f2ad3626f65ad3cb07926 100644 (file)
--- a/amd/conf_parse.y
+++ b/amd/conf_parse.y
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/conf_tok.l b/amd/conf_tok.l
index 3a0b85eb2143bb1880df9681a80ad59350d94074..fea2d8bf43f5dc456dfa2dca953aae0ab250fd23 100644 (file)
--- a/amd/conf_tok.l
+++ b/amd/conf_tok.l
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/get_args.c b/amd/get_args.c
index 5e790a29db7cc2c54e0bcbd4af1522225d08a732..b6c7a99de337e55b7c5f6b625fdcfc5ac556f52c 100644 (file)
--- a/amd/get_args.c
+++ b/amd/get_args.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_exec.c b/amd/info_exec.c
index 7041eb83b73622f5a0a55a99bdc30fbf97bb481e..95216c90e2e994bb073d69cb1c94b2cb39e29ec3 100644 (file)
--- a/amd/info_exec.c
+++ b/amd/info_exec.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_file.c b/amd/info_file.c
index feeb6256fcc111bef2332f66a0c7e691c611617c..738c7bfa5776ed937dbdd65673b6216e7ad69311 100644 (file)
--- a/amd/info_file.c
+++ b/amd/info_file.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_hesiod.c b/amd/info_hesiod.c
index 94d36be6dd1b9dd3180da7a3d04668819b56c93e..0293f435a2627111a3e3c4d2d72be51cb0355b3a 100644 (file)
--- a/amd/info_hesiod.c
+++ b/amd/info_hesiod.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_ldap.c b/amd/info_ldap.c
index b63b4da24b8a36d560f32114337c1c569754192e..cfed6fd773d788bc0a55485612999855ce881c13 100644 (file)
--- a/amd/info_ldap.c
+++ b/amd/info_ldap.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_ndbm.c b/amd/info_ndbm.c
index 463c6028e35f10479d640a9baf75ac9897fc14a3..5f2f52b5330e3b32bcb763fefe85ad21dd3012d3 100644 (file)
--- a/amd/info_ndbm.c
+++ b/amd/info_ndbm.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_nis.c b/amd/info_nis.c
index f466ac1fcd00e43945e7f0556c646301f0b22413..83dc4b7a84fcbbe534ce7ba50ce6e5edd58c0041 100644 (file)
--- a/amd/info_nis.c
+++ b/amd/info_nis.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_nisplus.c b/amd/info_nisplus.c
index 4145f646d5ea211123d4a12ea2a39494be0d7e68..79df83614700304c9199acf333e08b8839c38a7e 100644 (file)
--- a/amd/info_nisplus.c
+++ b/amd/info_nisplus.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_passwd.c b/amd/info_passwd.c
index 249d87f86b127d576fdb66f526eff0c6f1546803..3c4486693c60e7d0f878e85db3217be7243ff732 100644 (file)
--- a/amd/info_passwd.c
+++ b/amd/info_passwd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_sun.c b/amd/info_sun.c
index d925db8c641f352e870fda38eb03481531a56030..3f56965ff74716fc226afd0fc1c112a86b0b1e78 100644 (file)
--- a/amd/info_sun.c
+++ b/amd/info_sun.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/info_union.c b/amd/info_union.c
index e78423686683f1280bdc155fb398aef1213beb58..df480317bddf3011099bb706bba25d1e0849548e 100644 (file)
--- a/amd/info_union.c
+++ b/amd/info_union.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/map.c b/amd/map.c
index 91b2ce3cbc2d00875a84dd9a9b8e2ef8904e0de5..2fad4b7b2c8500a410966811049177e0ea195d7d 100644 (file)
--- a/amd/map.c
+++ b/amd/map.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/mapc.c b/amd/mapc.c
index ba9a40549dd453dc4a13c198f691b8c5d6c51c1a..cd4b9b956a05b720ae1936089208ea2f0acad528 100644 (file)
--- a/amd/mapc.c
+++ b/amd/mapc.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/mntfs.c b/amd/mntfs.c
index a9393014e928170d984711f7cbdf2c8fd39a9800..a26ff8f553f62d78387d4ecc7aa6db5c3c643f02 100644 (file)
--- a/amd/mntfs.c
+++ b/amd/mntfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/nfs_prot_svc.c b/amd/nfs_prot_svc.c
index 0142de0276a6cb1dae05cf5e8c849eaec0b4b74e..b3366b6dd3d16e8c47b4cf53ea76a0729d0331fb 100644 (file)
--- a/amd/nfs_prot_svc.c
+++ b/amd/nfs_prot_svc.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/nfs_start.c b/amd/nfs_start.c
index f4a9595e5157ad80b2f9c6e5f514d51ec65e10b7..87db6bcfdfb72bb4a5ec22720ee030d12374ad1c 100644 (file)
--- a/amd/nfs_start.c
+++ b/amd/nfs_start.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/nfs_subr.c b/amd/nfs_subr.c
index 69b15728a4ee94c70420dfc0e96cce094b29e8af..4c7157e760e423da6bb32aa78c84e8d78f8cb0f9 100644 (file)
--- a/amd/nfs_subr.c
+++ b/amd/nfs_subr.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_TEMPLATE.c b/amd/ops_TEMPLATE.c
index f0903b586d87ecaf34e94e8bd77666acef1efd74..07573378f9bcbee8e450f4b88509bf7616668f57 100644 (file)
--- a/amd/ops_TEMPLATE.c
+++ b/amd/ops_TEMPLATE.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_cachefs.c b/amd/ops_cachefs.c
index 59a5b621a38222da38fe870303b3cbfab7870c5a..26a333527457d478732aaef47e5b9316884fa084 100644 (file)
--- a/amd/ops_cachefs.c
+++ b/amd/ops_cachefs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_cdfs.c b/amd/ops_cdfs.c
index b904f563e73f4f9ade688408eda53ffdc6412f88..6ceb76408b03b2d3d4a1ca8d4d9d0d1fa881a6dc 100644 (file)
--- a/amd/ops_cdfs.c
+++ b/amd/ops_cdfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_efs.c b/amd/ops_efs.c
index 89e0e8573f8fbf3934c4fd48fa1639c7326f9cf0..58bf8f0b76cbf8390fd4111708db56a784ecf855 100644 (file)
--- a/amd/ops_efs.c
+++ b/amd/ops_efs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_ext.c b/amd/ops_ext.c
index 524dc8fe371289647dc845245075224f5c24a991..106ab31f3748f7731a783acdc2b0393d58cfa574 100644 (file)
--- a/amd/ops_ext.c
+++ b/amd/ops_ext.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_lofs.c b/amd/ops_lofs.c
index f0429262552a0356559812db32ae9f74ccc40673..b04f64399c18e6c9624e2c712631edab7e335780 100644 (file)
--- a/amd/ops_lofs.c
+++ b/amd/ops_lofs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_mfs.c b/amd/ops_mfs.c
index 04bfa02bd0a5fe897695c0f305ed9e94a117bf0c..822a2659317befc37cbb179353a5eb6b800bb156 100644 (file)
--- a/amd/ops_mfs.c
+++ b/amd/ops_mfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_nfs.c b/amd/ops_nfs.c
index a721797ad4a4192b181f3bbe3135fea3b792dbfa..2dbfa5b5e2eebb4e95cc341a4da20a285493a1a0 100644 (file)
--- a/amd/ops_nfs.c
+++ b/amd/ops_nfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_nfs3.c b/amd/ops_nfs3.c
index d7a8d455ac9b3671cf55301cc9e4a1c38a58708b..e07811b808e219f340b957dde3d480243ff53da4 100644 (file)
--- a/amd/ops_nfs3.c
+++ b/amd/ops_nfs3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_nfs4.c b/amd/ops_nfs4.c
index 5dfc589ac114b8249916760cd941d08c9d62c028..3798590837f34e80dff22cc68ae873270475d275 100644 (file)
--- a/amd/ops_nfs4.c
+++ b/amd/ops_nfs4.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_nullfs.c b/amd/ops_nullfs.c
index af9a8d538480327160eb900a60916a876304d3b0..73d1f0e53f1c4e5f4318742f8d42bf640e577a5e 100644 (file)
--- a/amd/ops_nullfs.c
+++ b/amd/ops_nullfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_pcfs.c b/amd/ops_pcfs.c
index 6b8a094916b1c0e014f6c9cbacf69dac0613a396..b4c8dcd5feccc23d243b33cf360b2370828b6ae5 100644 (file)
--- a/amd/ops_pcfs.c
+++ b/amd/ops_pcfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_tfs.c b/amd/ops_tfs.c
index e395236b6bb01cf6b9fbc6b0815fe4d709ba254f..3276a6e62ff108908a0bd1a29e3abc284547c297 100644 (file)
--- a/amd/ops_tfs.c
+++ b/amd/ops_tfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_tmpfs.c b/amd/ops_tmpfs.c
index c31728fba8a5b44b79811c1b9d3c2bce2cd3226b..d9a15ea0434d489ae4a4ac586a57e4cec6c26b96 100644 (file)
--- a/amd/ops_tmpfs.c
+++ b/amd/ops_tmpfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_udf.c b/amd/ops_udf.c
index da0a219af0c013896319e46c3e6818f341169fae..b029365c68f2dfa32d951e614265797c90663095 100644 (file)
--- a/amd/ops_udf.c
+++ b/amd/ops_udf.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_ufs.c b/amd/ops_ufs.c
index c4f01ac67e265e9a8df69ded5342964db62d2343..0d8f3068dbe50518c59044dad150720c9ecc4ea4 100644 (file)
--- a/amd/ops_ufs.c
+++ b/amd/ops_ufs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_umapfs.c b/amd/ops_umapfs.c
index 2529d3bbcde70dc1a4549bd782777a6d4ed4a2f8..6f9d39d9d5db675fd6bef3dc582b6275b9040686 100644 (file)
--- a/amd/ops_umapfs.c
+++ b/amd/ops_umapfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_unionfs.c b/amd/ops_unionfs.c
index 1c9e0e732f8a4db81fa364d08ec5773cdb08e697..e6286133cbfa725a83a14f61c4d8655b4ae7cb9f 100644 (file)
--- a/amd/ops_unionfs.c
+++ b/amd/ops_unionfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/ops_xfs.c b/amd/ops_xfs.c
index 0a98c59ee2a484038b7616ab7a206e15de204ebe..6e1495e295f4520073717e93ffd64d62a367faab 100644 (file)
--- a/amd/ops_xfs.c
+++ b/amd/ops_xfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/opts.c b/amd/opts.c
index b707aff150f308139abfe3dd65db59a5a63703b7..4bc833a8dd85ee6aa76bf2b16e07b665a6e2c24b 100644 (file)
--- a/amd/opts.c
+++ b/amd/opts.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/readdir.c b/amd/readdir.c
index 9e5adc067e18b20287fa88347591485640002daf..758f6146bf6170db1af926053640dabda28d077d 100644 (file)
--- a/amd/readdir.c
+++ b/amd/readdir.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/restart.c b/amd/restart.c
index 1599e9b3d7397b832e2e0b4f60d8be01bc1f5996..ede5679ae091f5adb54d8dde15436967584778c4 100644 (file)
--- a/amd/restart.c
+++ b/amd/restart.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/rpc_fwd.c b/amd/rpc_fwd.c
index 104f272944f694fe596c8ff78921a80e8c39bcd2..757b4371024adfb58d43931e0b5241a58df6a4f0 100644 (file)
--- a/amd/rpc_fwd.c
+++ b/amd/rpc_fwd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sched.c b/amd/sched.c
index d535dcbb0b2721f38f5a1a9f4d6f9871281bee13..5c816b4c2058529e0920a02517b3926397444064 100644 (file)
--- a/amd/sched.c
+++ b/amd/sched.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/srvr_amfs_auto.c b/amd/srvr_amfs_auto.c
index a16dbfafe3140be13bc6bcf917b21f16e9df902f..44b130254d30f7f6bff4660ab0496ef05778ce50 100644 (file)
--- a/amd/srvr_amfs_auto.c
+++ b/amd/srvr_amfs_auto.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/srvr_nfs.c b/amd/srvr_nfs.c
index 4a52f6c6a60f0dbc738a47f4be5d8237500d059c..b7c852c9e1de5a36570b69965e47a654c5fb4634 100644 (file)
--- a/amd/srvr_nfs.c
+++ b/amd/srvr_nfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sun2amd.8 b/amd/sun2amd.8
index 5b04590ad17baa7e57e3f60c988be13145ba2f64..67d241f32cdbc621d4e7c6fbb4a8d98e7ad0da5a 100644 (file)
--- a/amd/sun2amd.8
+++ b/amd/sun2amd.8
@@ -17,11 +17,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/amd/sun2amd.c b/amd/sun2amd.c
index 380364054cdf9643146beaa19ddcce69c8d918b1..ee6fbb59626f0bf854344437ef8dbefb7561ca09 100644 (file)
--- a/amd/sun2amd.c
+++ b/amd/sun2amd.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sun_map.c b/amd/sun_map.c
index a412150bb50ed2aab9ba96559f72ed61d9222bf8..8e3559960cd31a1ba2cbfed6840fd0c1bb449103 100644 (file)
--- a/amd/sun_map.c
+++ b/amd/sun_map.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sun_map.h b/amd/sun_map.h
index 8ca1756248ac9bd0809d45aff9e275249af4fcce..75e707ae700365e4e420ca427fb6f608a84060aa 100644 (file)
--- a/amd/sun_map.h
+++ b/amd/sun_map.h
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sun_map_parse.y b/amd/sun_map_parse.y
index af6cd557854c28bfbcf8272f9bdd6da36fd2f187..ccf258e2dcc805b46f9b8bede55480e5b93563bd 100644 (file)
--- a/amd/sun_map_parse.y
+++ b/amd/sun_map_parse.y
@@ -18,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amd/sun_map_tok.l b/amd/sun_map_tok.l
index 776b8cbcbe5e43012a3e4f36259dee8f54a38465..f979bea4cf1fb7018faab220ac9a2bd1c125faa4 100644 (file)
--- a/amd/sun_map_tok.l
+++ b/amd/sun_map_tok.l
@@ -18,11 +18,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amq/amq.8 b/amq/amq.8
index 1269e0cd7813fc234cc87c9c3ebe42de0c2cb9ac..feff75433ea0ad7338230740545a46a519ba1902 100644 (file)
--- a/amq/amq.8
+++ b/amq/amq.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/amq/amq.c b/amq/amq.c
index f535c046b56f4e08793360aa62f1a1c638cc440d..e99732fded5bc961a4017c5f42053de4143d5cbd 100644 (file)
--- a/amq/amq.c
+++ b/amq/amq.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amq/amq.h b/amq/amq.h
index 64a315a511e49376dc563b8e238ee8d10d4565f5..3c894d687f5061849ed2a5d4e08cd598f3f73d51 100644 (file)
--- a/amq/amq.h
+++ b/amq/amq.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amq/amq_clnt.c b/amq/amq_clnt.c
index 65ddb2d1526c5518c3360bc062490242001f7acb..c5f1e87d97f8eaf7749d507fae5b9365e38078c4 100644 (file)
--- a/amq/amq_clnt.c
+++ b/amq/amq_clnt.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amq/amq_xdr.c b/amq/amq_xdr.c
index 5ada83050c16459aa1ab67529f34cc5f0a804f6a..b9a1c20fbf1154c2e1346c10e8b5a462f4befc60 100644 (file)
--- a/amq/amq_xdr.c
+++ b/amq/amq_xdr.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/amq/pawd.1 b/amq/pawd.1
index 6cdf762b7b95a3dbf0e6c472dfff165911d9abd9..ce1b5fc8f61cba00fcddf98f0114e1a80804be33 100644 (file)
--- a/amq/pawd.1
+++ b/amq/pawd.1
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/amq/pawd.c b/amq/pawd.c
index 6cb68fe58745f2fe2160480ee8938cc6a9a7dee5..bab6657521ba8457d45daf87106705cfe062e384 100644 (file)
--- a/amq/pawd.c
+++ b/amq/pawd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_default.c b/conf/autofs/autofs_default.c
index 6cbba124caf5da96c937f953ebf54110b43195f9..ae75f4de5532f7f39269bfe49239d01680e455fe 100644 (file)
--- a/conf/autofs/autofs_default.c
+++ b/conf/autofs/autofs_default.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_default.h b/conf/autofs/autofs_default.h
index 6c6ab5e2578b1ee3481202d3f9d9e2d655a4145e..6668eb64025565bb28194ded314790f035c526c8 100644 (file)
--- a/conf/autofs/autofs_default.h
+++ b/conf/autofs/autofs_default.h
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_linux.c b/conf/autofs/autofs_linux.c
index 962490e62578c285993ef8bfad56627b378ac0a6..5e6a1712bdfaab0a6de0eb9ad3921740b6715af1 100644 (file)
--- a/conf/autofs/autofs_linux.c
+++ b/conf/autofs/autofs_linux.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_linux.h b/conf/autofs/autofs_linux.h
index ca347fd77edab49f0da2606e605331c1a4db27a1..672cb49e21d1b1ddbaeb48f13a797fde8fba7f79 100644 (file)
--- a/conf/autofs/autofs_linux.h
+++ b/conf/autofs/autofs_linux.h
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_solaris_v1.c b/conf/autofs/autofs_solaris_v1.c
index 73c0bd6eb26bf10f5039c33fcf863f992552f0cd..fcce6e3de006973b498ad57511d87524809c55ea 100644 (file)
--- a/conf/autofs/autofs_solaris_v1.c
+++ b/conf/autofs/autofs_solaris_v1.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_solaris_v1.h b/conf/autofs/autofs_solaris_v1.h
index 6288f269a1ca7545ea4e1f86758bcbfc8703d7d1..1c11c998743e888cb151cf50a212d5526af7df87 100644 (file)
--- a/conf/autofs/autofs_solaris_v1.h
+++ b/conf/autofs/autofs_solaris_v1.h
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_solaris_v2_v3.c b/conf/autofs/autofs_solaris_v2_v3.c
index ae08ba923d68f7037979dbf56b9251f81dc239b9..f3b653e7ea909110ab4dd0bee5ce1e418caf8396 100644 (file)
--- a/conf/autofs/autofs_solaris_v2_v3.c
+++ b/conf/autofs/autofs_solaris_v2_v3.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/autofs/autofs_solaris_v2_v3.h b/conf/autofs/autofs_solaris_v2_v3.h
index 62a79072cbc1c5d8352d972b352de2a5d1e83db7..5d6ec54509c25467d7f042d05f4c8c98eb9ac4f0 100644 (file)
--- a/conf/autofs/autofs_solaris_v2_v3.h
+++ b/conf/autofs/autofs_solaris_v2_v3.h
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_aix.c b/conf/checkmount/checkmount_aix.c
index 98e8727e302e44808a4e3ece125fca7da52fd1fa..599c136facfe61ab37b24fed21af996e79a558b6 100644 (file)
--- a/conf/checkmount/checkmount_aix.c
+++ b/conf/checkmount/checkmount_aix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_bsd44.c b/conf/checkmount/checkmount_bsd44.c
index f86377762b23454ab08bbfb0ff43eef64c49465a..6c6b21dcb4a26dbd590011c6257832d5dd979501 100644 (file)
--- a/conf/checkmount/checkmount_bsd44.c
+++ b/conf/checkmount/checkmount_bsd44.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_default.c b/conf/checkmount/checkmount_default.c
index 8279c47122cd8795e1db3b3661fbc8438385665d..18d8fe335fecc76dfff4d1c81676b32aa98d9293 100644 (file)
--- a/conf/checkmount/checkmount_default.c
+++ b/conf/checkmount/checkmount_default.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_osf.c b/conf/checkmount/checkmount_osf.c
index 45c9f6d0f0876b9c404e6ae9e364895dfcb4ca09..530433ce232fc0acc1ce8cdefbb30c8bec10cb92 100644 (file)
--- a/conf/checkmount/checkmount_osf.c
+++ b/conf/checkmount/checkmount_osf.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_svr4.c b/conf/checkmount/checkmount_svr4.c
index 6f5f6e4b214516ff1b821dc25bc7f7c34e6f1bc1..4294c2cd42a71a29856df352e76620d686f94c04 100644 (file)
--- a/conf/checkmount/checkmount_svr4.c
+++ b/conf/checkmount/checkmount_svr4.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/checkmount/checkmount_ultrix.c b/conf/checkmount/checkmount_ultrix.c
index 57e691f2dd20356b0f355a5af8bf2733cf7a54af..fd67ff453a3e1a518d06e5229974df30f1518750 100644 (file)
--- a/conf/checkmount/checkmount_ultrix.c
+++ b/conf/checkmount/checkmount_ultrix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_aix.c b/conf/mount/mount_aix.c
index 42322c0eb280b875bb38a626f89147a63b6eb052..6cb832611148991f3ebc0ff0fb36e970b24d30a6 100644 (file)
--- a/conf/mount/mount_aix.c
+++ b/conf/mount/mount_aix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_aix3.c b/conf/mount/mount_aix3.c
index 492f9a616f4ac953020551de6ce18571e9be2695..5e66791b270fcb5b81ae38add66967ca5af9aab1 100644 (file)
--- a/conf/mount/mount_aix3.c
+++ b/conf/mount/mount_aix3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_bsdi3.c b/conf/mount/mount_bsdi3.c
index 9e024a54621cca30a1ec65ac691d83ebce599ff8..bb39f99a6ce1608a9004cf38460b5145cf484669 100644 (file)
--- a/conf/mount/mount_bsdi3.c
+++ b/conf/mount/mount_bsdi3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_default.c b/conf/mount/mount_default.c
index e38f7f0d44f0322efae493e06b65041740159980..9e85e1601719127cb4ccb2f61ce43b56ac10458a 100644 (file)
--- a/conf/mount/mount_default.c
+++ b/conf/mount/mount_default.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_hpux.c b/conf/mount/mount_hpux.c
index b6992cda8e2b0067ef571b4552d4439d60cf8bc5..5a0e0204669521b8d2f0605ecf8648a55dfc9379 100644 (file)
--- a/conf/mount/mount_hpux.c
+++ b/conf/mount/mount_hpux.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_irix5.c b/conf/mount/mount_irix5.c
index 99386dff35da3c9994739558160cf09765d39e3d..359e55a8333eb6c6db6014875e89c39dbfe88856 100644 (file)
--- a/conf/mount/mount_irix5.c
+++ b/conf/mount/mount_irix5.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_irix6.c b/conf/mount/mount_irix6.c
index a442c28aebb4aa5f8d79e89900c608a016bfd80f..b0eb55bd633384de90d94c71efa0f7f577a1e9dc 100644 (file)
--- a/conf/mount/mount_irix6.c
+++ b/conf/mount/mount_irix6.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_isc3.c b/conf/mount/mount_isc3.c
index a66b002f7de41e7d1f53209f72e00ae305fa3e78..0896a31b5b401c1ff5aaa8260b69900d677d918c 100644 (file)
--- a/conf/mount/mount_isc3.c
+++ b/conf/mount/mount_isc3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_linux.c b/conf/mount/mount_linux.c
index 6de49188cdd463cdf276a391b3c909eb203f260a..26c2e5f914d4b174bf413fc0acd8d9fe9e80bfb9 100644 (file)
--- a/conf/mount/mount_linux.c
+++ b/conf/mount/mount_linux.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_mach3.c b/conf/mount/mount_mach3.c
index 936fb8784079809aa55ec90ef357e352354b5d32..5319a92e542f8965b18960fa72ad0bd806430295 100644 (file)
--- a/conf/mount/mount_mach3.c
+++ b/conf/mount/mount_mach3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_stellix.c b/conf/mount/mount_stellix.c
index 882e3a251955c08f9ed40f881cb02110d3ddfe8a..53615d3fce912331b4719a08fede3013007e95f4 100644 (file)
--- a/conf/mount/mount_stellix.c
+++ b/conf/mount/mount_stellix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mount/mount_svr4.c b/conf/mount/mount_svr4.c
index edfada5dd9593e24ab1f7bfc9c5eda41ed205dcc..e139567bfb98cee207f30e9dcb825305223a3db5 100644 (file)
--- a/conf/mount/mount_svr4.c
+++ b/conf/mount/mount_svr4.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_aix.c b/conf/mtab/mtab_aix.c
index b9bc6814eab329119477a807e720ee05b83277c6..072adc74151d09d633061ae0146fa4a61e644f63 100644 (file)
--- a/conf/mtab/mtab_aix.c
+++ b/conf/mtab/mtab_aix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_bsd.c b/conf/mtab/mtab_bsd.c
index a3077b12f7c6fd8e16533bef3e1506242bfd88e8..203a265e13afde1867e0df3f8a4b422366e0c838 100644 (file)
--- a/conf/mtab/mtab_bsd.c
+++ b/conf/mtab/mtab_bsd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_file.c b/conf/mtab/mtab_file.c
index a778505b8f7323d3cd393794e74ccd120efd3181..5004ef5f0e681abb205b57cece0279d42e93711a 100644 (file)
--- a/conf/mtab/mtab_file.c
+++ b/conf/mtab/mtab_file.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_isc3.c b/conf/mtab/mtab_isc3.c
index 0752b927a27e99fe4cb1cfc2512c656506f66d35..9c8df1bae7d8e3d302bb13f6e375f8a2de2b7509 100644 (file)
--- a/conf/mtab/mtab_isc3.c
+++ b/conf/mtab/mtab_isc3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_linux.c b/conf/mtab/mtab_linux.c
index 46aa9831352a8c4c2d50de49228f06452276c931..829c97a57a3596d0bcef9d33c2e0e413735de506 100644 (file)
--- a/conf/mtab/mtab_linux.c
+++ b/conf/mtab/mtab_linux.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_mach3.c b/conf/mtab/mtab_mach3.c
index f7bc425c08a2cfca3cf91abd0230c0632cf5cc3c..af1313d3d8daaa1e3d3a5b4cc5aca92fa1a32258 100644 (file)
--- a/conf/mtab/mtab_mach3.c
+++ b/conf/mtab/mtab_mach3.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_osf.c b/conf/mtab/mtab_osf.c
index 22cd82908d6316037a4e3382d22fddbd5a97b2c8..b9a1de533234cac44cfe01358750297f89d1c64f 100644 (file)
--- a/conf/mtab/mtab_osf.c
+++ b/conf/mtab/mtab_osf.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_svr4.c b/conf/mtab/mtab_svr4.c
index 00ba7a6ca7ab262c72f7b7a20cd65b088d0a9be4..b9a310a1903c70c43fd414bc98d4985628f2fdbc 100644 (file)
--- a/conf/mtab/mtab_svr4.c
+++ b/conf/mtab/mtab_svr4.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/mtab/mtab_ultrix.c b/conf/mtab/mtab_ultrix.c
index eff6b664373e3057baf400a3c3efd9e50a587636..ea0eed6e8cf50384d9d058b43d117b5d5925d47c 100644 (file)
--- a/conf/mtab/mtab_ultrix.c
+++ b/conf/mtab/mtab_ultrix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix3.h b/conf/nfs_prot/nfs_prot_aix3.h
index d6a0b43fe8f0a4fa1436b43be005a3e3d5182e11..360f14a780379254c745ccfa36667420a8d2c28f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix3.h
+++ b/conf/nfs_prot/nfs_prot_aix3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix4.h b/conf/nfs_prot/nfs_prot_aix4.h
index 31e3712340fb9948061f66810888da9737466269..44f07eb4ecade56b3a3505f7b2a062e3073264c3 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix4.h
+++ b/conf/nfs_prot/nfs_prot_aix4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix4_2.h b/conf/nfs_prot/nfs_prot_aix4_2.h
index f15fc76cb6b7b027d658465fcbf157e7e96dd1b0..40acae9369e4372b02ab7f64c35dddc36f3981fc 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix4_2.h
+++ b/conf/nfs_prot/nfs_prot_aix4_2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix4_3.h b/conf/nfs_prot/nfs_prot_aix4_3.h
index 17c4bfa41a0a56b26f245e2f7bb856df6e2aac53..442cd174e3e53c904bcc727e755a62b485bac3db 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix4_3.h
+++ b/conf/nfs_prot/nfs_prot_aix4_3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix5_1.h b/conf/nfs_prot/nfs_prot_aix5_1.h
index 3cc237c73a384be186bfd3a5104bcefb7d20245e..a4e67d0fc5f8109c5abe0c98593de61638319101 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix5_1.h
+++ b/conf/nfs_prot/nfs_prot_aix5_1.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_aix5_2.h b/conf/nfs_prot/nfs_prot_aix5_2.h
index cac851f883fb27dff390107949d548e76db17cbf..887379055f1bd4791e8ed9c2e90785f018ff000a 100644 (file)
--- a/conf/nfs_prot/nfs_prot_aix5_2.h
+++ b/conf/nfs_prot/nfs_prot_aix5_2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_bsdi2.h b/conf/nfs_prot/nfs_prot_bsdi2.h
index d47c564d48ef63e5a0fe466aa3e8a0dc00bd98c3..74866e062bafb3fa99bcdaae6e67d01a8f00553b 100644 (file)
--- a/conf/nfs_prot/nfs_prot_bsdi2.h
+++ b/conf/nfs_prot/nfs_prot_bsdi2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_bsdi3.h b/conf/nfs_prot/nfs_prot_bsdi3.h
index cff472f806bc87f25da9ed312e40b0629f216556..5e387acfcb7c50d0508eea22350e0ea57319f2e4 100644 (file)
--- a/conf/nfs_prot/nfs_prot_bsdi3.h
+++ b/conf/nfs_prot/nfs_prot_bsdi3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_darwin.h b/conf/nfs_prot/nfs_prot_darwin.h
index ec87205a507505a54880a1f8914df7c26db5c7a4..a505254a4561bd85e2fb9345766d68f83d8ea07d 100644 (file)
--- a/conf/nfs_prot/nfs_prot_darwin.h
+++ b/conf/nfs_prot/nfs_prot_darwin.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_default.h b/conf/nfs_prot/nfs_prot_default.h
index 455da3fd6397349d0d33b348855d4524739ee8d3..c5f047d99bf31145f1ccdb63508ad1371994f2c3 100644 (file)
--- a/conf/nfs_prot/nfs_prot_default.h
+++ b/conf/nfs_prot/nfs_prot_default.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_freebsd2.h b/conf/nfs_prot/nfs_prot_freebsd2.h
index 91f9e0ce145bdb1b03d17608d5ef5cb08c891f54..73661c9da3d8d40ad62ec9d953fff7b384d3ae67 100644 (file)
--- a/conf/nfs_prot/nfs_prot_freebsd2.h
+++ b/conf/nfs_prot/nfs_prot_freebsd2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_freebsd3.h b/conf/nfs_prot/nfs_prot_freebsd3.h
index 240c5946f141bd1c333ecfd0c245f81c857898af..51ac31d2aece387153fe7e3804fe01e5ba79d4c3 100644 (file)
--- a/conf/nfs_prot/nfs_prot_freebsd3.h
+++ b/conf/nfs_prot/nfs_prot_freebsd3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_hpux.h b/conf/nfs_prot/nfs_prot_hpux.h
index 55066e6af3b12592367cd91ed3e1bcc4320a29e5..9d64360afb5ede26037e49f69ee0e87921101ae7 100644 (file)
--- a/conf/nfs_prot/nfs_prot_hpux.h
+++ b/conf/nfs_prot/nfs_prot_hpux.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_hpux11.h b/conf/nfs_prot/nfs_prot_hpux11.h
index 0720bfce3cb8006761cc5e5193c4f1f41e34cdcd..0dd0286c63883c3e99c09f098243cfbd162a0339 100644 (file)
--- a/conf/nfs_prot/nfs_prot_hpux11.h
+++ b/conf/nfs_prot/nfs_prot_hpux11.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_irix5.h b/conf/nfs_prot/nfs_prot_irix5.h
index 053321b5fc5716fe3f593aa15cc77d5484fef490..de4312a4d40cd42b0fc91f9930dadd7eea715721 100644 (file)
--- a/conf/nfs_prot/nfs_prot_irix5.h
+++ b/conf/nfs_prot/nfs_prot_irix5.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_irix6.h b/conf/nfs_prot/nfs_prot_irix6.h
index 86b79c25997202b91aacbd978cb0c421ccdccddd..159dfe7ad6ffd6b2bda6ae9674912f3778fa455f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_irix6.h
+++ b/conf/nfs_prot/nfs_prot_irix6.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_linux.h b/conf/nfs_prot/nfs_prot_linux.h
index 1da4f37eddfe7cc63266ab7cc42b8426f812fad1..7ccf18f00202f4af22e1b7cedcc2b2963c581943 100644 (file)
--- a/conf/nfs_prot/nfs_prot_linux.h
+++ b/conf/nfs_prot/nfs_prot_linux.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_ncr2.h b/conf/nfs_prot/nfs_prot_ncr2.h
index 8e682c190bbc8dc9746708b0a0b4784a16c6845b..7e64f5c692de3facd2d2352cb9b1f21d7c9225de 100644 (file)
--- a/conf/nfs_prot/nfs_prot_ncr2.h
+++ b/conf/nfs_prot/nfs_prot_ncr2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_netbsd.h b/conf/nfs_prot/nfs_prot_netbsd.h
index f5b13686a9c0c968e818fb2df18446a3d52ca781..c134240a54d5a8be2d8f5c4aa5ef8ecf285df220 100644 (file)
--- a/conf/nfs_prot/nfs_prot_netbsd.h
+++ b/conf/nfs_prot/nfs_prot_netbsd.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_netbsd1_3.h b/conf/nfs_prot/nfs_prot_netbsd1_3.h
index 6adc4f56d74c62f99d8923e7b7172d956f34451a..7fbd3a7a4fbd590ecd119718d4cf8c030070c26f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_netbsd1_3.h
+++ b/conf/nfs_prot/nfs_prot_netbsd1_3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_netbsd1_4.h b/conf/nfs_prot/nfs_prot_netbsd1_4.h
index 67e2d62e70fb33b795a224c0c7296ca035ba01a1..3bee9fc6d91db1983a6eb4158a617ffe41fee71b 100644 (file)
--- a/conf/nfs_prot/nfs_prot_netbsd1_4.h
+++ b/conf/nfs_prot/nfs_prot_netbsd1_4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_nextstep.h b/conf/nfs_prot/nfs_prot_nextstep.h
index 93638b651a549281360e1f94122eec17bb9e93e0..fadc004cedf9537c4a53076d56383b1ff897001a 100644 (file)
--- a/conf/nfs_prot/nfs_prot_nextstep.h
+++ b/conf/nfs_prot/nfs_prot_nextstep.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_openbsd.h b/conf/nfs_prot/nfs_prot_openbsd.h
index 5988d0030195d6f42c27b33c91f73d4d4eaf1946..e469784515385582cda62692ceb7408401ca0891 100644 (file)
--- a/conf/nfs_prot/nfs_prot_openbsd.h
+++ b/conf/nfs_prot/nfs_prot_openbsd.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_osf2.h b/conf/nfs_prot/nfs_prot_osf2.h
index 1aad11c045feb3e270539eabdbfea8b856144a18..82f8f38f0e81374a391faf3dee6222480fe24a5b 100644 (file)
--- a/conf/nfs_prot/nfs_prot_osf2.h
+++ b/conf/nfs_prot/nfs_prot_osf2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_osf4.h b/conf/nfs_prot/nfs_prot_osf4.h
index 05fc9ee25f2068b1dbefcf9b8ea82d2594f6760d..db74b4aa009da30f6ca3c5dc36b55a3e608fb7ec 100644 (file)
--- a/conf/nfs_prot/nfs_prot_osf4.h
+++ b/conf/nfs_prot/nfs_prot_osf4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_osf5.h b/conf/nfs_prot/nfs_prot_osf5.h
index 384e4c83885a57fda6ff10bd2e8613d4dc1c5a50..f091a7a2d61c5ff881651a216ecbd2c168efbc7a 100644 (file)
--- a/conf/nfs_prot/nfs_prot_osf5.h
+++ b/conf/nfs_prot/nfs_prot_osf5.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos3.h b/conf/nfs_prot/nfs_prot_sunos3.h
index 8593230f404038c13c6efd7c967b0236c5278b12..557a2ccbbd75225e273917159e4660d9b11a7560 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos3.h
+++ b/conf/nfs_prot/nfs_prot_sunos3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos4.h b/conf/nfs_prot/nfs_prot_sunos4.h
index 92349ed78eca848b4c34347a69f1bfea0efd588d..c32edd3632b86396076691408ca9fc28eb6571f3 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos4.h
+++ b/conf/nfs_prot/nfs_prot_sunos4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_3.h b/conf/nfs_prot/nfs_prot_sunos5_3.h
index dc61e5dfc596957583d6ff87a77676f16059f5ba..da760dfe0f4684545e1f7ecf70a33bb10b720f3f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_3.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_3.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_4.h b/conf/nfs_prot/nfs_prot_sunos5_4.h
index 2b2a9d5f62472209c2a75a1c45612909508d7eb7..25dc58b896dcf96e93bbd86384ccdecfe20ca3da 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_4.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_5.h b/conf/nfs_prot/nfs_prot_sunos5_5.h
index b9d896e9906b56954437df171734e0d2f301cc65..6e31ddc242d931dd30fdd85702abfa4cae8aee1c 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_5.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_5.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_6.h b/conf/nfs_prot/nfs_prot_sunos5_6.h
index 7848b114a36a39bdf04a51dd761dba466491b032..36f613f3f7a308e1ee0f8c5b4f8a74205385715f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_6.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_6.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_7.h b/conf/nfs_prot/nfs_prot_sunos5_7.h
index e3b22bc3e5c3e6c2279f6f83a80d46ee24eee000..3d0d30f823a1c6252f6991c9373c5a0e6b202960 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_7.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_7.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_sunos5_8.h b/conf/nfs_prot/nfs_prot_sunos5_8.h
index 8b8655c14e29c1e2924eaaf8e978745c8b4b76c9..2108a71f6fcfae07ab8e5dcf2a2d8baf60b7fb0f 100644 (file)
--- a/conf/nfs_prot/nfs_prot_sunos5_8.h
+++ b/conf/nfs_prot/nfs_prot_sunos5_8.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_svr4.h b/conf/nfs_prot/nfs_prot_svr4.h
index b09335d7df64f4e8860eb7ff3cd9dae0200f1645..09a478745493b72556ddb91283a864fd4230d601 100644 (file)
--- a/conf/nfs_prot/nfs_prot_svr4.h
+++ b/conf/nfs_prot/nfs_prot_svr4.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/nfs_prot/nfs_prot_ultrix.h b/conf/nfs_prot/nfs_prot_ultrix.h
index d0e1d9f58e16aff4daa4779f0d6fb0cf40bacd42..216216beb7558b45f6c798d4513420a08be2377a 100644 (file)
--- a/conf/nfs_prot/nfs_prot_ultrix.h
+++ b/conf/nfs_prot/nfs_prot_ultrix.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/transp/transp_sockets.c b/conf/transp/transp_sockets.c
index 4fefd1ff9d8b24feba5f67646cc4e55524a22576..4b6d9ebb186628e9e60b2e5d697220e554f2cfd2 100644 (file)
--- a/conf/transp/transp_sockets.c
+++ b/conf/transp/transp_sockets.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/transp/transp_tli.c b/conf/transp/transp_tli.c
index df31d47c5b2227cb5bc9998b658f00d27e9cc8bc..8ec32d748ddd5586987ae1796a319f5332ce3560 100644 (file)
--- a/conf/transp/transp_tli.c
+++ b/conf/transp/transp_tli.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/umount/umount_aix.c b/conf/umount/umount_aix.c
index 3fea87dade378f1713cc198b3695cb935ced52fa..f863681ffc4217c12c2258086474ee92f499ae26 100644 (file)
--- a/conf/umount/umount_aix.c
+++ b/conf/umount/umount_aix.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/umount/umount_bsd44.c b/conf/umount/umount_bsd44.c
index 3195658ebfd2632913ffe76520945c1ea72b40f5..da44129779897fbacd39e8531dcca21e484e7705 100644 (file)
--- a/conf/umount/umount_bsd44.c
+++ b/conf/umount/umount_bsd44.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/umount/umount_default.c b/conf/umount/umount_default.c
index e0b7b850e8582bf0b111d23e84f9ceb6c69f3842..8319416e527a602075f289b12811cdc2606a167f 100644 (file)
--- a/conf/umount/umount_default.c
+++ b/conf/umount/umount_default.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/umount/umount_linux.c b/conf/umount/umount_linux.c
index a00798dae92ed5eb0e46103d47ab9db28903ffae..ea0e4e318c1ff3d2c4b267e6b58d1f89ef5e3764 100644 (file)
--- a/conf/umount/umount_linux.c
+++ b/conf/umount/umount_linux.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/conf/umount/umount_osf.c b/conf/umount/umount_osf.c
index 625d5a44d857f6af5e98de47f97d47e25e8517a3..1aeea1cdfba4b2c4e077dbe9cb447585be89fd82 100644 (file)
--- a/conf/umount/umount_osf.c
+++ b/conf/umount/umount_osf.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/doc/am-utils.texi b/doc/am-utils.texi
index 08e0e56ec0a79a6112ec013b7a2b67e0a73700a9..97ddf3e35474d5e894b3769a41afff5c0b29973d 100644 (file)
--- a/doc/am-utils.texi
+++ b/doc/am-utils.texi
@@ -17,11 +17,7 @@
 @c 2. Redistributions in binary form must reproduce the above copyright
 @c    notice, this list of conditions and the following disclaimer in the
 @c    documentation and/or other materials provided with the distribution.
-@c 3. All advertising materials mentioning features or use of this software
-@c    must display the following acknowledgment:
-@c      This product includes software developed by the University of
-@c      California, Berkeley and its contributors.
-@c 4. Neither the name of the University nor the names of its contributors
+@c 3. Neither the name of the University nor the names of its contributors
 @c    may be used to endorse or promote products derived from this software
 @c    without specific prior written permission.
 @c
@@ -178,16 +174,6 @@ Redistributions in binary form must reproduce the above copyright
 notice, this list of conditions and the following disclaimer in the
 documentation and/or other materials provided with the distribution.
 
-@item
-All advertising materials mentioning features or use of this software
-must display the following acknowledgment:
-
-@cartouche
-``This product includes software developed by the University of
-California, Berkeley and its contributors, as well as the Trustees of
-Columbia University.''
-@end cartouche
-
 @item
 Neither the name of the University nor the names of its contributors may
 be used to endorse or promote products derived from this software

diff --git a/fixmount/fixmount.8 b/fixmount/fixmount.8
index eb76bdcd427aa03ed775c7826071c9bbbb9bf654..0c61ffab268bf33c88ef76099850995485485c5a 100644 (file)
--- a/fixmount/fixmount.8
+++ b/fixmount/fixmount.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/fixmount/fixmount.c b/fixmount/fixmount.c
index 93d759958e682e39467026378b42cd16ac02065e..9465f30d7584be0397061f7370a4c0d2350bbf5f 100644 (file)
--- a/fixmount/fixmount.c
+++ b/fixmount/fixmount.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_analyze.c b/fsinfo/fsi_analyze.c
index 9b30873471ec478c3119b3657f252add4a8677b2..78598b8546473a51b924767bffa8013f8a9c46bc 100644 (file)
--- a/fsinfo/fsi_analyze.c
+++ b/fsinfo/fsi_analyze.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_data.h b/fsinfo/fsi_data.h
index 9ae3c8003bd25cfd15b85fbdf73c43cf4f188439..4cc341d85a69a7974cc077f56fd2030f6eb94355 100644 (file)
--- a/fsinfo/fsi_data.h
+++ b/fsinfo/fsi_data.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_dict.c b/fsinfo/fsi_dict.c
index efcd4467954e4e72e3935b142ab03efddda5ee09..b909783b61eb87f3dd860e3cbe5a0ca41179944d 100644 (file)
--- a/fsinfo/fsi_dict.c
+++ b/fsinfo/fsi_dict.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_gram.y b/fsinfo/fsi_gram.y
index a00038cb33c9255bcee9768a6c27cf607fb2c760..85d19aa5cdab4debb6083f74da563c44d0e14301 100644 (file)
--- a/fsinfo/fsi_gram.y
+++ b/fsinfo/fsi_gram.y
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_lex.l b/fsinfo/fsi_lex.l
index fee87c57bde59fc5526c3da86cfc6a764df11f8d..4d09e2c55e74c3e0693d4dbd40c58f8b0f79d6d6 100644 (file)
--- a/fsinfo/fsi_lex.l
+++ b/fsinfo/fsi_lex.l
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsi_util.c b/fsinfo/fsi_util.c
index 1432b3f019ab897363470e1c461670bc31f11338..f8ff313cc4261566f3a5c945fefad458af4f9426 100644 (file)
--- a/fsinfo/fsi_util.c
+++ b/fsinfo/fsi_util.c
@@ -13,11 +13,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsinfo.8 b/fsinfo/fsinfo.8
index 0e775b6c4d97a6cb27484ba272fc8b12bb7e097f..e47af86f768baf7576d478efe8709fe3f6597093 100644 (file)
--- a/fsinfo/fsinfo.8
+++ b/fsinfo/fsinfo.8
@@ -12,11 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/fsinfo/fsinfo.c b/fsinfo/fsinfo.c
index 3e5bf228669395094702eecef8ab652e2c88f553..93122eabbbb20ada09f7a9115411d90a9dab6440 100644 (file)
--- a/fsinfo/fsinfo.c
+++ b/fsinfo/fsinfo.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/fsinfo.h b/fsinfo/fsinfo.h
index af15d7bbaf5f8280970d37742ca673a1c94dcf8e..7a871631a0c61a490948c0ced09b041adc83f119 100644 (file)
--- a/fsinfo/fsinfo.h
+++ b/fsinfo/fsinfo.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/wr_atab.c b/fsinfo/wr_atab.c
index de448c6fc88a33afa6aed42916fd56aa8faf87de..ac132aa76dc49a68e989b6c96a23f0c9324e2319 100644 (file)
--- a/fsinfo/wr_atab.c
+++ b/fsinfo/wr_atab.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/wr_bparam.c b/fsinfo/wr_bparam.c
index 5caf59fa41c83170d8f585496b10b99a0341c783..00befa9cf582f00d634d664d8cc93975f199c8fe 100644 (file)
--- a/fsinfo/wr_bparam.c
+++ b/fsinfo/wr_bparam.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/wr_dumpset.c b/fsinfo/wr_dumpset.c
index a180d9e588bda4227e76f15454030735550f1e13..916f95a5a23da5bcc196aa201972cfa28d5f2e46 100644 (file)
--- a/fsinfo/wr_dumpset.c
+++ b/fsinfo/wr_dumpset.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/wr_exportfs.c b/fsinfo/wr_exportfs.c
index ca095f082a87f634770aeaac5a1a66a82ec85f62..c6e7936dd16d8613b594bb8bcebcb4b0fae16c6c 100644 (file)
--- a/fsinfo/wr_exportfs.c
+++ b/fsinfo/wr_exportfs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/fsinfo/wr_fstab.c b/fsinfo/wr_fstab.c
index 726fcfaa81abe038e4c0e6b66839fc833e17f61f..166353eb00f1a8955127b55cc464e08b30787ec0 100644 (file)
--- a/fsinfo/wr_fstab.c
+++ b/fsinfo/wr_fstab.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/hlfsd/hlfsd.8 b/hlfsd/hlfsd.8
index 2376a8f20ccc0a52e6c5757ee4b3d1d4d701a2e5..aadc8e716f805ec085642c819c8dfa8b719d95f0 100644 (file)
--- a/hlfsd/hlfsd.8
+++ b/hlfsd/hlfsd.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/hlfsd/hlfsd.c b/hlfsd/hlfsd.c
index 480318479dc04c6f773f529bdb679c40d2759a5c..6800e77e2f4cd15ba3f71cb1fff74f3d0520eb28 100644 (file)
--- a/hlfsd/hlfsd.c
+++ b/hlfsd/hlfsd.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/hlfsd/hlfsd.h b/hlfsd/hlfsd.h
index ea02f8f533c8fa472ef9863c6d4b76535418c942..d5eefedfa61b796aef2b8b575bc3439bec4fd22d 100644 (file)
--- a/hlfsd/hlfsd.h
+++ b/hlfsd/hlfsd.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/hlfsd/homedir.c b/hlfsd/homedir.c
index 4647ef08ddb9622c330f577f867271fb60876844..462b42380ca30657198a30e60fa2d4c71bad5bb4 100644 (file)
--- a/hlfsd/homedir.c
+++ b/hlfsd/homedir.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/hlfsd/nfs_prot_svc.c b/hlfsd/nfs_prot_svc.c
index 703bc03880ab5b8d878f6653f0581741fbe957ff..babaa846a224bc766b56cb684e2d656aa2f56788 100644 (file)
--- a/hlfsd/nfs_prot_svc.c
+++ b/hlfsd/nfs_prot_svc.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/hlfsd/stubs.c b/hlfsd/stubs.c
index a9fe8684a566022d6fa6fa4e560c80cfc50abc52..b26e5f4dc637ef04a12caeaf143bcc71a5b1ea68 100644 (file)
--- a/hlfsd/stubs.c
+++ b/hlfsd/stubs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/am_compat.h b/include/am_compat.h
index b0cfe9da6efb77caa1de2709c0ff548522fddb96..3463f3fa591c2ef2c62d524538dc6e3cb32e3b23 100644 (file)
--- a/include/am_compat.h
+++ b/include/am_compat.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/am_defs.h b/include/am_defs.h
index 97a205786e66da87489d2e26dee1fd0fb0ff372e..0e7f0099517fdccd0d489b807b04053003a849ad 100644 (file)
--- a/include/am_defs.h
+++ b/include/am_defs.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/am_utils.h b/include/am_utils.h
index 08f9102e4f7a396a396696c9950608c2b7094c48..4b245e5a295a657b3cbab80448870bdaa0fa90f7 100644 (file)
--- a/include/am_utils.h
+++ b/include/am_utils.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/am_xdr_func.h b/include/am_xdr_func.h
index d6412543dabf12c98befb6a862ffdfc6b5582df3..1803c02db93c38c1a4fb815b6165ec98e2222b40 100644 (file)
--- a/include/am_xdr_func.h
+++ b/include/am_xdr_func.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/amq_defs.h b/include/amq_defs.h
index 87702a69d5cfd69b38d61538f068b9b1f81991b7..89f61805fc6093eba0e7a7462c8d57948c2e3724 100644 (file)
--- a/include/amq_defs.h
+++ b/include/amq_defs.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/mount_headers1.h b/include/mount_headers1.h
index 5ddc6257268a24f6aef42c5f3e6d46105baa72a4..7d518a06aa26c01a134467420dfaea2b1e39c640 100644 (file)
--- a/include/mount_headers1.h
+++ b/include/mount_headers1.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/mount_headers2.h b/include/mount_headers2.h
index 8e506f790a0dad4372036ce8ecf7459882f2226e..87bf18efd8bb74c210a7bd2c10cb716011051786 100644 (file)
--- a/include/mount_headers2.h
+++ b/include/mount_headers2.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/include/nfs_common.h b/include/nfs_common.h
index 544e93c02581ffcd18064fefdc1853abd1a81aae..d89632b59330b3528245209e1304b942f2da5743 100644 (file)
--- a/include/nfs_common.h
+++ b/include/nfs_common.h
@@ -10,11 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/amu.h b/libamu/amu.h
index 3e351fa26d53854a821c9463c937b8a48b22333d..9415fc404ea4254698cbcbdf9658bafc648aaab5 100644 (file)
--- a/libamu/amu.h
+++ b/libamu/amu.h
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/clnt_sperrno.c b/libamu/clnt_sperrno.c
index 10235762e7a20ee3143efcbc41db3b3f3194d0bd..b19c15199b3863224de10c9606f4e865195e2c7a 100644 (file)
--- a/libamu/clnt_sperrno.c
+++ b/libamu/clnt_sperrno.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/hasmntopt.c b/libamu/hasmntopt.c
index 5025d4154be6dd0c1a9f33c92baafd0c1d73f772..e5a6f2e80dfeba16a2a18f335c78c549b6dd9ad5 100644 (file)
--- a/libamu/hasmntopt.c
+++ b/libamu/hasmntopt.c
@@ -16,11 +16,7 @@ n * modification, are permitted provided that the following conditions
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/memcmp.c b/libamu/memcmp.c
index 4992cb30fc8ada3cea7b309bfb9fe930197744ab..62099183616079ac97349baacebfb6b23ca2bb68 100644 (file)
--- a/libamu/memcmp.c
+++ b/libamu/memcmp.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/misc_rpc.c b/libamu/misc_rpc.c
index b9526c991088684362eba9a02a6c75f55de91b55..c6ad4486d7d9e14fca2674fc81720698a142d614 100644 (file)
--- a/libamu/misc_rpc.c
+++ b/libamu/misc_rpc.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c
index 2039937ea7d12332c4ca737b7baa306f9c2ebbca..09d1cd9e322b6bb6072711b150793a6380c0e9f2 100644 (file)
--- a/libamu/mount_fs.c
+++ b/libamu/mount_fs.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/mtab.c b/libamu/mtab.c
index f874b9704c47d370944c4f4d814b842052e32f88..ee603af34359240c50710ae646deb36d71b5ea73 100644 (file)
--- a/libamu/mtab.c
+++ b/libamu/mtab.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/nfs_prot_xdr.c b/libamu/nfs_prot_xdr.c
index 1c25c02c311548a6c857611816f112c1adf7de21..bfdc7b2492a32f98133968c4f6b9a81a0349e7d3 100644 (file)
--- a/libamu/nfs_prot_xdr.c
+++ b/libamu/nfs_prot_xdr.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strcasecmp.c b/libamu/strcasecmp.c
index 6209974acf95484c5fcfcb9920b08172b3af798a..3947a94851b7b1f14f1302c90e352c845dc64f13 100644 (file)
--- a/libamu/strcasecmp.c
+++ b/libamu/strcasecmp.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strerror.c b/libamu/strerror.c
index 6758caa649203c1bc3e7297bbe3d2688b3a27bf7..faf2916f31e6e199748661cd124593149b63fca5 100644 (file)
--- a/libamu/strerror.c
+++ b/libamu/strerror.c
@@ -17,11 +17,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strlcat.c b/libamu/strlcat.c
index cdf65bef24fcf05d25a6740388fcdd7269de9988..154eaa8eae40532454c59a04c4d8815ae6cdbd30 100644 (file)
--- a/libamu/strlcat.c
+++ b/libamu/strlcat.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strlcpy.c b/libamu/strlcpy.c
index ba249efe3d0c844a9a2e198177c5796b540f5ca4..f0c4f6782e62bb4a5dabb3d48dd23f9952f7b814 100644 (file)
--- a/libamu/strlcpy.c
+++ b/libamu/strlcpy.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strstr.c b/libamu/strstr.c
index 020cfed8bbeb12c6bd8cfacc2e8f270b1f9ea2bb..bd89991dda11c42c65bd0ea09fadf7004f37176a 100644 (file)
--- a/libamu/strstr.c
+++ b/libamu/strstr.c
@@ -15,11 +15,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/strutil.c b/libamu/strutil.c
index 21b501ef3d93b487c25d9da4382c9ca7f74fd3ae..03a8e88f608088c305ff519053d95d784bd32724 100644 (file)
--- a/libamu/strutil.c
+++ b/libamu/strutil.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/ualarm.c b/libamu/ualarm.c
index c4962bdb9f2359b4b7c4e7e40b18155fe05208ea..86280d92b75a238a8ef2648f904a8c6851da7ea2 100644 (file)
--- a/libamu/ualarm.c
+++ b/libamu/ualarm.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/wire.c b/libamu/wire.c
index f9047cb8917a2f2a04c112355d15fb8bd12f6d63..c9da0fe276a5d297e66a32325e1684a2579282e8 100644 (file)
--- a/libamu/wire.c
+++ b/libamu/wire.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/xdr_func.c b/libamu/xdr_func.c
index 93cb347380e82379f3f1193c43d2e255479ea66a..3f876bcea3f45e71a29c465dcb9c94c6c1133555 100644 (file)
--- a/libamu/xdr_func.c
+++ b/libamu/xdr_func.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/libamu/xutil.c b/libamu/xutil.c
index 1068f690a9465fe6a5acd07af495b599d0b946e6..28286f6111fdf47bebb26f4ad0522f54a44968ca 100644 (file)
--- a/libamu/xutil.c
+++ b/libamu/xutil.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/mk-amd-map/mk-amd-map.8 b/mk-amd-map/mk-amd-map.8
index 3b14b010847c37160c926f43efc3bca50e4abe92..f468f7acc6879e9809617f305a7bba954f5a3d27 100644 (file)
--- a/mk-amd-map/mk-amd-map.8
+++ b/mk-amd-map/mk-amd-map.8
@@ -12,11 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"    This product includes software developed by the University of
-.\"    California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/mk-amd-map/mk-amd-map.c b/mk-amd-map/mk-amd-map.c
index 1596cc680f7628e29e41e2196109a6a2d82b7905..e6ca9d93983dfb5cdf0e95b1ac8513cfedb1fc8d 100644 (file)
--- a/mk-amd-map/mk-amd-map.c
+++ b/mk-amd-map/mk-amd-map.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *

diff --git a/scripts/amd.conf.5 b/scripts/amd.conf.5
index 01aefa949e1c787c38d75b78cd4254bf305343bd..2fa4334b314a8d7ff8d73c504fe7786a084a1b23 100644 (file)
--- a/scripts/amd.conf.5
+++ b/scripts/amd.conf.5
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/scripts/automount2amd.8 b/scripts/automount2amd.8
index edffc1c90310448d9f9b315b7ec9610d9ef4dce0..f9a04d928cd1f4cfdf4a52ddc7ef8428a97cc6d8 100644 (file)
--- a/scripts/automount2amd.8
+++ b/scripts/automount2amd.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/wire-test/wire-test.8 b/wire-test/wire-test.8
index 16248f767dd60ab161532f68d9f52590dbace42e..be08e9685d7797ded137eeb15eca48f789ca516b 100644 (file)
--- a/wire-test/wire-test.8
+++ b/wire-test/wire-test.8
@@ -16,11 +16,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgment:
-.\"      This product includes software developed by the University of
-.\"      California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"

diff --git a/wire-test/wire-test.c b/wire-test/wire-test.c
index b204bb5047a4c5f9354dee9658969421d0770a4c..0adcf5d66665ce343660c1fcfdc542fc1cda832b 100644 (file)
--- a/wire-test/wire-test.c
+++ b/wire-test/wire-test.c
@@ -16,11 +16,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *