[newlib-cygwin] Use remove-advertising-clause script to edit BSD licenses

Corinna Vinschen corinna@sourceware.org
Wed Jan 29 18:03:00 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9042d0ce65533a26fc3264206db5828d5692332c

commit 9042d0ce65533a26fc3264206db5828d5692332c
Author: Keith Packard <keithp@keithp.com>
Date:   Tue Jan 28 10:54:53 2020 -0800

    Use remove-advertising-clause script to edit BSD licenses
    
    This edits licenses held by Berkeley and NetBSD, both of which
    have removed the advertising requirement from their licenses.
    
    Signed-off-by: Keith Packard <keithp@keithp.com>

Diff:
---
 libgloss/i386/cygmon-gmon.c                          | 6 +-----
 libgloss/m32r/Makefile.in                            | 2 +-
 libgloss/nds32/Makefile.in                           | 2 +-
 libgloss/sparc/libsys/Makefile.in                    | 2 +-
 libgloss/sparc/libsys/configure.in                   | 2 +-
 libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h | 6 +-----
 libgloss/sparc_leon/asm-leon/queue.h                 | 6 +-----
 mkdep                                                | 2 +-
 newlib/libc/ctype/ctype_.c                           | 6 +-----
 newlib/libc/include/ar.h                             | 6 +-----
 newlib/libc/include/grp.h                            | 6 +-----
 newlib/libc/include/pwd.h                            | 6 +-----
 newlib/libc/include/stdio.h                          | 2 +-
 newlib/libc/include/sys/syslimits.h                  | 6 +-----
 newlib/libc/include/unctrl.h                         | 6 +-----
 newlib/libc/machine/hppa/DEFS.h                      | 2 +-
 newlib/libc/machine/powerpc/vfprintf.c               | 6 +-----
 newlib/libc/machine/powerpc/vfscanf.c                | 2 +-
 newlib/libc/machine/sparc/setjmp.S                   | 6 +-----
 newlib/libc/misc/unctrl.c                            | 6 +-----
 newlib/libc/posix/cclass.h                           | 6 +-----
 newlib/libc/posix/closedir.c                         | 6 +-----
 newlib/libc/posix/cname.h                            | 6 +-----
 newlib/libc/posix/fnmatch.3                          | 6 +-----
 newlib/libc/posix/glob.3                             | 6 +-----
 newlib/libc/posix/opendir.c                          | 6 +-----
 newlib/libc/posix/readdir.c                          | 6 +-----
 newlib/libc/posix/readdir_r.c                        | 6 +-----
 newlib/libc/posix/regex.3                            | 6 +-----
 newlib/libc/posix/regex2.h                           | 6 +-----
 newlib/libc/posix/rewinddir.c                        | 6 +-----
 newlib/libc/posix/seekdir.c                          | 6 +-----
 newlib/libc/posix/telldir.c                          | 6 +-----
 newlib/libc/posix/utils.h                            | 6 +-----
 newlib/libc/search/db_local.h                        | 6 +-----
 newlib/libc/search/extern.h                          | 6 +-----
 newlib/libc/search/hash.c                            | 6 +-----
 newlib/libc/search/hash.h                            | 6 +-----
 newlib/libc/search/hash_bigkey.c                     | 6 +-----
 newlib/libc/search/hash_buf.c                        | 6 +-----
 newlib/libc/search/hash_func.c                       | 6 +-----
 newlib/libc/search/hash_log2.c                       | 6 +-----
 newlib/libc/search/hash_page.c                       | 6 +-----
 newlib/libc/search/page.h                            | 6 +-----
 newlib/libc/stdio/asiprintf.c                        | 2 +-
 newlib/libc/stdio/asprintf.c                         | 2 +-
 newlib/libc/stdio/clearerr.c                         | 2 +-
 newlib/libc/stdio/fclose.c                           | 2 +-
 newlib/libc/stdio/fcloseall.c                        | 2 +-
 newlib/libc/stdio/fdopen.c                           | 2 +-
 newlib/libc/stdio/feof.c                             | 2 +-
 newlib/libc/stdio/ferror.c                           | 2 +-
 newlib/libc/stdio/fflush.c                           | 2 +-
 newlib/libc/stdio/fgetc.c                            | 2 +-
 newlib/libc/stdio/fgetpos.c                          | 2 +-
 newlib/libc/stdio/fgets.c                            | 2 +-
 newlib/libc/stdio/fileno.c                           | 2 +-
 newlib/libc/stdio/findfp.c                           | 2 +-
 newlib/libc/stdio/fiprintf.c                         | 2 +-
 newlib/libc/stdio/fiscanf.c                          | 2 +-
 newlib/libc/stdio/flags.c                            | 2 +-
 newlib/libc/stdio/floatio.h                          | 2 +-
 newlib/libc/stdio/fopen.c                            | 2 +-
 newlib/libc/stdio/fprintf.c                          | 2 +-
 newlib/libc/stdio/fputc.c                            | 2 +-
 newlib/libc/stdio/fputs.c                            | 2 +-
 newlib/libc/stdio/fread.c                            | 2 +-
 newlib/libc/stdio/freopen.c                          | 2 +-
 newlib/libc/stdio/fscanf.c                           | 2 +-
 newlib/libc/stdio/fseek.c                            | 2 +-
 newlib/libc/stdio/fseeko.c                           | 2 +-
 newlib/libc/stdio/fsetpos.c                          | 2 +-
 newlib/libc/stdio/ftell.c                            | 2 +-
 newlib/libc/stdio/ftello.c                           | 2 +-
 newlib/libc/stdio/fvwrite.c                          | 2 +-
 newlib/libc/stdio/fvwrite.h                          | 2 +-
 newlib/libc/stdio/fwalk.c                            | 2 +-
 newlib/libc/stdio/fwprintf.c                         | 2 +-
 newlib/libc/stdio/fwrite.c                           | 2 +-
 newlib/libc/stdio/fwscanf.c                          | 2 +-
 newlib/libc/stdio/getc.c                             | 2 +-
 newlib/libc/stdio/getc_u.c                           | 2 +-
 newlib/libc/stdio/getchar.c                          | 2 +-
 newlib/libc/stdio/getchar_u.c                        | 2 +-
 newlib/libc/stdio/gets.c                             | 2 +-
 newlib/libc/stdio/getw.c                             | 2 +-
 newlib/libc/stdio/iprintf.c                          | 2 +-
 newlib/libc/stdio/iscanf.c                           | 2 +-
 newlib/libc/stdio/local.h                            | 2 +-
 newlib/libc/stdio/makebuf.c                          | 2 +-
 newlib/libc/stdio/mktemp.c                           | 5 ++---
 newlib/libc/stdio/nano-vfscanf.c                     | 2 +-
 newlib/libc/stdio/nano-vfscanf_float.c               | 2 +-
 newlib/libc/stdio/nano-vfscanf_local.h               | 2 +-
 newlib/libc/stdio/perror.c                           | 2 +-
 newlib/libc/stdio/printf.c                           | 2 +-
 newlib/libc/stdio/putc.c                             | 2 +-
 newlib/libc/stdio/putc_u.c                           | 2 +-
 newlib/libc/stdio/putchar.c                          | 2 +-
 newlib/libc/stdio/putchar_u.c                        | 2 +-
 newlib/libc/stdio/puts.c                             | 2 +-
 newlib/libc/stdio/putw.c                             | 2 +-
 newlib/libc/stdio/refill.c                           | 2 +-
 newlib/libc/stdio/remove.c                           | 2 +-
 newlib/libc/stdio/rename.c                           | 2 +-
 newlib/libc/stdio/rewind.c                           | 2 +-
 newlib/libc/stdio/rget.c                             | 2 +-
 newlib/libc/stdio/scanf.c                            | 2 +-
 newlib/libc/stdio/sccl.c                             | 2 +-
 newlib/libc/stdio/setbuf.c                           | 2 +-
 newlib/libc/stdio/setbuffer.c                        | 2 +-
 newlib/libc/stdio/setlinebuf.c                       | 2 +-
 newlib/libc/stdio/setvbuf.c                          | 2 +-
 newlib/libc/stdio/siprintf.c                         | 2 +-
 newlib/libc/stdio/siscanf.c                          | 2 +-
 newlib/libc/stdio/sniprintf.c                        | 2 +-
 newlib/libc/stdio/snprintf.c                         | 2 +-
 newlib/libc/stdio/sprintf.c                          | 2 +-
 newlib/libc/stdio/sscanf.c                           | 2 +-
 newlib/libc/stdio/stdio.c                            | 2 +-
 newlib/libc/stdio/swprintf.c                         | 2 +-
 newlib/libc/stdio/swscanf.c                          | 2 +-
 newlib/libc/stdio/ungetc.c                           | 2 +-
 newlib/libc/stdio/vasiprintf.c                       | 2 +-
 newlib/libc/stdio/vasprintf.c                        | 2 +-
 newlib/libc/stdio/vfprintf.c                         | 6 +-----
 newlib/libc/stdio/vfscanf.c                          | 2 +-
 newlib/libc/stdio/vfwscanf.c                         | 2 +-
 newlib/libc/stdio/viprintf.c                         | 2 +-
 newlib/libc/stdio/viscanf.c                          | 2 +-
 newlib/libc/stdio/vprintf.c                          | 2 +-
 newlib/libc/stdio/vscanf.c                           | 2 +-
 newlib/libc/stdio/vsiprintf.c                        | 2 +-
 newlib/libc/stdio/vsiscanf.c                         | 2 +-
 newlib/libc/stdio/vsniprintf.c                       | 2 +-
 newlib/libc/stdio/vsnprintf.c                        | 2 +-
 newlib/libc/stdio/vsprintf.c                         | 2 +-
 newlib/libc/stdio/vsscanf.c                          | 2 +-
 newlib/libc/stdio/vswprintf.c                        | 2 +-
 newlib/libc/stdio/vswscanf.c                         | 2 +-
 newlib/libc/stdio/vwprintf.c                         | 2 +-
 newlib/libc/stdio/vwscanf.c                          | 2 +-
 newlib/libc/stdio/wbuf.c                             | 2 +-
 newlib/libc/stdio/wprintf.c                          | 2 +-
 newlib/libc/stdio/wscanf.c                           | 2 +-
 newlib/libc/stdio/wsetup.c                           | 2 +-
 newlib/libc/stdio64/fopen64.c                        | 2 +-
 newlib/libc/stdio64/freopen64.c                      | 2 +-
 newlib/libc/stdio64/fseeko64.c                       | 2 +-
 newlib/libc/stdio64/ftello64.c                       | 2 +-
 newlib/libc/stdio64/stdio64.c                        | 2 +-
 newlib/libc/stdlib/atoll.c                           | 6 +-----
 newlib/libc/stdlib/div.c                             | 6 +-----
 newlib/libc/stdlib/getenv.c                          | 5 ++---
 newlib/libc/stdlib/getenv_r.c                        | 5 ++---
 newlib/libc/stdlib/getsubopt.3                       | 6 +-----
 newlib/libc/stdlib/getsubopt.c                       | 6 +-----
 newlib/libc/stdlib/ldiv.c                            | 6 +-----
 newlib/libc/stdlib/putenv.c                          | 5 ++---
 newlib/libc/stdlib/putenv_r.c                        | 5 ++---
 newlib/libc/stdlib/setenv.c                          | 5 ++---
 newlib/libc/stdlib/setenv_r.c                        | 5 ++---
 newlib/libc/stdlib/strtol.c                          | 6 +-----
 newlib/libc/stdlib/strtoll.c                         | 6 +-----
 newlib/libc/stdlib/strtoul.c                         | 6 +-----
 newlib/libc/stdlib/strtoull.c                        | 6 +-----
 newlib/libc/stdlib/wcstol.c                          | 6 +-----
 newlib/libc/stdlib/wcstoll.c                         | 6 +-----
 newlib/libc/stdlib/wcstoul.c                         | 6 +-----
 newlib/libc/stdlib/wcstoull.c                        | 6 +-----
 newlib/libc/sys/linux/include/arpa/ftp.h             | 6 +-----
 newlib/libc/sys/linux/include/arpa/inet.h            | 6 +-----
 newlib/libc/sys/linux/include/arpa/nameser.h         | 6 +-----
 newlib/libc/sys/linux/include/arpa/nameser_compat.h  | 6 +-----
 newlib/libc/sys/linux/include/arpa/telnet.h          | 6 +-----
 newlib/libc/sys/linux/include/arpa/tftp.h            | 6 +-----
 newlib/libc/sys/linux/include/fnmatch.h              | 6 +-----
 newlib/libc/sys/linux/include/glob.h                 | 6 +-----
 newlib/libc/sys/linux/include/net/bpf.h              | 6 +-----
 newlib/libc/sys/linux/include/net/bpf_compat.h       | 6 +-----
 newlib/libc/sys/linux/include/net/bpfdesc.h          | 6 +-----
 newlib/libc/sys/linux/include/net/fddi.h             | 6 +-----
 newlib/libc/sys/linux/include/net/if.h               | 6 +-----
 newlib/libc/sys/linux/include/net/if_arc.h           | 6 +-----
 newlib/libc/sys/linux/include/net/if_arp.h           | 6 +-----
 newlib/libc/sys/linux/include/net/if_dl.h            | 6 +-----
 newlib/libc/sys/linux/include/net/if_llc.h           | 6 +-----
 newlib/libc/sys/linux/include/net/if_slvar.h         | 6 +-----
 newlib/libc/sys/linux/include/net/if_types.h         | 6 +-----
 newlib/libc/sys/linux/include/net/if_var.h           | 6 +-----
 newlib/libc/sys/linux/include/net/netisr.h           | 6 +-----
 newlib/libc/sys/linux/include/net/radix.h            | 6 +-----
 newlib/libc/sys/linux/include/net/raw_cb.h           | 6 +-----
 newlib/libc/sys/linux/include/net/route.h            | 6 +-----
 newlib/libc/sys/linux/include/net/slcompress.h       | 6 +-----
 newlib/libc/sys/linux/include/net/slip.h             | 6 +-----
 newlib/libc/sys/linux/include/netdb.h                | 6 +-----
 newlib/libc/sys/linux/include/netinet/icmp6.h        | 6 +-----
 newlib/libc/sys/linux/include/netinet/icmp_var.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet/if_ether.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet/igmp.h         | 6 +-----
 newlib/libc/sys/linux/include/netinet/igmp_var.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet/in.h           | 6 +-----
 newlib/libc/sys/linux/include/netinet/in_pcb.h       | 6 +-----
 newlib/libc/sys/linux/include/netinet/in_systm.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet/in_var.h       | 6 +-----
 newlib/libc/sys/linux/include/netinet/ip.h           | 6 +-----
 newlib/libc/sys/linux/include/netinet/ip6.h          | 6 +-----
 newlib/libc/sys/linux/include/netinet/ip_icmp.h      | 6 +-----
 newlib/libc/sys/linux/include/netinet/ip_mroute.h    | 6 +-----
 newlib/libc/sys/linux/include/netinet/ip_var.h       | 6 +-----
 newlib/libc/sys/linux/include/netinet/ipprotosw.h    | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp.h          | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp_debug.h    | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp_fsm.h      | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp_seq.h      | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp_timer.h    | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcp_var.h      | 6 +-----
 newlib/libc/sys/linux/include/netinet/tcpip.h        | 6 +-----
 newlib/libc/sys/linux/include/netinet/udp.h          | 6 +-----
 newlib/libc/sys/linux/include/netinet/udp_var.h      | 6 +-----
 newlib/libc/sys/linux/include/netinet6/in6.h         | 6 +-----
 newlib/libc/sys/linux/include/netinet6/in6_pcb.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet6/in6_var.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet6/ip6_var.h     | 6 +-----
 newlib/libc/sys/linux/include/netinet6/ip6protosw.h  | 6 +-----
 newlib/libc/sys/linux/include/netinet6/tcp6_var.h    | 6 +-----
 newlib/libc/sys/linux/include/netinet6/udp6_var.h    | 6 +-----
 newlib/libc/sys/linux/include/netns/idp.h            | 6 +-----
 newlib/libc/sys/linux/include/netns/idp_var.h        | 6 +-----
 newlib/libc/sys/linux/include/netns/ns.h             | 6 +-----
 newlib/libc/sys/linux/include/netns/ns_error.h       | 6 +-----
 newlib/libc/sys/linux/include/netns/ns_if.h          | 6 +-----
 newlib/libc/sys/linux/include/netns/ns_pcb.h         | 6 +-----
 newlib/libc/sys/linux/include/netns/sp.h             | 6 +-----
 newlib/libc/sys/linux/include/netns/spidp.h          | 6 +-----
 newlib/libc/sys/linux/include/netns/spp_debug.h      | 6 +-----
 newlib/libc/sys/linux/include/netns/spp_timer.h      | 6 +-----
 newlib/libc/sys/linux/include/netns/spp_var.h        | 6 +-----
 newlib/libc/sys/linux/include/regex.h                | 6 +-----
 newlib/libc/sys/linux/include/resolv.h               | 6 +-----
 newlib/libc/sys/linux/include/rune.h                 | 6 +-----
 newlib/libc/sys/linux/include/runetype.h             | 6 +-----
 newlib/libc/sys/linux/machine/i386/include/endian.h  | 6 +-----
 newlib/libc/sys/linux/machine/i386/include/param.h   | 6 +-----
 newlib/libc/sys/linux/net/inet_addr.c                | 6 +-----
 newlib/libc/sys/linux/net/recv.c                     | 6 +-----
 newlib/libc/sys/linux/net/send.c                     | 6 +-----
 newlib/libc/sys/linux/readdir64.c                    | 6 +-----
 newlib/libc/sys/linux/scandir64.c                    | 6 +-----
 newlib/libc/sys/linux/sys/ioccom.h                   | 6 +-----
 newlib/libc/sys/linux/sys/param.h                    | 6 +-----
 newlib/libc/sys/linux/sys/socket.h                   | 6 +-----
 newlib/libc/sys/linux/sys/sockio.h                   | 6 +-----
 newlib/libc/sys/linux/sys/time.h                     | 6 +-----
 newlib/libc/sys/linux/sys/types.h                    | 6 +-----
 newlib/libc/sys/phoenix/include/arpa/telnet.h        | 6 +-----
 newlib/libc/sys/phoenix/include/net/if.h             | 6 +-----
 newlib/libc/sys/phoenix/include/net/if_arp.h         | 6 +-----
 newlib/libc/sys/phoenix/include/netdb.h              | 6 +-----
 newlib/libc/sys/phoenix/include/netinet/in.h         | 6 +-----
 newlib/libc/sys/phoenix/include/netinet/in_systm.h   | 6 +-----
 newlib/libc/sys/phoenix/include/netinet/ip.h         | 6 +-----
 newlib/libc/sys/phoenix/include/netinet6/in6.h       | 6 +-----
 newlib/libc/sys/phoenix/net/inet_addr.c              | 6 +-----
 newlib/libc/sys/phoenix/net/inet_aton.c              | 6 +-----
 newlib/libc/sys/rtems/include/sys/syslimits.h        | 6 +-----
 newlib/libc/sys/sparc64/closedir.c                   | 6 +-----
 newlib/libc/sys/sparc64/opendir.c                    | 6 +-----
 newlib/libc/sys/sparc64/readdir.c                    | 6 +-----
 newlib/libc/sys/sparc64/rewinddir.c                  | 6 +-----
 newlib/libc/sys/sparc64/scandir.c                    | 6 +-----
 newlib/libc/sys/sparc64/seekdir.c                    | 6 +-----
 newlib/libc/sys/sparc64/telldir.c                    | 6 +-----
 newlib/libc/sys/sysvi386/closedir.c                  | 6 +-----
 newlib/libc/sys/sysvi386/crt0.c                      | 6 +-----
 newlib/libc/sys/sysvi386/opendir.c                   | 6 +-----
 newlib/libc/sys/sysvi386/readdir.c                   | 6 +-----
 newlib/libc/sys/sysvi386/rewinddir.c                 | 6 +-----
 newlib/libc/sys/sysvi386/scandir.c                   | 6 +-----
 newlib/libc/sys/sysvi386/seekdir.c                   | 6 +-----
 newlib/libc/sys/sysvi386/telldir.c                   | 6 +-----
 winsup/cygwin/include/arpa/ftp.h                     | 6 +-----
 winsup/cygwin/include/arpa/nameser.h                 | 6 +-----
 winsup/cygwin/include/arpa/nameser_compat.h          | 6 +-----
 winsup/cygwin/include/arpa/telnet.h                  | 6 +-----
 winsup/cygwin/include/fnmatch.h                      | 6 +-----
 winsup/cygwin/include/fts.h                          | 6 +-----
 winsup/cygwin/include/getopt.h                       | 6 +-----
 winsup/cygwin/include/glob.h                         | 6 +-----
 winsup/cygwin/include/netdb.h                        | 6 +-----
 winsup/cygwin/include/netinet/ip.h                   | 6 +-----
 winsup/cygwin/include/netinet/tcp.h                  | 6 +-----
 winsup/cygwin/include/netinet/udp.h                  | 6 +-----
 winsup/cygwin/include/resolv.h                       | 6 +-----
 winsup/cygwin/include/sysexits.h                     | 6 +-----
 winsup/cygwin/strsep.cc                              | 6 +-----
 winsup/testsuite/winsup.api/msgtest.c                | 6 +-----
 winsup/testsuite/winsup.api/semtest.c                | 6 +-----
 winsup/testsuite/winsup.api/shmtest.c                | 6 +-----
 300 files changed, 307 insertions(+), 1034 deletions(-)

