Author: eadler Date: Thu Nov 30 07:08:45 2017 New Revision: 326385 URL: https://svnweb.freebsd.org/changeset/base/326385
Log: Remove advertising clause from pr(1) Permitted by https://www.freebsd.org/copyright/license.html Renumber 4->3 to be consistent with other files Modified: head/usr.bin/pr/egetopt.c head/usr.bin/pr/extern.h head/usr.bin/pr/pr.c head/usr.bin/pr/pr.h Modified: head/usr.bin/pr/egetopt.c ============================================================================== --- head/usr.bin/pr/egetopt.c Thu Nov 30 05:01:56 2017 (r326384) +++ head/usr.bin/pr/egetopt.c Thu Nov 30 07:08:45 2017 (r326385) @@ -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. * Modified: head/usr.bin/pr/extern.h ============================================================================== --- head/usr.bin/pr/extern.h Thu Nov 30 05:01:56 2017 (r326384) +++ head/usr.bin/pr/extern.h Thu Nov 30 07:08:45 2017 (r326385) @@ -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. * Modified: head/usr.bin/pr/pr.c ============================================================================== --- head/usr.bin/pr/pr.c Thu Nov 30 05:01:56 2017 (r326384) +++ head/usr.bin/pr/pr.c Thu Nov 30 07:08:45 2017 (r326385) @@ -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. * Modified: head/usr.bin/pr/pr.h ============================================================================== --- head/usr.bin/pr/pr.h Thu Nov 30 05:01:56 2017 (r326384) +++ head/usr.bin/pr/pr.h Thu Nov 30 07:08:45 2017 (r326385) @@ -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. * _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
