summaryrefslogtreecommitdiff
path: root/usr.bin/pr
diff options
context:
space:
mode:
authorEitan Adler <eadler@FreeBSD.org>2017-11-30 07:08:45 +0000
committerEitan Adler <eadler@FreeBSD.org>2017-11-30 07:08:45 +0000
commit86fdf1748d9e6d444e2a37e82d75f231f74503da (patch)
treedc15c519eae3885a1548f5843fa98d60b9eb7c83 /usr.bin/pr
parentf02a303122e991b58fc96b936663849f9ac22617 (diff)
downloadsrc-test-86fdf1748d9e6d444e2a37e82d75f231f74503da.tar.gz
src-test-86fdf1748d9e6d444e2a37e82d75f231f74503da.zip
Remove advertising clause from pr(1)
Permitted by https://www.freebsd.org/copyright/license.html Renumber 4->3 to be consistent with other files
Notes
Notes: svn path=/head/; revision=326385
Diffstat (limited to 'usr.bin/pr')
-rw-r--r--usr.bin/pr/egetopt.c8
-rw-r--r--usr.bin/pr/extern.h7
-rw-r--r--usr.bin/pr/pr.c8
-rw-r--r--usr.bin/pr/pr.h8
4 files changed, 8 insertions, 23 deletions
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 4c60204c10e07..7625bc12d4a56 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -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 acknowledgement:
- * 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/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index b44eb41877576..6af612177227f 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -16,11 +16,8 @@
* 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 acknowledgement:
- * 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/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index cc6d290ca4c2a..0f51fab703d51 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -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 acknowledgement:
- * 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/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index 2c9e50f6b4fae..8cf9859a78102 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-3-Clause
*
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -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 acknowledgement:
- * 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.
*