diff --git a/libgloss/i386/cygmon-gmon.c b/libgloss/i386/cygmon-gmon.c
index 480b2ec..3c15b70 100644
--- a/libgloss/i386/cygmon-gmon.c
+++ b/libgloss/i386/cygmon-gmon.c
@@ -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 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/libgloss/m32r/Makefile.in b/libgloss/m32r/Makefile.in
index 12a1be6..0b8b193 100644
--- a/libgloss/m32r/Makefile.in
+++ b/libgloss/m32r/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/nds32/Makefile.in b/libgloss/nds32/Makefile.in
index 99ccae8..326009c 100644
--- a/libgloss/nds32/Makefile.in
+++ b/libgloss/nds32/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc/libsys/Makefile.in b/libgloss/sparc/libsys/Makefile.in
index b4c4be6..b732137 100644
--- a/libgloss/sparc/libsys/Makefile.in
+++ b/libgloss/sparc/libsys/Makefile.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc/libsys/configure.in b/libgloss/sparc/libsys/configure.in
index 4d8a5fa..1e06529 100644
--- a/libgloss/sparc/libsys/configure.in
+++ b/libgloss/sparc/libsys/configure.in
@@ -5,7 +5,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
 # endorse or promote products derived from this software without
diff --git a/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h b/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
index a51df10..f01d59a 100644
--- a/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
+++ b/libgloss/sparc_leon/asm-leon/leonbare_kernel_queue.h
@@ -26,11 +26,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/libgloss/sparc_leon/asm-leon/queue.h b/libgloss/sparc_leon/asm-leon/queue.h
index 621bc30..384a027 100644
--- a/libgloss/sparc_leon/asm-leon/queue.h
+++ b/libgloss/sparc_leon/asm-leon/queue.h
@@ -26,11 +26,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/mkdep b/mkdep
index 3c5b508..78c229c 100755
--- a/mkdep
+++ b/mkdep
@@ -6,7 +6,7 @@
 # Redistribution and use in source and binary forms are permitted
 # provided that the above copyright notice and this paragraph are
 # duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
