summaryrefslogtreecommitdiff
path: root/usr.bin/printf
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
committeragc <agc@NetBSD.org>2003-08-07 11:13:06 +0000
commit89aaa1bb64ba8db54daf131749fe578e804d9382 (patch)
tree57ca36a9ec77286fc0094f173063d9b41f7f765b /usr.bin/printf
parent075022b349321510ad14036d70908681ed02f117 (diff)
Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22365, verified by myself.
Diffstat (limited to 'usr.bin/printf')
-rw-r--r--usr.bin/printf/printf.18
-rw-r--r--usr.bin/printf/printf.c10
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 76afe0c3dc2..408c260a757 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: printf.1,v 1.19 2003/04/28 09:38:19 wiz Exp $
+.\" $NetBSD: printf.1,v 1.20 2003/08/07 11:15:32 agc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,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/printf/printf.c b/usr.bin/printf/printf.c
index ecc9a33a14c..9456f94d2d6 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.28 2003/06/25 12:56:59 dsl Exp $ */
+/* $NetBSD: printf.c,v 1.29 2003/08/07 11:15:33 agc Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -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 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.
*
@@ -45,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.28 2003/06/25 12:56:59 dsl Exp $");
+__RCSID("$NetBSD: printf.c,v 1.29 2003/08/07 11:15:33 agc Exp $");
#endif
#endif /* not lint */