+# and/or other materials related to such
 # distribution and use acknowledge that the software was developed
 # by the University of California, Berkeley.  The name of the
 # University may not be used to endorse or promote products derived
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 28727e8..32ce4f3 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -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 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/newlib/libc/include/ar.h b/newlib/libc/include/ar.h
index ac2e4ca..4c05813 100644
--- a/newlib/libc/include/ar.h
+++ b/newlib/libc/include/ar.h
@@ -20,11 +20,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/newlib/libc/include/grp.h b/newlib/libc/include/grp.h
index 6a26564..7296e7a 100644
--- a/newlib/libc/include/grp.h
+++ b/newlib/libc/include/grp.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 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/newlib/libc/include/pwd.h b/newlib/libc/include/pwd.h
index f37d289..baae884 100644
--- a/newlib/libc/include/pwd.h
+++ b/newlib/libc/include/pwd.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 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/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 164d95b..ab18806 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/include/sys/syslimits.h b/newlib/libc/include/sys/syslimits.h
index ba9dbd6..c872d20 100644
--- a/newlib/libc/include/sys/syslimits.h
+++ b/newlib/libc/include/sys/syslimits.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 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/newlib/libc/include/unctrl.h b/newlib/libc/include/unctrl.h
index 010812f..3363328 100644
--- a/newlib/libc/include/unctrl.h
+++ b/newlib/libc/include/unctrl.h
@@ -11,11 +11,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/newlib/libc/machine/hppa/DEFS.h b/newlib/libc/machine/hppa/DEFS.h
index a8b19b5..12fcd8e 100644
--- a/newlib/libc/machine/hppa/DEFS.h
+++ b/newlib/libc/machine/hppa/DEFS.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 1244f39..a8af4c3 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -65,11 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
  * 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/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 111fe5f..ccd290f 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -58,7 +58,7 @@ Supporting OS subroutines required:
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/machine/sparc/setjmp.S b/newlib/libc/machine/sparc/setjmp.S
index 8df0a6e..613df2b 100644
--- a/newlib/libc/machine/sparc/setjmp.S
+++ b/newlib/libc/machine/sparc/setjmp.S
@@ -22,11 +22,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/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index 8bca2a2..cd2d937 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -42,11 +42,7 @@ No supporting OS subroutines are required.
  * 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/newlib/libc/posix/cclass.h b/newlib/libc/posix/cclass.h
index 956a655..08343d4 100644
--- a/newlib/libc/posix/cclass.h
+++ b/newlib/libc/posix/cclass.h
@@ -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/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c
index 032636d..c19e21f 100644
--- a/newlib/libc/posix/closedir.c
+++ b/newlib/libc/posix/closedir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/cname.h b/newlib/libc/posix/cname.h
index 4f0d583..efb177c 100644
--- a/newlib/libc/posix/cname.h
+++ b/newlib/libc/posix/cname.h
@@ -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/newlib/libc/posix/fnmatch.3 b/newlib/libc/posix/fnmatch.3
index 9c3fda5..aec25ea 100644
--- a/newlib/libc/posix/fnmatch.3
+++ b/newlib/libc/posix/fnmatch.3
@@ -11,11 +11,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/newlib/libc/posix/glob.3 b/newlib/libc/posix/glob.3
index aa509a3..d90a1b5 100644
--- a/newlib/libc/posix/glob.3
+++ b/newlib/libc/posix/glob.3
@@ -11,11 +11,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/newlib/libc/posix/opendir.c b/newlib/libc/posix/opendir.c
index 2cf1ba5..4dbad1a 100644
--- a/newlib/libc/posix/opendir.c
+++ b/newlib/libc/posix/opendir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/readdir.c b/newlib/libc/posix/readdir.c
index 40608f9..fef83c1 100644
--- a/newlib/libc/posix/readdir.c
+++ b/newlib/libc/posix/readdir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index 8f4a982..ac55cc8 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -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.
  *
diff --git a/newlib/libc/posix/regex.3 b/newlib/libc/posix/regex.3
index d0b45a8..d9bf901 100644
--- a/newlib/libc/posix/regex.3
+++ b/newlib/libc/posix/regex.3
@@ -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 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/newlib/libc/posix/regex2.h b/newlib/libc/posix/regex2.h
index 303b7f7..595bd89 100644
--- a/newlib/libc/posix/regex2.h
+++ b/newlib/libc/posix/regex2.h
@@ -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/newlib/libc/posix/rewinddir.c b/newlib/libc/posix/rewinddir.c
index 930b79a..da5e0de 100644
--- a/newlib/libc/posix/rewinddir.c
+++ b/newlib/libc/posix/rewinddir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index 6ffeb14..cb47bb1 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index af86d8d..beac537 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -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.
  *
diff --git a/newlib/libc/posix/utils.h b/newlib/libc/posix/utils.h
index 5439b6c..e4499b3 100644
--- a/newlib/libc/posix/utils.h
+++ b/newlib/libc/posix/utils.h
@@ -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/newlib/libc/search/db_local.h b/newlib/libc/search/db_local.h
index ec621fa..ba82866 100644
--- a/newlib/libc/search/db_local.h
+++ b/newlib/libc/search/db_local.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 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/newlib/libc/search/extern.h b/newlib/libc/search/extern.h
index 666a6e5..58a2a04 100644
--- a/newlib/libc/search/extern.h
+++ b/newlib/libc/search/extern.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 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/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index 60fbeb0..33ff275 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.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 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/newlib/libc/search/hash.h b/newlib/libc/search/hash.h
index 1b094d6..5f64592 100644
--- a/newlib/libc/search/hash.h
+++ b/newlib/libc/search/hash.h
@@ -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 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/newlib/libc/search/hash_bigkey.c b/newlib/libc/search/hash_bigkey.c
index 8ff52b3..e110e46 100644
--- a/newlib/libc/search/hash_bigkey.c
+++ b/newlib/libc/search/hash_bigkey.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 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/newlib/libc/search/hash_buf.c b/newlib/libc/search/hash_buf.c
index 81475e9..2b92168 100644
--- a/newlib/libc/search/hash_buf.c
+++ b/newlib/libc/search/hash_buf.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 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/newlib/libc/search/hash_func.c b/newlib/libc/search/hash_func.c
index 355f0b5..30263d0 100644
--- a/newlib/libc/search/hash_func.c
+++ b/newlib/libc/search/hash_func.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 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/newlib/libc/search/hash_log2.c b/newlib/libc/search/hash_log2.c
index 9414f26..622c228 100644
--- a/newlib/libc/search/hash_log2.c
+++ b/newlib/libc/search/hash_log2.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 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/newlib/libc/search/hash_page.c b/newlib/libc/search/hash_page.c
index 7ca304d..9d15b0c 100644
--- a/newlib/libc/search/hash_page.c
+++ b/newlib/libc/search/hash_page.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 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/newlib/libc/search/page.h b/newlib/libc/search/page.h
index 9ecabda..f9afc70 100644
--- a/newlib/libc/search/page.h
+++ b/newlib/libc/search/page.h
@@ -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 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/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index ce6d0a9..af25e9a 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index 25696c5..542e70e 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index be83d6d..ff08a8b 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 1c36057..983ae2c 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
index 2e78b4b..014c451 100644
--- a/newlib/libc/stdio/fcloseall.c
+++ b/newlib/libc/stdio/fcloseall.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 854c018..ef942c2 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/feof.c b/newlib/libc/stdio/feof.c
index 8794179..674986b 100644
--- a/newlib/libc/stdio/feof.c
+++ b/newlib/libc/stdio/feof.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/ferror.c b/newlib/libc/stdio/ferror.c
index 3bff520..dc4d830 100644
--- a/newlib/libc/stdio/ferror.c
+++ b/newlib/libc/stdio/ferror.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index e958af9..f2d0d9b 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 7d0d484..21a6a9d 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index b4f6812..ba92730 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index 7adfb21..96a44a7 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fileno.c b/newlib/libc/stdio/fileno.c
index ceb83f8..10fc6e2 100644
--- a/newlib/libc/stdio/fileno.c
+++ b/newlib/libc/stdio/fileno.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 7119c05..896be99 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index ff09462..8829eb8 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
index ea93f75..a1c8361 100644
--- a/newlib/libc/stdio/fiscanf.c
+++ b/newlib/libc/stdio/fiscanf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index 1aa86d3..f0a94bc 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/floatio.h b/newlib/libc/stdio/floatio.h
index 496721b..4bddcb7 100644
--- a/newlib/libc/stdio/floatio.h
+++ b/newlib/libc/stdio/floatio.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 022992b..1ac551f 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index efb97ad..b6c0ea8 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index 1385cad..5dfa9c0 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 7a1eadb..4e9cb75 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index b358d2b..df83214 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index 0af1c1e..29ba5b7 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index af01eed..40964d2 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 9b3ea98..e9278af 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 3e0f9e9..13df28b 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index b5334e2..6258600 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index e4a2461..c540c43 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index d083b93..3df200c 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index 3e3a0c6..587ffac 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 139d837..767174b 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index b4b285a..8040d57 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fwprintf.c b/newlib/libc/stdio/fwprintf.c
index d4047dc..e578664 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index aa14421..d499f6f 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/fwscanf.c b/newlib/libc/stdio/fwscanf.c
index 1b86a34..59a96dd 100644
--- a/newlib/libc/stdio/fwscanf.c
+++ b/newlib/libc/stdio/fwscanf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 3c62f0b..c878132 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index fb37ba4..8bbbb4e 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index 7e0b748..e6b18f0 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c
index e45176d..f4ba0f9 100644
--- a/newlib/libc/stdio/getchar_u.c
+++ b/newlib/libc/stdio/getchar_u.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index a510ec0..82bfc57 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index a1b72e4..38ef778 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index 507d154..7e32eda 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
index 980dabd..35c3899 100644
--- a/newlib/libc/stdio/iscanf.c
+++ b/newlib/libc/stdio/iscanf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 53694aa..84ff40b 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index f2da70a..0030812 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 9b85eb9..3514818 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -7,9 +7,8 @@
  * notice and comment, and (2) distributions including binaries display
  * the following acknowledgement:  ``This product includes software
  * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
+ * in the documentation or other materials provided with the distribution.
+ * 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.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 97810b7..57d25b8 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/nano-vfscanf_float.c b/newlib/libc/stdio/nano-vfscanf_float.c
index 5df9f22..056046f 100644
--- a/newlib/libc/stdio/nano-vfscanf_float.c
+++ b/newlib/libc/stdio/nano-vfscanf_float.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/nano-vfscanf_local.h b/newlib/libc/stdio/nano-vfscanf_local.h
index 7fbd964..d696ec0 100644
--- a/newlib/libc/stdio/nano-vfscanf_local.h
+++ b/newlib/libc/stdio/nano-vfscanf_local.h
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index 68d78c2..eda7e99 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index a9ba611..3a07164 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index d4adc5a..6a410e2 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
index de4ac28..3bb53e5 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index c52d387..6e1b1f1 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
index 8f16bfb..0292435 100644
--- a/newlib/libc/stdio/putchar_u.c
+++ b/newlib/libc/stdio/putchar_u.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index f612ece..d4d7b7f 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index a7907be..bec9aa2 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 87a715b..ccedc7a 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
  * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
+ * and/or other materials related to such
  * distribution and use acknowledge that the software was developed
  * by the University of California, Berkeley.  The name of the
  * University may not be used to endorse or promote products derived
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index a105828..d8dfdbd 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -5,7 +5,7 @@
  * Redistribution and use in source and binary forms are permitted
  * provided that the above copyright notice and this paragraph are
 [...]

[diff truncated at 100000 bytes]



More information about the Cygwin-cvs mailing list