summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/apply/apply.18
-rw-r--r--usr.bin/apply/apply.c10
-rw-r--r--usr.bin/apropos/apropos.18
-rw-r--r--usr.bin/apropos/apropos.c10
-rw-r--r--usr.bin/ar/append.c10
-rw-r--r--usr.bin/ar/ar.18
-rw-r--r--usr.bin/ar/ar.58
-rw-r--r--usr.bin/ar/ar.c10
-rw-r--r--usr.bin/ar/archive.c10
-rw-r--r--usr.bin/ar/archive.h8
-rw-r--r--usr.bin/ar/contents.c10
-rw-r--r--usr.bin/ar/delete.c10
-rw-r--r--usr.bin/ar/extern.h8
-rw-r--r--usr.bin/ar/extract.c10
-rw-r--r--usr.bin/ar/misc.c10
-rw-r--r--usr.bin/ar/move.c10
-rw-r--r--usr.bin/ar/pathnames.h8
-rw-r--r--usr.bin/ar/print.c10
-rw-r--r--usr.bin/ar/replace.c10
-rw-r--r--usr.bin/at/atq.18
-rw-r--r--usr.bin/at/atrm.18
-rw-r--r--usr.bin/banner/banner.c10
-rw-r--r--usr.bin/banner/chset.c10
-rw-r--r--usr.bin/basename/basename.18
-rw-r--r--usr.bin/basename/basename.c10
-rw-r--r--usr.bin/bdes/bdes.18
-rw-r--r--usr.bin/bdes/bdes.c10
-rw-r--r--usr.bin/biff/biff.18
-rw-r--r--usr.bin/biff/biff.c10
-rw-r--r--usr.bin/cal/cal.18
-rw-r--r--usr.bin/cal/cal.c10
-rw-r--r--usr.bin/calendar/calendar.18
-rw-r--r--usr.bin/calendar/calendar.c10
-rw-r--r--usr.bin/calendar/calendar.h8
-rw-r--r--usr.bin/calendar/day.c10
-rw-r--r--usr.bin/calendar/io.c10
-rw-r--r--usr.bin/calendar/pathnames.h8
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.18
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.c10
-rw-r--r--usr.bin/checknr/checknr.18
-rw-r--r--usr.bin/checknr/checknr.c10
-rw-r--r--usr.bin/chpass/chpass.18
-rw-r--r--usr.bin/chpass/chpass.c10
-rw-r--r--usr.bin/chpass/chpass.h8
-rw-r--r--usr.bin/chpass/edit.c10
-rw-r--r--usr.bin/chpass/field.c10
-rw-r--r--usr.bin/chpass/pathnames.h8
-rw-r--r--usr.bin/chpass/pw_yp.c10
-rw-r--r--usr.bin/chpass/table.c10
-rw-r--r--usr.bin/chpass/util.c10
-rw-r--r--usr.bin/cksum/cksum.18
-rw-r--r--usr.bin/cksum/cksum.c10
-rw-r--r--usr.bin/cksum/crc.c10
-rw-r--r--usr.bin/cksum/extern.h8
-rw-r--r--usr.bin/cksum/print.c10
-rw-r--r--usr.bin/cksum/sum1.c10
-rw-r--r--usr.bin/cksum/sum2.c10
-rw-r--r--usr.bin/cmp/cmp.18
-rw-r--r--usr.bin/cmp/cmp.c10
-rw-r--r--usr.bin/cmp/extern.h8
-rw-r--r--usr.bin/cmp/misc.c10
-rw-r--r--usr.bin/cmp/regular.c10
-rw-r--r--usr.bin/cmp/special.c10
-rw-r--r--usr.bin/col/col.18
-rw-r--r--usr.bin/col/col.c10
-rw-r--r--usr.bin/colcrt/colcrt.18
-rw-r--r--usr.bin/colcrt/colcrt.c10
-rw-r--r--usr.bin/colrm/colrm.18
-rw-r--r--usr.bin/colrm/colrm.c10
-rw-r--r--usr.bin/column/column.18
-rw-r--r--usr.bin/column/column.c10
-rw-r--r--usr.bin/comm/comm.18
-rw-r--r--usr.bin/comm/comm.c10
-rw-r--r--usr.bin/compress/compress.18
-rw-r--r--usr.bin/compress/zopen.38
-rw-r--r--usr.bin/compress/zopen.c10
-rw-r--r--usr.bin/cpp/cpp.sh8
-rw-r--r--usr.bin/ctags/C.c10
-rw-r--r--usr.bin/ctags/ctags.18
-rw-r--r--usr.bin/ctags/ctags.c10
-rw-r--r--usr.bin/ctags/ctags.h8
-rw-r--r--usr.bin/ctags/fortran.c10
-rw-r--r--usr.bin/ctags/lisp.c10
-rw-r--r--usr.bin/ctags/print.c10
-rw-r--r--usr.bin/ctags/tree.c10
-rw-r--r--usr.bin/ctags/yacc.c10
-rw-r--r--usr.bin/cut/cut.18
-rw-r--r--usr.bin/cut/cut.c10
-rw-r--r--usr.bin/deroff/deroff.18
-rw-r--r--usr.bin/deroff/deroff.c10
-rw-r--r--usr.bin/dirname/dirname.18
-rw-r--r--usr.bin/du/du.18
-rw-r--r--usr.bin/du/du.c10
-rw-r--r--usr.bin/env/env.18
-rw-r--r--usr.bin/env/env.c10
-rw-r--r--usr.bin/error/error.18
-rw-r--r--usr.bin/error/error.h8
-rw-r--r--usr.bin/error/filter.c10
-rw-r--r--usr.bin/error/input.c10
-rw-r--r--usr.bin/error/main.c10
-rw-r--r--usr.bin/error/pathnames.h8
-rw-r--r--usr.bin/error/pi.c10
-rw-r--r--usr.bin/error/subr.c10
-rw-r--r--usr.bin/error/touch.c10
-rw-r--r--usr.bin/expand/expand.18
-rw-r--r--usr.bin/expand/expand.c10
-rw-r--r--usr.bin/false/false.18
-rw-r--r--usr.bin/find/extern.h8
-rw-r--r--usr.bin/find/find.18
-rw-r--r--usr.bin/find/find.c10
-rw-r--r--usr.bin/find/find.h8
-rw-r--r--usr.bin/find/function.c10
-rw-r--r--usr.bin/find/ls.c10
-rw-r--r--usr.bin/find/main.c10
-rw-r--r--usr.bin/find/misc.c10
-rw-r--r--usr.bin/find/operator.c10
-rw-r--r--usr.bin/find/option.c10
-rw-r--r--usr.bin/finger/extern.h8
-rw-r--r--usr.bin/finger/finger.18
-rw-r--r--usr.bin/finger/finger.c10
-rw-r--r--usr.bin/finger/finger.h8
-rw-r--r--usr.bin/finger/lprint.c10
-rw-r--r--usr.bin/finger/net.c10
-rw-r--r--usr.bin/finger/sprint.c10
-rw-r--r--usr.bin/finger/util.c10
-rw-r--r--usr.bin/fmt/fmt.18
-rw-r--r--usr.bin/fold/fold.18
-rw-r--r--usr.bin/fold/fold.c10
-rw-r--r--usr.bin/from/from.18
-rw-r--r--usr.bin/from/from.c10
-rw-r--r--usr.bin/fsplit/fsplit.18
-rw-r--r--usr.bin/fsplit/fsplit.c10
-rw-r--r--usr.bin/fstat/fstat.18
-rw-r--r--usr.bin/fstat/fstat.c10
-rw-r--r--usr.bin/fstat/fstat.h8
-rw-r--r--usr.bin/fstat/isofs.c8
-rw-r--r--usr.bin/ftp/cmds.c10
-rw-r--r--usr.bin/ftp/cmdtab.c10
-rw-r--r--usr.bin/ftp/domacro.c10
-rw-r--r--usr.bin/ftp/extern.h8
-rw-r--r--usr.bin/ftp/ftp.18
-rw-r--r--usr.bin/ftp/ftp.c10
-rw-r--r--usr.bin/ftp/ftp_var.h8
-rw-r--r--usr.bin/ftp/main.c10
-rw-r--r--usr.bin/ftp/pathnames.h8
-rw-r--r--usr.bin/ftp/ruserpass.c10
-rw-r--r--usr.bin/ftp/util.c10
-rw-r--r--usr.bin/gprof/PSD.doc/abstract.me8
-rw-r--r--usr.bin/gprof/PSD.doc/gathering.me8
-rw-r--r--usr.bin/gprof/PSD.doc/header.me8
-rw-r--r--usr.bin/gprof/PSD.doc/intro.me8
-rw-r--r--usr.bin/gprof/PSD.doc/postp.me8
-rw-r--r--usr.bin/gprof/PSD.doc/postp1.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/postp2.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/postp3.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/pres1.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/pres2.pic8
-rw-r--r--usr.bin/gprof/PSD.doc/present.me8
-rw-r--r--usr.bin/gprof/PSD.doc/profiling.me8
-rw-r--r--usr.bin/gprof/PSD.doc/refs.me8
-rw-r--r--usr.bin/gprof/alpha.h8
-rw-r--r--usr.bin/gprof/aout.c6
-rw-r--r--usr.bin/gprof/arcs.c10
-rw-r--r--usr.bin/gprof/arm32.h8
-rw-r--r--usr.bin/gprof/dfn.c10
-rw-r--r--usr.bin/gprof/elf.c6
-rw-r--r--usr.bin/gprof/gprof.18
-rw-r--r--usr.bin/gprof/gprof.c10
-rw-r--r--usr.bin/gprof/gprof.h8
-rw-r--r--usr.bin/gprof/hertz.c10
-rw-r--r--usr.bin/gprof/hppa.h8
-rw-r--r--usr.bin/gprof/i386.h8
-rw-r--r--usr.bin/gprof/lookup.c10
-rw-r--r--usr.bin/gprof/m68k.h8
-rw-r--r--usr.bin/gprof/m88k.h8
-rw-r--r--usr.bin/gprof/mips.c10
-rw-r--r--usr.bin/gprof/mips.h8
-rw-r--r--usr.bin/gprof/ns32k.h8
-rw-r--r--usr.bin/gprof/pathnames.h8
-rw-r--r--usr.bin/gprof/pmax.c10
-rw-r--r--usr.bin/gprof/pmax.h8
-rw-r--r--usr.bin/gprof/powerpc.h8
-rw-r--r--usr.bin/gprof/printgprof.c10
-rw-r--r--usr.bin/gprof/printlist.c10
-rw-r--r--usr.bin/gprof/sparc.c10
-rw-r--r--usr.bin/gprof/sparc.h8
-rw-r--r--usr.bin/gprof/sparc64.h8
-rw-r--r--usr.bin/gprof/tahoe.c10
-rw-r--r--usr.bin/gprof/tahoe.h8
-rw-r--r--usr.bin/gprof/vax.c10
-rw-r--r--usr.bin/gprof/vax.h8
-rw-r--r--usr.bin/head/head.18
-rw-r--r--usr.bin/head/head.c10
-rw-r--r--usr.bin/hexdump/conv.c10
-rw-r--r--usr.bin/hexdump/display.c10
-rw-r--r--usr.bin/hexdump/hexdump.18
-rw-r--r--usr.bin/hexdump/hexdump.c10
-rw-r--r--usr.bin/hexdump/hexdump.h8
-rw-r--r--usr.bin/hexdump/hexsyntax.c10
-rw-r--r--usr.bin/hexdump/odsyntax.c10
-rw-r--r--usr.bin/hexdump/parse.c10
-rw-r--r--usr.bin/id/groups.18
-rw-r--r--usr.bin/id/id.18
-rw-r--r--usr.bin/id/id.c10
-rw-r--r--usr.bin/id/whoami.18
-rw-r--r--usr.bin/indent/io.c10
-rw-r--r--usr.bin/join/join.18
-rw-r--r--usr.bin/join/join.c10
-rw-r--r--usr.bin/jot/jot.18
-rw-r--r--usr.bin/jot/jot.c10
-rw-r--r--usr.bin/kdump/kdump.18
-rw-r--r--usr.bin/kdump/kdump.c10
-rw-r--r--usr.bin/kdump/mkioctls8
-rw-r--r--usr.bin/ktrace/ktrace.18
-rw-r--r--usr.bin/ktrace/ktrace.c10
-rw-r--r--usr.bin/ktrace/ktrace.h8
-rw-r--r--usr.bin/ktrace/subr.c10
-rw-r--r--usr.bin/lam/lam.18
-rw-r--r--usr.bin/lam/lam.c10
-rw-r--r--usr.bin/last/last.18
-rw-r--r--usr.bin/last/last.c10
-rw-r--r--usr.bin/lastcomm/lastcomm.18
-rw-r--r--usr.bin/lastcomm/lastcomm.c10
-rw-r--r--usr.bin/lastcomm/pathnames.h8
-rw-r--r--usr.bin/leave/leave.18
-rw-r--r--usr.bin/leave/leave.c10
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c12
-rw-r--r--usr.bin/locate/code/locate.code.c12
-rw-r--r--usr.bin/locate/locate/fastfind.c10
-rw-r--r--usr.bin/locate/locate/locate.110
-rw-r--r--usr.bin/locate/locate/locate.c12
-rw-r--r--usr.bin/locate/locate/locate.h8
-rw-r--r--usr.bin/locate/locate/pathnames.h8
-rw-r--r--usr.bin/locate/locate/util.c10
-rw-r--r--usr.bin/lock/lock.18
-rw-r--r--usr.bin/lock/lock.c10
-rw-r--r--usr.bin/logger/logger.18
-rw-r--r--usr.bin/logger/logger.c10
-rw-r--r--usr.bin/login/login.18
-rw-r--r--usr.bin/login/login.c10
-rw-r--r--usr.bin/login/pathnames.h8
-rw-r--r--usr.bin/logname/logname.18
-rw-r--r--usr.bin/logname/logname.c10
-rw-r--r--usr.bin/look/look.18
-rw-r--r--usr.bin/look/look.c10
-rw-r--r--usr.bin/look/pathnames.h8
-rw-r--r--usr.bin/lorder/lorder.18
-rw-r--r--usr.bin/lorder/lorder.sh8
-rw-r--r--usr.bin/m4/TEST/ack.m48
-rw-r--r--usr.bin/m4/TEST/hanoi.m48
-rw-r--r--usr.bin/m4/TEST/hash.m48
-rw-r--r--usr.bin/m4/TEST/sqroot.m48
-rw-r--r--usr.bin/m4/TEST/string.m48
-rw-r--r--usr.bin/m4/TEST/test.m48
-rw-r--r--usr.bin/m4/eval.c10
-rw-r--r--usr.bin/m4/expr.c10
-rw-r--r--usr.bin/m4/extern.h8
-rw-r--r--usr.bin/m4/look.c8
-rw-r--r--usr.bin/m4/m4.18
-rw-r--r--usr.bin/m4/main.c10
-rw-r--r--usr.bin/m4/mdef.h8
-rw-r--r--usr.bin/m4/misc.c10
-rw-r--r--usr.bin/m4/pathnames.h8
-rw-r--r--usr.bin/m4/stdd.h8
-rw-r--r--usr.bin/mail/USD.doc/mail0.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail1.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail2.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail3.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail4.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail5.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail6.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail7.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail8.nr8
-rw-r--r--usr.bin/mail/USD.doc/mail9.nr8
-rw-r--r--usr.bin/mail/USD.doc/maila.nr8
-rw-r--r--usr.bin/mail/aux.c10
-rw-r--r--usr.bin/mail/cmd1.c10
-rw-r--r--usr.bin/mail/cmd2.c10
-rw-r--r--usr.bin/mail/cmd3.c10
-rw-r--r--usr.bin/mail/cmdtab.c10
-rw-r--r--usr.bin/mail/collect.c10
-rw-r--r--usr.bin/mail/def.h10
-rw-r--r--usr.bin/mail/edit.c10
-rw-r--r--usr.bin/mail/extern.h10
-rw-r--r--usr.bin/mail/fio.c10
-rw-r--r--usr.bin/mail/getname.c10
-rw-r--r--usr.bin/mail/glob.h8
-rw-r--r--usr.bin/mail/head.c10
-rw-r--r--usr.bin/mail/lex.c10
-rw-r--r--usr.bin/mail/list.c10
-rw-r--r--usr.bin/mail/mail.18
-rw-r--r--usr.bin/mail/main.c10
-rw-r--r--usr.bin/mail/names.c10
-rw-r--r--usr.bin/mail/pathnames.h8
-rw-r--r--usr.bin/mail/popen.c10
-rw-r--r--usr.bin/mail/quit.c10
-rw-r--r--usr.bin/mail/rcv.h8
-rw-r--r--usr.bin/mail/send.c10
-rw-r--r--usr.bin/mail/strings.c10
-rw-r--r--usr.bin/mail/temp.c10
-rw-r--r--usr.bin/mail/tty.c10
-rw-r--r--usr.bin/mail/v7.local.c10
-rw-r--r--usr.bin/mail/vars.c10
-rw-r--r--usr.bin/mail/version.c10
-rw-r--r--usr.bin/make/PSD.doc/tutorial.ms8
-rw-r--r--usr.bin/make/arch.c8
-rw-r--r--usr.bin/make/buf.c8
-rw-r--r--usr.bin/make/buf.h8
-rw-r--r--usr.bin/make/compat.c8
-rw-r--r--usr.bin/make/cond.c8
-rw-r--r--usr.bin/make/config.h8
-rw-r--r--usr.bin/make/dir.c8
-rw-r--r--usr.bin/make/dir.h8
-rw-r--r--usr.bin/make/extern.h8
-rw-r--r--usr.bin/make/for.c8
-rw-r--r--usr.bin/make/job.c8
-rw-r--r--usr.bin/make/job.h8
-rw-r--r--usr.bin/make/lst.h8
-rw-r--r--usr.bin/make/lst.lib/lstAppend.c8
-rw-r--r--usr.bin/make/lst.lib/lstConcat.c8
-rw-r--r--usr.bin/make/lst.lib/lstConcatDestroy.c8
-rw-r--r--usr.bin/make/lst.lib/lstDeQueue.c8
-rw-r--r--usr.bin/make/lst.lib/lstDestroy.c8
-rw-r--r--usr.bin/make/lst.lib/lstDupl.c8
-rw-r--r--usr.bin/make/lst.lib/lstFindFrom.c8
-rw-r--r--usr.bin/make/lst.lib/lstForEachFrom.c8
-rw-r--r--usr.bin/make/lst.lib/lstInit.c8
-rw-r--r--usr.bin/make/lst.lib/lstInsert.c8
-rw-r--r--usr.bin/make/lst.lib/lstInt.h8
-rw-r--r--usr.bin/make/lst.lib/lstMember.c8
-rw-r--r--usr.bin/make/lst.lib/lstRemove.c8
-rw-r--r--usr.bin/make/lst.lib/lstReplace.c8
-rw-r--r--usr.bin/make/lst.lib/lstSucc.c8
-rw-r--r--usr.bin/make/main.c8
-rw-r--r--usr.bin/make/make.18
-rw-r--r--usr.bin/make/make.c8
-rw-r--r--usr.bin/make/make.h8
-rw-r--r--usr.bin/make/memory.c8
-rw-r--r--usr.bin/make/memory.h8
-rw-r--r--usr.bin/make/parse.c8
-rw-r--r--usr.bin/make/pathnames.h8
-rw-r--r--usr.bin/make/str.c8
-rw-r--r--usr.bin/make/suff.c8
-rw-r--r--usr.bin/make/targ.c8
-rw-r--r--usr.bin/make/var.c8
-rw-r--r--usr.bin/make/varmodifiers.c8
-rw-r--r--usr.bin/man/config.c10
-rw-r--r--usr.bin/man/man.18
-rw-r--r--usr.bin/man/man.c10
-rw-r--r--usr.bin/man/man.conf.58
-rw-r--r--usr.bin/man/pathnames.h8
-rw-r--r--usr.bin/mesg/mesg.18
-rw-r--r--usr.bin/mesg/mesg.c10
-rw-r--r--usr.bin/mkdep/mkdep.18
-rw-r--r--usr.bin/mkdep/mkdep.append8
-rw-r--r--usr.bin/mkdep/mkdep.gcc.sh8
-rw-r--r--usr.bin/mkdep/mkdep.old.compiler8
-rw-r--r--usr.bin/mkdep/mkdep.sh8
-rw-r--r--usr.bin/mkdep/mkdep.ultrix8
-rw-r--r--usr.bin/mkstr/mkstr.18
-rw-r--r--usr.bin/mkstr/mkstr.c10
-rw-r--r--usr.bin/msgs/msgs.18
-rw-r--r--usr.bin/msgs/msgs.c10
-rw-r--r--usr.bin/msgs/pathnames.h8
-rw-r--r--usr.bin/netstat/atalk.c10
-rw-r--r--usr.bin/netstat/if.c10
-rw-r--r--usr.bin/netstat/inet.c10
-rw-r--r--usr.bin/netstat/inet6.c10
-rw-r--r--usr.bin/netstat/ipx.c10
-rw-r--r--usr.bin/netstat/iso.c10
-rw-r--r--usr.bin/netstat/main.c10
-rw-r--r--usr.bin/netstat/mbuf.c10
-rw-r--r--usr.bin/netstat/mroute.c8
-rw-r--r--usr.bin/netstat/mroute6.c8
-rw-r--r--usr.bin/netstat/netstat.18
-rw-r--r--usr.bin/netstat/netstat.h8
-rw-r--r--usr.bin/netstat/ns.c10
-rw-r--r--usr.bin/netstat/route.c10
-rw-r--r--usr.bin/netstat/unix.c10
-rw-r--r--usr.bin/nfsstat/nfsstat.18
-rw-r--r--usr.bin/nfsstat/nfsstat.c10
-rw-r--r--usr.bin/nice/nice.18
-rw-r--r--usr.bin/nice/nice.c10
-rw-r--r--usr.bin/nm/nm.18
-rw-r--r--usr.bin/nm/nm.c10
-rw-r--r--usr.bin/nohup/nohup.18
-rw-r--r--usr.bin/nohup/nohup.c10
-rw-r--r--usr.bin/oldrdist/defs.h8
-rw-r--r--usr.bin/oldrdist/docmd.c10
-rw-r--r--usr.bin/oldrdist/expand.c10
-rw-r--r--usr.bin/oldrdist/gram.y8
-rw-r--r--usr.bin/oldrdist/lookup.c10
-rw-r--r--usr.bin/oldrdist/main.c10
-rw-r--r--usr.bin/oldrdist/oldrdist.18
-rw-r--r--usr.bin/oldrdist/pathnames.h8
-rw-r--r--usr.bin/oldrdist/server.c10
-rw-r--r--usr.bin/pagesize/pagesize.18
-rw-r--r--usr.bin/passwd/kpasswd_proto.h6
-rw-r--r--usr.bin/passwd/local_passwd.c10
-rw-r--r--usr.bin/passwd/passwd.18
-rw-r--r--usr.bin/passwd/passwd.c10
-rw-r--r--usr.bin/passwd/yp_passwd.c10
-rw-r--r--usr.bin/paste/paste.18
-rw-r--r--usr.bin/paste/paste.c10
-rw-r--r--usr.bin/pr/egetopt.c10
-rw-r--r--usr.bin/pr/extern.h8
-rw-r--r--usr.bin/pr/pr.18
-rw-r--r--usr.bin/pr/pr.c10
-rw-r--r--usr.bin/pr/pr.h8
-rw-r--r--usr.bin/printenv/printenv.18
-rw-r--r--usr.bin/printenv/printenv.c10
-rw-r--r--usr.bin/printf/printf.18
-rw-r--r--usr.bin/printf/printf.c10
-rw-r--r--usr.bin/quota/quota.18
-rw-r--r--usr.bin/quota/quota.c10
-rw-r--r--usr.bin/ranlib/build.c10
-rw-r--r--usr.bin/ranlib/extern.h8
-rw-r--r--usr.bin/ranlib/misc.c10
-rw-r--r--usr.bin/ranlib/pathnames.h8
-rw-r--r--usr.bin/ranlib/ranlib.18
-rw-r--r--usr.bin/ranlib/ranlib.58
-rw-r--r--usr.bin/ranlib/ranlib.c10
-rw-r--r--usr.bin/ranlib/touch.c10
-rw-r--r--usr.bin/rdist/child.c10
-rw-r--r--usr.bin/rdist/client.c10
-rw-r--r--usr.bin/rdist/common.c10
-rw-r--r--usr.bin/rdist/config-data.h8
-rw-r--r--usr.bin/rdist/config-def.h8
-rw-r--r--usr.bin/rdist/config.h8
-rw-r--r--usr.bin/rdist/defs.h8
-rw-r--r--usr.bin/rdist/distopt.c10
-rw-r--r--usr.bin/rdist/docmd.c10
-rw-r--r--usr.bin/rdist/expand.c10
-rw-r--r--usr.bin/rdist/filesys.h8
-rw-r--r--usr.bin/rdist/gram.y10
-rw-r--r--usr.bin/rdist/isexec.c10
-rw-r--r--usr.bin/rdist/lookup.c10
-rw-r--r--usr.bin/rdist/message.c10
-rw-r--r--usr.bin/rdist/os-openbsd.h8
-rw-r--r--usr.bin/rdist/pathnames.h8
-rw-r--r--usr.bin/rdist/rdist.18
-rw-r--r--usr.bin/rdist/rdist.c10
-rw-r--r--usr.bin/rdist/version.h8
-rw-r--r--usr.bin/rdistd/filesys-os.c10
-rw-r--r--usr.bin/rdistd/filesys.c10
-rw-r--r--usr.bin/rdistd/rdistd.18
-rw-r--r--usr.bin/rdistd/rdistd.c10
-rw-r--r--usr.bin/rdistd/server.c10
-rw-r--r--usr.bin/readlink/readlink.18
-rw-r--r--usr.bin/renice/renice.88
-rw-r--r--usr.bin/renice/renice.c10
-rw-r--r--usr.bin/rev/rev.18
-rw-r--r--usr.bin/rev/rev.c10
-rw-r--r--usr.bin/rs/rs.18
-rw-r--r--usr.bin/rs/rs.c8
-rw-r--r--usr.bin/rsh/des_rw.c10
-rw-r--r--usr.bin/rsh/kcmd.c10
-rw-r--r--usr.bin/rsh/krcmd.c10
-rw-r--r--usr.bin/rsh/pathnames.h8
-rw-r--r--usr.bin/rsh/rsh.18
-rw-r--r--usr.bin/rsh/rsh.c10
-rw-r--r--usr.bin/rup/rup.18
-rw-r--r--usr.bin/ruptime/ruptime.18
-rw-r--r--usr.bin/ruptime/ruptime.c10
-rw-r--r--usr.bin/rusers/rusers.18
-rw-r--r--usr.bin/rwall/rwall.18
-rw-r--r--usr.bin/rwall/rwall.c10
-rw-r--r--usr.bin/rwho/rwho.18
-rw-r--r--usr.bin/rwho/rwho.c10
-rw-r--r--usr.bin/script/script.18
-rw-r--r--usr.bin/script/script.c10
-rw-r--r--usr.bin/sed/TEST/sed.test8
-rw-r--r--usr.bin/sed/compile.c10
-rw-r--r--usr.bin/sed/defs.h8
-rw-r--r--usr.bin/sed/extern.h8
-rw-r--r--usr.bin/sed/main.c10
-rw-r--r--usr.bin/sed/misc.c10
-rw-r--r--usr.bin/sed/process.c10
-rw-r--r--usr.bin/sed/sed.18
-rw-r--r--usr.bin/shar/shar.18
-rw-r--r--usr.bin/shar/shar.sh8
-rw-r--r--usr.bin/showmount/showmount.88
-rw-r--r--usr.bin/showmount/showmount.c10
-rw-r--r--usr.bin/size/size.18
-rw-r--r--usr.bin/size/size.c10
-rw-r--r--usr.bin/soelim/soelim.18
-rw-r--r--usr.bin/soelim/soelim.c10
-rw-r--r--usr.bin/sort/append.c10
-rw-r--r--usr.bin/sort/extern.h8
-rw-r--r--usr.bin/sort/fields.c10
-rw-r--r--usr.bin/sort/files.c10
-rw-r--r--usr.bin/sort/fsort.c10
-rw-r--r--usr.bin/sort/fsort.h8
-rw-r--r--usr.bin/sort/init.c10
-rw-r--r--usr.bin/sort/msort.c10
-rw-r--r--usr.bin/sort/pathnames.h8
-rw-r--r--usr.bin/sort/sort.18
-rw-r--r--usr.bin/sort/sort.c10
-rw-r--r--usr.bin/sort/sort.h8
-rw-r--r--usr.bin/sort/tmp.c10
-rw-r--r--usr.bin/spell/look.c10
-rw-r--r--usr.bin/spell/spellprog.c10
-rw-r--r--usr.bin/split/split.18
-rw-r--r--usr.bin/split/split.c10
-rw-r--r--usr.bin/ssh/scp.c8
-rw-r--r--usr.bin/strings/strings.18
-rw-r--r--usr.bin/strings/strings.c10
-rw-r--r--usr.bin/strip/strip.18
-rw-r--r--usr.bin/strip/strip.c10
-rw-r--r--usr.bin/su/su.18
-rw-r--r--usr.bin/su/su.c10
-rw-r--r--usr.bin/sup/src/snprintf.c8
-rw-r--r--usr.bin/sup/src/unvis.c8
-rw-r--r--usr.bin/sup/src/vis.c8
-rw-r--r--usr.bin/sup/src/vis.h8
-rw-r--r--usr.bin/systat/cmds.c10
-rw-r--r--usr.bin/systat/cmdtab.c10
-rw-r--r--usr.bin/systat/disks.c10
-rw-r--r--usr.bin/systat/extern.h8
-rw-r--r--usr.bin/systat/fetch.c10
-rw-r--r--usr.bin/systat/iostat.c10
-rw-r--r--usr.bin/systat/keyboard.c10
-rw-r--r--usr.bin/systat/main.c10
-rw-r--r--usr.bin/systat/mbufs.c10
-rw-r--r--usr.bin/systat/netcmds.c10
-rw-r--r--usr.bin/systat/netstat.c10
-rw-r--r--usr.bin/systat/pigs.c10
-rw-r--r--usr.bin/systat/swap.c10
-rw-r--r--usr.bin/systat/systat.18
-rw-r--r--usr.bin/systat/systat.h8
-rw-r--r--usr.bin/systat/vmstat.c10
-rw-r--r--usr.bin/tail/extern.h8
-rw-r--r--usr.bin/tail/forward.c10
-rw-r--r--usr.bin/tail/misc.c10
-rw-r--r--usr.bin/tail/read.c10
-rw-r--r--usr.bin/tail/reverse.c10
-rw-r--r--usr.bin/tail/tail.18
-rw-r--r--usr.bin/tail/tail.c10
-rw-r--r--usr.bin/talk/ctl.c10
-rw-r--r--usr.bin/talk/ctl_transact.c10
-rw-r--r--usr.bin/talk/display.c10
-rw-r--r--usr.bin/talk/get_addrs.c10
-rw-r--r--usr.bin/talk/get_names.c10
-rw-r--r--usr.bin/talk/init_disp.c10
-rw-r--r--usr.bin/talk/invite.c10
-rw-r--r--usr.bin/talk/io.c10
-rw-r--r--usr.bin/talk/look_up.c10
-rw-r--r--usr.bin/talk/msgs.c10
-rw-r--r--usr.bin/talk/talk.18
-rw-r--r--usr.bin/talk/talk.c10
-rw-r--r--usr.bin/talk/talk.h8
-rw-r--r--usr.bin/talk/talk_ctl.h8
-rw-r--r--usr.bin/tcopy/tcopy.18
-rw-r--r--usr.bin/tcopy/tcopy.c10
-rw-r--r--usr.bin/tee/tee.18
-rw-r--r--usr.bin/tee/tee.c10
-rw-r--r--usr.bin/telnet/Makefile8
-rw-r--r--usr.bin/telnet/authenc.c10
-rw-r--r--usr.bin/telnet/commands.c8
-rw-r--r--usr.bin/telnet/defines.h8
-rw-r--r--usr.bin/telnet/externs.h8
-rw-r--r--usr.bin/telnet/getent.c8
-rw-r--r--usr.bin/telnet/main.c8
-rw-r--r--usr.bin/telnet/network.c8
-rw-r--r--usr.bin/telnet/ring.c8
-rw-r--r--usr.bin/telnet/ring.h8
-rw-r--r--usr.bin/telnet/sys_bsd.c8
-rw-r--r--usr.bin/telnet/telnet.18
-rw-r--r--usr.bin/telnet/telnet.c8
-rw-r--r--usr.bin/telnet/terminal.c8
-rw-r--r--usr.bin/telnet/tn3270.c8
-rw-r--r--usr.bin/telnet/types.h8
-rw-r--r--usr.bin/telnet/utilities.c8
-rw-r--r--usr.bin/tftp/extern.h8
-rw-r--r--usr.bin/tftp/main.c10
-rw-r--r--usr.bin/tftp/tftp.18
-rw-r--r--usr.bin/tftp/tftp.c10
-rw-r--r--usr.bin/tftp/tftpsubs.c10
-rw-r--r--usr.bin/tftp/tftpsubs.h8
-rw-r--r--usr.bin/time/time.18
-rw-r--r--usr.bin/time/time.c10
-rw-r--r--usr.bin/tip/acu.c10
-rw-r--r--usr.bin/tip/aculib/biz22.c10
-rw-r--r--usr.bin/tip/aculib/biz31.c10
-rw-r--r--usr.bin/tip/aculib/courier.c10
-rw-r--r--usr.bin/tip/aculib/df.c10
-rw-r--r--usr.bin/tip/aculib/dn11.c10
-rw-r--r--usr.bin/tip/aculib/hayes.c10
-rw-r--r--usr.bin/tip/aculib/t3000.c10
-rw-r--r--usr.bin/tip/aculib/v3451.c10
-rw-r--r--usr.bin/tip/aculib/v831.c10
-rw-r--r--usr.bin/tip/aculib/ventel.c10
-rw-r--r--usr.bin/tip/acutab.c10
-rw-r--r--usr.bin/tip/cmds.c10
-rw-r--r--usr.bin/tip/cmdtab.c10
-rw-r--r--usr.bin/tip/cu.c10
-rw-r--r--usr.bin/tip/hunt.c10
-rw-r--r--usr.bin/tip/log.c10
-rw-r--r--usr.bin/tip/partab.c10
-rw-r--r--usr.bin/tip/pathnames.h8
-rw-r--r--usr.bin/tip/remote.c10
-rw-r--r--usr.bin/tip/tip.18
-rw-r--r--usr.bin/tip/tip.c10
-rw-r--r--usr.bin/tip/tip.h8
-rw-r--r--usr.bin/tip/tipout.c10
-rw-r--r--usr.bin/tip/uucplock.c10
-rw-r--r--usr.bin/tip/value.c10
-rw-r--r--usr.bin/tip/vars.c10
-rw-r--r--usr.bin/tn3270/api/api_bsd.c10
-rw-r--r--usr.bin/tn3270/api/api_exch.c10
-rw-r--r--usr.bin/tn3270/api/api_exch.h8
-rw-r--r--usr.bin/tn3270/api/apilib.c10
-rw-r--r--usr.bin/tn3270/api/apilib.h8
-rw-r--r--usr.bin/tn3270/api/asc_ebc.c10
-rw-r--r--usr.bin/tn3270/api/asc_ebc.h8
-rw-r--r--usr.bin/tn3270/api/astosc.c10
-rw-r--r--usr.bin/tn3270/api/astosc.h8
-rw-r--r--usr.bin/tn3270/api/dctype.c10
-rw-r--r--usr.bin/tn3270/api/dctype.h8
-rw-r--r--usr.bin/tn3270/api/disp_asc.c10
-rw-r--r--usr.bin/tn3270/api/disp_asc.h8
-rw-r--r--usr.bin/tn3270/api/ebc_disp.c10
-rw-r--r--usr.bin/tn3270/api/ebc_disp.h8
-rw-r--r--usr.bin/tn3270/ascii/default.map8
-rw-r--r--usr.bin/tn3270/ascii/map3270.c10
-rw-r--r--usr.bin/tn3270/ascii/map3270.h8
-rw-r--r--usr.bin/tn3270/ascii/mset.c10
-rw-r--r--usr.bin/tn3270/ascii/state.h8
-rw-r--r--usr.bin/tn3270/ascii/termin.c10
-rw-r--r--usr.bin/tn3270/ctlr/3180.kbd8
-rw-r--r--usr.bin/tn3270/ctlr/3270pc.kbd8
-rw-r--r--usr.bin/tn3270/ctlr/api.c10
-rw-r--r--usr.bin/tn3270/ctlr/api.h8
-rw-r--r--usr.bin/tn3270/ctlr/declare.h8
-rw-r--r--usr.bin/tn3270/ctlr/externs.h8
-rw-r--r--usr.bin/tn3270/ctlr/function.c10
-rw-r--r--usr.bin/tn3270/ctlr/function.h8
-rw-r--r--usr.bin/tn3270/ctlr/hostctlr.h8
-rw-r--r--usr.bin/tn3270/ctlr/inbound.c10
-rw-r--r--usr.bin/tn3270/ctlr/oia.c10
-rw-r--r--usr.bin/tn3270/ctlr/oia.h8
-rw-r--r--usr.bin/tn3270/ctlr/options.c10
-rw-r--r--usr.bin/tn3270/ctlr/options.h8
-rw-r--r--usr.bin/tn3270/ctlr/outbound.c10
-rw-r--r--usr.bin/tn3270/ctlr/screen.h8
-rw-r--r--usr.bin/tn3270/ctlr/scrnctlr.h8
-rw-r--r--usr.bin/tn3270/ctlr/unix.kbd8
-rw-r--r--usr.bin/tn3270/general/genbsubs.c10
-rw-r--r--usr.bin/tn3270/general/general.h8
-rw-r--r--usr.bin/tn3270/general/globals.c10
-rw-r--r--usr.bin/tn3270/general/globals.h8
-rw-r--r--usr.bin/tn3270/general/vaxbsubs.s8
-rw-r--r--usr.bin/tn3270/mset/map3270.58
-rw-r--r--usr.bin/tn3270/mset/mset.18
-rw-r--r--usr.bin/tn3270/sys_curses/system.c10
-rw-r--r--usr.bin/tn3270/sys_curses/telextrn.h8
-rw-r--r--usr.bin/tn3270/sys_curses/terminal.h8
-rw-r--r--usr.bin/tn3270/sys_curses/termout.c10
-rw-r--r--usr.bin/tn3270/tn3270/tn3270.18
-rw-r--r--usr.bin/tn3270/tools/mkastods/mkastods.c10
-rw-r--r--usr.bin/tn3270/tools/mkastosc/mkastosc.c10
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.c10
-rw-r--r--usr.bin/tn3270/tools/mkdctype/ectype.h8
-rw-r--r--usr.bin/tn3270/tools/mkdctype/mkdctype.c10
-rw-r--r--usr.bin/tn3270/tools/mkdstoas/mkdstoas.c10
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.c10
-rw-r--r--usr.bin/tn3270/tools/mkhits/dohits.h8
-rw-r--r--usr.bin/tn3270/tools/mkhits/mkhits.c10
-rw-r--r--usr.bin/tn3270/tools/mkmake.y8
-rw-r--r--usr.bin/tn3270/tools/prt3270.c10
-rw-r--r--usr.bin/touch/touch.18
-rw-r--r--usr.bin/touch/touch.c10
-rw-r--r--usr.bin/tput/tput.18
-rw-r--r--usr.bin/tr/extern.h8
-rw-r--r--usr.bin/tr/str.c10
-rw-r--r--usr.bin/tr/tr.18
-rw-r--r--usr.bin/tr/tr.c10
-rw-r--r--usr.bin/true/true.18
-rw-r--r--usr.bin/tset/termcap.c10
-rw-r--r--usr.bin/tset/tset.18
-rw-r--r--usr.bin/tset/tset.c8
-rw-r--r--usr.bin/tsort/tsort.18
-rw-r--r--usr.bin/tty/tty.18
-rw-r--r--usr.bin/tty/tty.c10
-rw-r--r--usr.bin/ul/ul.18
-rw-r--r--usr.bin/ul/ul.c10
-rw-r--r--usr.bin/uname/uname.18
-rw-r--r--usr.bin/unexpand/unexpand.c10
-rw-r--r--usr.bin/unifdef/unifdef.18
-rw-r--r--usr.bin/unifdef/unifdef.c10
-rw-r--r--usr.bin/uniq/uniq.18
-rw-r--r--usr.bin/uniq/uniq.c10
-rw-r--r--usr.bin/unvis/unvis.18
-rw-r--r--usr.bin/unvis/unvis.c10
-rw-r--r--usr.bin/users/users.18
-rw-r--r--usr.bin/users/users.c10
-rw-r--r--usr.bin/uudecode/uudecode.c10
-rw-r--r--usr.bin/uuencode/uuencode.18
-rw-r--r--usr.bin/uuencode/uuencode.58
-rw-r--r--usr.bin/uuencode/uuencode.c10
-rw-r--r--usr.bin/vacation/vacation.18
-rw-r--r--usr.bin/vacation/vacation.c10
-rw-r--r--usr.bin/vgrind/RETEST/retest.c10
-rw-r--r--usr.bin/vgrind/extern.h8
-rw-r--r--usr.bin/vgrind/pathnames.h8
-rw-r--r--usr.bin/vgrind/regexp.c10
-rw-r--r--usr.bin/vgrind/vfontedpr.c10
-rw-r--r--usr.bin/vgrind/vgrind.18
-rw-r--r--usr.bin/vgrind/vgrind.sh8
-rw-r--r--usr.bin/vgrind/vgrindefs.58
-rw-r--r--usr.bin/vgrind/vgrindefs.c10
-rw-r--r--usr.bin/vgrind/vgrindefs.src8
-rw-r--r--usr.bin/vi/LICENSE6
-rw-r--r--usr.bin/vi/catalog/dump.c8
-rw-r--r--usr.bin/vi/docs/USD.doc/edit/edit.vindex8
-rw-r--r--usr.bin/vi/docs/USD.doc/edit/edittut.ms8
-rw-r--r--usr.bin/vi/docs/USD.doc/exref/ex.rm8
-rw-r--r--usr.bin/vi/docs/USD.doc/exref/ex.summary8
-rw-r--r--usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT6
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.chars8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.in8
-rw-r--r--usr.bin/vi/docs/USD.doc/vitut/vi.summary8
-rw-r--r--usr.bin/vi/include/bitstring.h8
-rw-r--r--usr.bin/vis/foldit.c10
-rw-r--r--usr.bin/vis/vis.18
-rw-r--r--usr.bin/vis/vis.c10
-rw-r--r--usr.bin/vmstat/vmstat.88
-rw-r--r--usr.bin/vmstat/vmstat.c8
-rw-r--r--usr.bin/w/extern.h8
-rw-r--r--usr.bin/w/pr_time.c10
-rw-r--r--usr.bin/w/proc_compare.c10
-rw-r--r--usr.bin/w/uptime.18
-rw-r--r--usr.bin/w/w.18
-rw-r--r--usr.bin/w/w.c10
-rw-r--r--usr.bin/wall/ttymsg.c10
-rw-r--r--usr.bin/wall/wall.18
-rw-r--r--usr.bin/wall/wall.c10
-rw-r--r--usr.bin/wc/wc.18
-rw-r--r--usr.bin/wc/wc.c10
-rw-r--r--usr.bin/what/what.18
-rw-r--r--usr.bin/what/what.c10
-rw-r--r--usr.bin/whatis/whatis.18
-rw-r--r--usr.bin/whatis/whatis.c8
-rw-r--r--usr.bin/which/whereis.18
-rw-r--r--usr.bin/which/which.18
-rw-r--r--usr.bin/who/who.18
-rw-r--r--usr.bin/who/who.c10
-rw-r--r--usr.bin/whois/whois.18
-rw-r--r--usr.bin/whois/whois.c10
-rw-r--r--usr.bin/window/README8
-rw-r--r--usr.bin/window/alias.h8
-rw-r--r--usr.bin/window/char.c10
-rw-r--r--usr.bin/window/char.h8
-rw-r--r--usr.bin/window/cmd.c10
-rw-r--r--usr.bin/window/cmd1.c10
-rw-r--r--usr.bin/window/cmd2.c10
-rw-r--r--usr.bin/window/cmd3.c10
-rw-r--r--usr.bin/window/cmd4.c10
-rw-r--r--usr.bin/window/cmd5.c10
-rw-r--r--usr.bin/window/cmd6.c10
-rw-r--r--usr.bin/window/cmd7.c10
-rw-r--r--usr.bin/window/compress.c10
-rw-r--r--usr.bin/window/context.c10
-rw-r--r--usr.bin/window/context.h8
-rw-r--r--usr.bin/window/defs.h8
-rw-r--r--usr.bin/window/error.c10
-rw-r--r--usr.bin/window/lcmd.c10
-rw-r--r--usr.bin/window/lcmd.h8
-rw-r--r--usr.bin/window/lcmd1.c10
-rw-r--r--usr.bin/window/lcmd2.c10
-rw-r--r--usr.bin/window/local.h8
-rw-r--r--usr.bin/window/main.c10
-rw-r--r--usr.bin/window/mloop.c10
-rw-r--r--usr.bin/window/parser.h8
-rw-r--r--usr.bin/window/parser1.c10
-rw-r--r--usr.bin/window/parser2.c10
-rw-r--r--usr.bin/window/parser3.c10
-rw-r--r--usr.bin/window/parser4.c10
-rw-r--r--usr.bin/window/parser5.c10
-rw-r--r--usr.bin/window/scanner.c10
-rw-r--r--usr.bin/window/startup.c10
-rw-r--r--usr.bin/window/string.c10
-rw-r--r--usr.bin/window/string.h8
-rw-r--r--usr.bin/window/token.h8
-rw-r--r--usr.bin/window/tt.h8
-rw-r--r--usr.bin/window/ttf100.c10
-rw-r--r--usr.bin/window/ttgeneric.c10
-rw-r--r--usr.bin/window/tth19.c10
-rw-r--r--usr.bin/window/tth29.c10
-rw-r--r--usr.bin/window/ttinit.c10
-rw-r--r--usr.bin/window/ttoutput.c10
-rw-r--r--usr.bin/window/tttermcap.c10
-rw-r--r--usr.bin/window/tttvi925.c10
-rw-r--r--usr.bin/window/ttwyse60.c10
-rw-r--r--usr.bin/window/ttwyse75.c10
-rw-r--r--usr.bin/window/ttzapple.c10
-rw-r--r--usr.bin/window/ttzentec.c10
-rw-r--r--usr.bin/window/value.h8
-rw-r--r--usr.bin/window/var.c10
-rw-r--r--usr.bin/window/var.h8
-rw-r--r--usr.bin/window/win.c10
-rw-r--r--usr.bin/window/window.18
-rw-r--r--usr.bin/window/windowrc8
-rw-r--r--usr.bin/window/ww.h8
-rw-r--r--usr.bin/window/wwadd.c10
-rw-r--r--usr.bin/window/wwalloc.c10
-rw-r--r--usr.bin/window/wwbox.c10
-rw-r--r--usr.bin/window/wwchild.c10
-rw-r--r--usr.bin/window/wwclose.c10
-rw-r--r--usr.bin/window/wwclreol.c10
-rw-r--r--usr.bin/window/wwclreos.c10
-rw-r--r--usr.bin/window/wwcursor.c10
-rw-r--r--usr.bin/window/wwdata.c10
-rw-r--r--usr.bin/window/wwdelchar.c10
-rw-r--r--usr.bin/window/wwdelete.c10
-rw-r--r--usr.bin/window/wwdelline.c10
-rw-r--r--usr.bin/window/wwdump.c10
-rw-r--r--usr.bin/window/wwend.c10
-rw-r--r--usr.bin/window/wwenviron.c10
-rw-r--r--usr.bin/window/wwerror.c10
-rw-r--r--usr.bin/window/wwflush.c10
-rw-r--r--usr.bin/window/wwframe.c10
-rw-r--r--usr.bin/window/wwgets.c10
-rw-r--r--usr.bin/window/wwinit.c10
-rw-r--r--usr.bin/window/wwinschar.c10
-rw-r--r--usr.bin/window/wwinsline.c10
-rw-r--r--usr.bin/window/wwiomux.c10
-rw-r--r--usr.bin/window/wwlabel.c10
-rw-r--r--usr.bin/window/wwmisc.c10
-rw-r--r--usr.bin/window/wwmove.c10
-rw-r--r--usr.bin/window/wwopen.c10
-rw-r--r--usr.bin/window/wwprintf.c10
-rw-r--r--usr.bin/window/wwpty.c10
-rw-r--r--usr.bin/window/wwputc.c10
-rw-r--r--usr.bin/window/wwputs.c10
-rw-r--r--usr.bin/window/wwredraw.c10
-rw-r--r--usr.bin/window/wwredrawwin.c10
-rw-r--r--usr.bin/window/wwrint.c10
-rw-r--r--usr.bin/window/wwscroll.c10
-rw-r--r--usr.bin/window/wwsize.c10
-rw-r--r--usr.bin/window/wwspawn.c10
-rw-r--r--usr.bin/window/wwsuspend.c10
-rw-r--r--usr.bin/window/wwterminfo.c10
-rw-r--r--usr.bin/window/wwtty.c10
-rw-r--r--usr.bin/window/wwunframe.c10
-rw-r--r--usr.bin/window/wwupdate.c10
-rw-r--r--usr.bin/window/wwwrite.c10
-rw-r--r--usr.bin/window/xx.c10
-rw-r--r--usr.bin/window/xx.h8
-rw-r--r--usr.bin/window/xxflush.c10
-rw-r--r--usr.bin/write/write.18
-rw-r--r--usr.bin/write/write.c10
-rw-r--r--usr.bin/xargs/pathnames.h8
-rw-r--r--usr.bin/xargs/xargs.18
-rw-r--r--usr.bin/xargs/xargs.c10
-rw-r--r--usr.bin/xinstall/install.18
-rw-r--r--usr.bin/xinstall/pathnames.h8
-rw-r--r--usr.bin/xinstall/xinstall.c10
-rw-r--r--usr.bin/xstr/pathnames.h8
-rw-r--r--usr.bin/xstr/xstr.18
-rw-r--r--usr.bin/xstr/xstr.c10
-rw-r--r--usr.bin/yacc/closure.c10
-rw-r--r--usr.bin/yacc/defs.h8
-rw-r--r--usr.bin/yacc/error.c10
-rw-r--r--usr.bin/yacc/lalr.c10
-rw-r--r--usr.bin/yacc/lr0.c10
-rw-r--r--usr.bin/yacc/main.c10
-rw-r--r--usr.bin/yacc/mkpar.c8
-rw-r--r--usr.bin/yacc/output.c10
-rw-r--r--usr.bin/yacc/reader.c8
-rw-r--r--usr.bin/yacc/skeleton.c10
-rw-r--r--usr.bin/yacc/symtab.c10
-rw-r--r--usr.bin/yacc/verbose.c10
-rw-r--r--usr.bin/yacc/warshall.c10
-rw-r--r--usr.bin/yacc/yacc.18
-rw-r--r--usr.bin/yacc/yyfix.18
-rw-r--r--usr.bin/yacc/yyfix.sh8
-rw-r--r--usr.bin/yes/yes.18
-rw-r--r--usr.bin/yes/yes.c10
880 files changed, 2214 insertions, 5734 deletions
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 39d6aa48a63..54f72d08d49 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apply.1,v 1.18 2003/03/12 20:12:37 deraadt Exp $
+.\" $OpenBSD: apply.1,v 1.19 2003/06/03 02:56:05 millert Exp $
.\" $NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 802a839dd56..a0425b36991 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apply.c,v 1.13 2003/04/06 23:22:43 deraadt Exp $ */
+/* $OpenBSD: apply.c,v 1.14 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: apply.c,v 1.3 1995/03/25 03:38:23 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)apply.c 8.4 (Berkeley) 4/4/94";
#else
-static char rcsid[] = "$OpenBSD: apply.c,v 1.13 2003/04/06 23:22:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: apply.c,v 1.14 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1
index fb2e06b43f3..301d6c92545 100644
--- a/usr.bin/apropos/apropos.1
+++ b/usr.bin/apropos/apropos.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apropos.1,v 1.8 2003/03/10 05:51:29 millert Exp $
+.\" $OpenBSD: apropos.1,v 1.9 2003/06/03 02:56:05 millert Exp $
.\" $NetBSD: apropos.1,v 1.4 1995/09/04 20:46:17 tls Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/apropos/apropos.c b/usr.bin/apropos/apropos.c
index 9208d258532..61e53d8e6be 100644
--- a/usr.bin/apropos/apropos.c
+++ b/usr.bin/apropos/apropos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $ */
+/* $OpenBSD: apropos.c,v 1.9 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: apropos.c,v 1.5 1995/09/04 20:46:20 tls Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)apropos.c 8.8 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$OpenBSD: apropos.c,v 1.8 2002/02/16 21:27:43 millert Exp $";
+static char rcsid[] = "$OpenBSD: apropos.c,v 1.9 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/append.c b/usr.bin/ar/append.c
index 903c063d0b6..2ccc3b9dc1d 100644
--- a/usr.bin/ar/append.c
+++ b/usr.bin/ar/append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: append.c,v 1.3 1997/09/11 11:24:54 deraadt Exp $ */
+/* $OpenBSD: append.c,v 1.4 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: append.c,v 1.5 1995/03/26 03:27:37 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)append.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: append.c,v 1.3 1997/09/11 11:24:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: append.c,v 1.4 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index f93aa5c424e..3d6c5779f34 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ar.1,v 1.11 2002/12/11 22:01:13 millert Exp $
+.\" $OpenBSD: ar.1,v 1.12 2003/06/03 02:56:05 millert Exp $
.\" $NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 08cf58f3b41..14d9ba34d82 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ar.5,v 1.5 2003/03/10 15:37:29 jmc Exp $
+.\" $OpenBSD: ar.5,v 1.6 2003/06/03 02:56:05 millert Exp $
.\" $NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index e640c8f301c..f1602625bfe 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar.c,v 1.9 2003/04/04 22:12:08 deraadt Exp $ */
+/* $OpenBSD: ar.c,v 1.10 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: ar.c,v 1.5 1995/03/26 03:27:44 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ar.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: ar.c,v 1.9 2003/04/04 22:12:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ar.c,v 1.10 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/archive.c b/usr.bin/ar/archive.c
index 6043df2f074..1cae4f9b087 100644
--- a/usr.bin/ar/archive.c
+++ b/usr.bin/ar/archive.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: archive.c,v 1.8 2003/04/04 22:12:09 deraadt Exp $ */
+/* $OpenBSD: archive.c,v 1.9 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: archive.c,v 1.7 1995/03/26 03:27:46 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)archive.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: archive.c,v 1.8 2003/04/04 22:12:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: archive.c,v 1.9 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/archive.h b/usr.bin/ar/archive.h
index 39e93a4b1bc..bd9e74d59f1 100644
--- a/usr.bin/ar/archive.h
+++ b/usr.bin/ar/archive.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: archive.h,v 1.4 2002/02/16 21:27:43 millert Exp $ */
+/* $OpenBSD: archive.h,v 1.5 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: archive.h,v 1.6 1995/03/25 06:39:43 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ar/contents.c b/usr.bin/ar/contents.c
index 866f88c9eef..51f38a1d956 100644
--- a/usr.bin/ar/contents.c
+++ b/usr.bin/ar/contents.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: contents.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $ */
+/* $OpenBSD: contents.c,v 1.3 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: contents.c,v 1.5 1995/03/26 03:27:49 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)contents.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: contents.c,v 1.2 1996/06/26 05:31:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: contents.c,v 1.3 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/delete.c b/usr.bin/ar/delete.c
index ed9034b6978..ce7a348e665 100644
--- a/usr.bin/ar/delete.c
+++ b/usr.bin/ar/delete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: delete.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $ */
+/* $OpenBSD: delete.c,v 1.4 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: delete.c,v 1.5 1995/03/26 03:27:52 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)delete.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: delete.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: delete.c,v 1.4 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/extern.h b/usr.bin/ar/extern.h
index b4f83b540c2..602de1d6486 100644
--- a/usr.bin/ar/extern.h
+++ b/usr.bin/ar/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:43 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/03/25 06:39:46 glass Exp $ */
/*-
@@ -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/usr.bin/ar/extract.c b/usr.bin/ar/extract.c
index 598e0984652..2382d721c46 100644
--- a/usr.bin/ar/extract.c
+++ b/usr.bin/ar/extract.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: extract.c,v 1.4 1997/08/19 07:22:09 denny Exp $ */
+/* $OpenBSD: extract.c,v 1.5 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: extract.c,v 1.5 1995/03/26 03:27:53 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)extract.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: extract.c,v 1.4 1997/08/19 07:22:09 denny Exp $";
+static char rcsid[] = "$OpenBSD: extract.c,v 1.5 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/misc.c b/usr.bin/ar/misc.c
index 215f944a207..50c7fa0af8b 100644
--- a/usr.bin/ar/misc.c
+++ b/usr.bin/ar/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 1999/08/26 09:04:00 fgsch Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/03/26 03:27:55 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1999/08/26 09:04:00 fgsch Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.5 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/move.c b/usr.bin/ar/move.c
index d99f1c3a483..b01b977e743 100644
--- a/usr.bin/ar/move.c
+++ b/usr.bin/ar/move.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: move.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $ */
+/* $OpenBSD: move.c,v 1.4 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: move.c,v 1.5 1995/03/26 03:27:57 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)move.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: move.c,v 1.3 1997/06/17 20:47:09 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: move.c,v 1.4 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/pathnames.h b/usr.bin/ar/pathnames.h
index 1dc46689c1f..7f042dda2c8 100644
--- a/usr.bin/ar/pathnames.h
+++ b/usr.bin/ar/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1999/08/26 09:04:00 fgsch Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1995/03/25 06:39:50 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ar/print.c b/usr.bin/ar/print.c
index ed5490723f1..a49ca889b81 100644
--- a/usr.bin/ar/print.c
+++ b/usr.bin/ar/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.2 1996/06/26 05:31:22 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.3 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: print.c,v 1.5 1995/03/26 03:27:59 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.2 1996/06/26 05:31:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.3 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ar/replace.c b/usr.bin/ar/replace.c
index 2087ce65ae1..cb61cf9a7bb 100644
--- a/usr.bin/ar/replace.c
+++ b/usr.bin/ar/replace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: replace.c,v 1.4 1997/09/11 11:24:55 deraadt Exp $ */
+/* $OpenBSD: replace.c,v 1.5 2003/06/03 02:56:05 millert Exp $ */
/* $NetBSD: replace.c,v 1.6 1995/03/26 03:28:01 glass Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)replace.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: replace.c,v 1.4 1997/09/11 11:24:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: replace.c,v 1.5 2003/06/03 02:56:05 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/at/atq.1 b/usr.bin/at/atq.1
index 284ee8def7a..a1ca05d1a76 100644
--- a/usr.bin/at/atq.1
+++ b/usr.bin/at/atq.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atq.1,v 1.2 2003/02/19 22:11:42 millert Exp $
+.\" $OpenBSD: atq.1,v 1.3 2003/06/03 02:56:05 millert Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/at/atrm.1 b/usr.bin/at/atrm.1
index bfc41e2694e..babca516d46 100644
--- a/usr.bin/at/atrm.1
+++ b/usr.bin/at/atrm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: atrm.1,v 1.3 2003/02/19 22:11:42 millert Exp $
+.\" $OpenBSD: atrm.1,v 1.4 2003/06/03 02:56:05 millert Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/banner/banner.c b/usr.bin/banner/banner.c
index 0c4c220f9c8..e513de26ee4 100644
--- a/usr.bin/banner/banner.c
+++ b/usr.bin/banner/banner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: banner.c,v 1.6 2003/03/13 23:11:16 tedu Exp $ */
+/* $OpenBSD: banner.c,v 1.7 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: banner.c,v 1.2 1995/04/09 06:00:15 cgd Exp $ */
/*
@@ -32,11 +32,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.
*
@@ -59,7 +55,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)printjob.c 8.2 (Berkeley) 4/16/94";
#else
-static const char rcsid[] = "$OpenBSD: banner.c,v 1.6 2003/03/13 23:11:16 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: banner.c,v 1.7 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/banner/chset.c b/usr.bin/banner/chset.c
index 2f906a0888c..f158f758ada 100644
--- a/usr.bin/banner/chset.c
+++ b/usr.bin/banner/chset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chset.c,v 1.3 2003/03/13 23:11:16 tedu Exp $ */
+/* $OpenBSD: chset.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: chset.c,v 1.2 1995/04/09 06:00:26 cgd Exp $ */
/*
@@ -31,11 +31,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.
*
@@ -56,7 +52,7 @@
#if 0
static char sccsid[] = "@(#)lpdchar.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: chset.c,v 1.3 2003/03/13 23:11:16 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: chset.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 501286f480b..15176b6164e 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: basename.1,v 1.11 2000/03/04 21:12:01 aaron Exp $
+.\" $OpenBSD: basename.1,v 1.12 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/basename/basename.c b/usr.bin/basename/basename.c
index 41e7d7c0e6f..e5a279f8595 100644
--- a/usr.bin/basename/basename.c
+++ b/usr.bin/basename/basename.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: basename.c,v 1.4 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: basename.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: basename.c,v 1.9 1995/09/02 05:29:46 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: basename.c,v 1.4 2002/02/16 21:27:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: basename.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/bdes/bdes.1 b/usr.bin/bdes/bdes.1
index db8974ee21a..7c3085c35fa 100644
--- a/usr.bin/bdes/bdes.1
+++ b/usr.bin/bdes/bdes.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bdes.1,v 1.5 1999/06/05 01:21:19 aaron Exp $
+.\" $OpenBSD: bdes.1,v 1.6 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: bdes.1,v 1.1 1995/07/24 04:30:51 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/bdes/bdes.c b/usr.bin/bdes/bdes.c
index 686dddb27c5..3cb3b4c3578 100644
--- a/usr.bin/bdes/bdes.c
+++ b/usr.bin/bdes/bdes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bdes.c,v 1.9 2003/03/31 20:46:03 rohee Exp $ */
+/* $OpenBSD: bdes.c,v 1.10 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: bdes.c,v 1.2 1995/03/26 03:33:19 glass Exp $ */
/*-
@@ -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.
*
@@ -51,7 +47,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)bdes.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: bdes.c,v 1.9 2003/03/31 20:46:03 rohee Exp $";
+static char rcsid[] = "$OpenBSD: bdes.c,v 1.10 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 6c9a8665f30..863deab3664 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biff.1,v 1.12 2000/11/20 14:09:57 deraadt Exp $
+.\" $OpenBSD: biff.1,v 1.13 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: biff.1,v 1.3 1995/03/26 02:34:21 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index e033cc64942..ad6c0caee77 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biff.c,v 1.7 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: biff.c,v 1.8 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: biff.c,v 1.3 1995/03/26 02:34:22 glass Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)biff.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: biff.c,v 1.7 2002/02/16 21:27:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: biff.c,v 1.8 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index e220c8cf760..94d21fa33b8 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cal.1,v 1.10 2000/04/17 02:32:43 aaron Exp $
+.\" $OpenBSD: cal.1,v 1.11 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c
index e5aa391826d..0774d67c78d 100644
--- a/usr.bin/cal/cal.c
+++ b/usr.bin/cal/cal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cal.c,v 1.8 2002/05/29 09:23:25 deraadt Exp $ */
+/* $OpenBSD: cal.c,v 1.9 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: cal.c,v 1.6 1995/03/26 03:10:24 glass Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: cal.c,v 1.8 2002/05/29 09:23:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cal.c,v 1.9 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 1352341f7e2..31c4b2e03d5 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: calendar.1,v 1.21 2003/03/10 15:37:30 jmc Exp $
+.\" $OpenBSD: calendar.1,v 1.22 2003/06/03 02:56:06 millert Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c
index 35a73f6a944..17fc1de2b20 100644
--- a/usr.bin/calendar/calendar.c
+++ b/usr.bin/calendar/calendar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: calendar.c,v 1.19 2002/12/08 16:50:07 millert Exp $ */
+/* $OpenBSD: calendar.c,v 1.20 2003/06/03 02:56:06 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -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.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: calendar.c,v 1.19 2002/12/08 16:50:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: calendar.c,v 1.20 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/calendar.h b/usr.bin/calendar/calendar.h
index a5a17a2e5fe..6c2365fb6b1 100644
--- a/usr.bin/calendar/calendar.h
+++ b/usr.bin/calendar/calendar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: calendar.h,v 1.8 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: calendar.h,v 1.9 2003/06/03 02:56:06 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -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/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 71f35e01d4f..b8e4786c933 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: day.c,v 1.14 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: day.c,v 1.15 2003/06/03 02:56:06 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -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.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: day.c,v 1.14 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: day.c,v 1.15 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index e1b7766b403..a27099c7c65 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.23 2003/04/06 19:59:12 grange Exp $ */
+/* $OpenBSD: io.c,v 1.24 2003/06/03 02:56:06 millert Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -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.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)calendar.c 8.3 (Berkeley) 3/25/94";
#else
-static char rcsid[] = "$OpenBSD: io.c,v 1.23 2003/04/06 19:59:12 grange Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.24 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/calendar/pathnames.h b/usr.bin/calendar/pathnames.h
index 6ce7096901b..b6977f0af4c 100644
--- a/usr.bin/calendar/pathnames.h
+++ b/usr.bin/calendar/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/12/05 06:04:41 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index f1303c3ca13..0b190cd07ab 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cap_mkdb.1,v 1.12 2000/11/09 17:52:04 aaron Exp $
+.\" $OpenBSD: cap_mkdb.1,v 1.13 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cap_mkdb/cap_mkdb.c b/usr.bin/cap_mkdb/cap_mkdb.c
index 1ad679711f9..6e3186f169e 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.c
+++ b/usr.bin/cap_mkdb/cap_mkdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cap_mkdb.c,v 1.9 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: cap_mkdb.c,v 1.10 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: cap_mkdb.c,v 1.5 1995/09/02 05:47:12 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95";
#endif
-static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.9 2002/02/16 21:27:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: cap_mkdb.c,v 1.10 2003/06/03 02:56:06 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 48cc2e7641e..b666966b534 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: checknr.1,v 1.11 2000/11/21 13:43:52 aaron Exp $
+.\" $OpenBSD: checknr.1,v 1.12 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: checknr.1,v 1.5 1995/03/26 04:10:14 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/checknr/checknr.c b/usr.bin/checknr/checknr.c
index c0ce8aaf1a3..f20556dc867 100644
--- a/usr.bin/checknr/checknr.c
+++ b/usr.bin/checknr/checknr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: checknr.c,v 1.8 2003/04/03 22:09:04 deraadt Exp $ */
+/* $OpenBSD: checknr.c,v 1.9 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: checknr.c,v 1.4 1995/03/26 04:10:19 glass Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)checknr.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: checknr.c,v 1.8 2003/04/03 22:09:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: checknr.c,v 1.9 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 417ad3e5667..dc73001ecc8 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chpass.1,v 1.27 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: chpass.1,v 1.28 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index dfa33686041..e248de78c91 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: chpass.c,v 1.26 2002/07/31 22:08:41 millert Exp $ */
+/* $OpenBSD: chpass.c,v 1.27 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: chpass.c,v 1.8 1996/05/15 21:50:43 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)chpass.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: chpass.c,v 1.26 2002/07/31 22:08:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: chpass.c,v 1.27 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/chpass.h b/usr.bin/chpass/chpass.h
index ec0f17d4d2b..1958713b667 100644
--- a/usr.bin/chpass/chpass.h
+++ b/usr.bin/chpass/chpass.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: chpass.h,v 1.7 2002/07/31 22:08:42 millert Exp $ */
+/* $OpenBSD: chpass.h,v 1.8 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: chpass.h,v 1.4 1996/05/15 21:50:44 jtc Exp $ */
/*
@@ -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/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index 2e914d8daf2..c56d5f85cfb 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.26 2003/04/03 17:16:32 millert Exp $ */
+/* $OpenBSD: edit.c,v 1.27 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: edit.c,v 1.6 1996/05/15 21:50:45 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)edit.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: edit.c,v 1.26 2003/04/03 17:16:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: edit.c,v 1.27 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/field.c b/usr.bin/chpass/field.c
index a6b29c35afa..c9c742e012b 100644
--- a/usr.bin/chpass/field.c
+++ b/usr.bin/chpass/field.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: field.c,v 1.4 2002/06/27 19:02:40 deraadt Exp $ */
+/* $OpenBSD: field.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: field.c,v 1.3 1995/03/26 04:55:28 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)field.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: field.c,v 1.4 2002/06/27 19:02:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: field.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/pathnames.h b/usr.bin/chpass/pathnames.h
index 395307b633b..e8883f0b0b8 100644
--- a/usr.bin/chpass/pathnames.h
+++ b/usr.bin/chpass/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/09/16 02:26:02 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/03/26 04:55:29 glass Exp $ */
/*
@@ -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/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index b12b6f74b61..3113fb665b2 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pw_yp.c,v 1.17 2003/04/17 07:37:04 pvalchev Exp $ */
+/* $OpenBSD: pw_yp.c,v 1.18 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: pw_yp.c,v 1.5 1995/03/26 04:55:33 glass Exp $ */
/*
@@ -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.
*
@@ -37,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)pw_yp.c 1.0 2/2/93";
#else
-static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.17 2003/04/17 07:37:04 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: pw_yp.c,v 1.18 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/table.c b/usr.bin/chpass/table.c
index 4dd59b54aff..a03131f5c08 100644
--- a/usr.bin/chpass/table.c
+++ b/usr.bin/chpass/table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: table.c,v 1.4 2000/03/23 15:23:51 aaron Exp $ */
+/* $OpenBSD: table.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: table.c,v 1.3 1995/03/26 04:55:34 glass Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)table.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: table.c,v 1.4 2000/03/23 15:23:51 aaron Exp $";
+static char rcsid[] = "$OpenBSD: table.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index e501fada390..ab96302dec2 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.5 2002/06/27 19:02:40 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.6 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: util.c,v 1.4 1995/03/26 04:55:35 glass Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)util.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: util.c,v 1.5 2002/06/27 19:02:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.6 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index ee0c37e571e..e751b75051a 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cksum.1,v 1.14 2002/01/24 20:33:46 mickey Exp $
+.\" $OpenBSD: cksum.1,v 1.15 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 7c1e0d6ab53..376db265981 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cksum.c,v 1.9 2002/12/13 15:28:34 millert Exp $ */
+/* $OpenBSD: cksum.c,v 1.10 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: cksum.c,v 1.7 1995/09/02 05:45:18 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cksum.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$OpenBSD: cksum.c,v 1.9 2002/12/13 15:28:34 millert Exp $";
+static char rcsid[] = "$OpenBSD: cksum.c,v 1.10 2003/06/03 02:56:06 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/cksum/crc.c b/usr.bin/cksum/crc.c
index 7ac0b01efd5..b2f65788403 100644
--- a/usr.bin/cksum/crc.c
+++ b/usr.bin/cksum/crc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: crc.c,v 1.3 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: crc.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -42,7 +38,7 @@
static char sccsid[] = "@(#)crc.c 8.1 (Berkeley) 6/17/93";
static char rcsid[] = "$NetBSD: crc.c,v 1.7 1996/02/27 21:29:53 jtc Exp $";
#else
-static char rcsid[] = "$OpenBSD: crc.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: crc.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/extern.h b/usr.bin/cksum/extern.h
index 27156b21b1f..db28b8502b6 100644
--- a/usr.bin/cksum/extern.h
+++ b/usr.bin/cksum/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:44 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: extern.h,v 1.5 1995/03/26 05:15:19 glass Exp $ */
/*-
@@ -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/usr.bin/cksum/print.c b/usr.bin/cksum/print.c
index fbfa797988b..f9611545c55 100644
--- a/usr.bin/cksum/print.c
+++ b/usr.bin/cksum/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.2 1996/06/26 05:32:03 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.3 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: print.c,v 1.5 1995/03/26 05:15:21 glass Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.2 1996/06/26 05:32:03 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.3 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/sum1.c b/usr.bin/cksum/sum1.c
index bc3fe79c790..e359552dff7 100644
--- a/usr.bin/cksum/sum1.c
+++ b/usr.bin/cksum/sum1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sum1.c,v 1.3 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: sum1.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: sum1.c,v 1.5 1996/02/27 21:17:27 cgd Exp $ */
/*-
@@ -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.
*
@@ -39,7 +35,7 @@
static char sccsid[] = "@(#)sum1.c 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$NetBSD: sum1.c,v 1.5 1996/02/27 21:17:27 cgd Exp $";
#else
-static char rcsid[] = "$OpenBSD: sum1.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: sum1.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cksum/sum2.c b/usr.bin/cksum/sum2.c
index 2af8d6806ec..3f8b60ae963 100644
--- a/usr.bin/cksum/sum2.c
+++ b/usr.bin/cksum/sum2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sum2.c,v 1.3 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: sum2.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: sum2.c,v 1.5 1996/02/27 21:17:28 cgd Exp $ */
/*-
@@ -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.
*
@@ -39,7 +35,7 @@
static char sccsid[] = "@(#)sum2.c 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$NetBSD: sum2.c,v 1.5 1996/02/27 21:17:28 cgd Exp $";
#else
-static char rcsid[] = "$OpenBSD: sum2.c,v 1.3 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: sum2.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 8649d4fda7f..0cdf2744851 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cmp.1,v 1.9 2000/11/09 17:52:06 aaron Exp $
+.\" $OpenBSD: cmp.1,v 1.10 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cmp/cmp.c b/usr.bin/cmp/cmp.c
index 1c6904cd9e8..a325a4b0bff 100644
--- a/usr.bin/cmp/cmp.c
+++ b/usr.bin/cmp/cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: cmp.c,v 1.10 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: cmp.c,v 1.7 1995/09/08 03:22:56 tls Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cmp.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: cmp.c,v 1.9 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmp.c,v 1.10 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/extern.h b/usr.bin/cmp/extern.h
index 481821f12e3..ff55589f105 100644
--- a/usr.bin/cmp/extern.h
+++ b/usr.bin/cmp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: extern.h,v 1.2 1995/09/08 03:22:57 tls Exp $ */
/*-
@@ -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/usr.bin/cmp/misc.c b/usr.bin/cmp/misc.c
index 9b06d853514..a3677f75048 100644
--- a/usr.bin/cmp/misc.c
+++ b/usr.bin/cmp/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.3 2001/07/12 05:16:58 deraadt Exp $ */
+/* $OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: misc.c,v 1.2 1995/09/08 03:22:58 tls Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.3 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.4 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/regular.c b/usr.bin/cmp/regular.c
index 258634ae723..f5fe302456f 100644
--- a/usr.bin/cmp/regular.c
+++ b/usr.bin/cmp/regular.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regular.c,v 1.6 2001/07/12 05:16:58 deraadt Exp $ */
+/* $OpenBSD: regular.c,v 1.7 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: regular.c,v 1.2 1995/09/08 03:22:59 tls Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)regular.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: regular.c,v 1.6 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: regular.c,v 1.7 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cmp/special.c b/usr.bin/cmp/special.c
index 3c389bd1c27..6753312855f 100644
--- a/usr.bin/cmp/special.c
+++ b/usr.bin/cmp/special.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: special.c,v 1.4 2001/07/12 05:16:58 deraadt Exp $ */
+/* $OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: special.c,v 1.2 1995/09/08 03:23:00 tls Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)special.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: special.c,v 1.4 2001/07/12 05:16:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: special.c,v 1.5 2003/06/03 02:56:06 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index 0513f5453d8..3ce02d0af23 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: col.1,v 1.7 2000/11/21 18:14:55 aaron Exp $
+.\" $OpenBSD: col.1,v 1.8 2003/06/03 02:56:06 millert Exp $
.\" $NetBSD: col.1,v 1.4 1995/03/26 05:25:52 glass Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/col/col.c b/usr.bin/col/col.c
index ffb6275b740..c4553f965fa 100644
--- a/usr.bin/col/col.c
+++ b/usr.bin/col/col.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: col.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: col.c,v 1.8 2003/06/03 02:56:06 millert Exp $ */
/* $NetBSD: col.c,v 1.7 1995/09/02 05:48:50 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)col.c 8.5 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: col.c,v 1.7 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: col.c,v 1.8 2003/06/03 02:56:06 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index a8b63ca0722..e6d9cd1aaf5 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colcrt.1,v 1.8 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: colcrt.1,v 1.9 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: colcrt.1,v 1.3 1995/03/26 05:30:59 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/colcrt/colcrt.c b/usr.bin/colcrt/colcrt.c
index 055302ea1e9..ad7bdb30e54 100644
--- a/usr.bin/colcrt/colcrt.c
+++ b/usr.bin/colcrt/colcrt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: colcrt.c,v 1.4 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: colcrt.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: colcrt.c,v 1.3 1995/03/26 05:31:00 glass Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)colcrt.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: colcrt.c,v 1.4 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: colcrt.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 3b44a3cc216..f4327f3c096 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colrm.1,v 1.5 1999/07/04 11:53:52 aaron Exp $
+.\" $OpenBSD: colrm.1,v 1.6 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: colrm.1,v 1.3 1995/03/26 09:04:01 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index 347a2c57b77..eb64238a95a 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: colrm.c,v 1.6 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: colrm.c,v 1.7 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: colrm.c,v 1.4 1995/09/02 05:51:37 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)colrm.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: colrm.c,v 1.6 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: colrm.c,v 1.7 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index 226fea98cd6..1643a6ef270 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: column.1,v 1.8 2000/11/10 05:10:22 aaron Exp $
+.\" $OpenBSD: column.1,v 1.9 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: column.1,v 1.3 1995/03/26 09:08:28 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c
index 66f23749341..416287bb2c2 100644
--- a/usr.bin/column/column.c
+++ b/usr.bin/column/column.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: column.c,v 1.7 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: column.c,v 1.8 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: column.c,v 1.4 1995/09/02 05:53:03 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)column.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: column.c,v 1.7 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: column.c,v 1.8 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 35b247faa7a..d3bdd34538d 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: comm.1,v 1.8 2002/01/25 19:57:46 mickey Exp $
+.\" $OpenBSD: comm.1,v 1.9 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: comm.1,v 1.4 1995/03/26 09:25:50 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index 1b25e1e42f0..53389f7a8d5 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comm.c,v 1.5 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: comm.c,v 1.6 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: comm.c,v 1.10 1995/09/05 19:57:43 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)comm.c 8.4 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: comm.c,v 1.5 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: comm.c,v 1.6 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index dbf5a00d946..09f55e175be 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: compress.1,v 1.15 2002/12/17 16:16:08 millert Exp $
+.\" $OpenBSD: compress.1,v 1.16 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
.\"
.\" Copyright (c) 1986, 1990, 1993
@@ -16,11 +16,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/compress/zopen.3 b/usr.bin/compress/zopen.3
index 7a2d5e03958..1af0d2be3e8 100644
--- a/usr.bin/compress/zopen.3
+++ b/usr.bin/compress/zopen.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: zopen.3,v 1.5 2000/03/05 20:09:21 aaron Exp $
+.\" $OpenBSD: zopen.3,v 1.6 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: zopen.3,v 1.3 1995/03/26 09:44:49 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/compress/zopen.c b/usr.bin/compress/zopen.c
index 133eb129175..167096d66f9 100644
--- a/usr.bin/compress/zopen.c
+++ b/usr.bin/compress/zopen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zopen.c,v 1.9 2002/12/08 16:07:54 mickey Exp $ */
+/* $OpenBSD: zopen.c,v 1.10 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: zopen.c,v 1.5 1995/03/26 09:44:53 glass Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@
static char sccsid[] = "@(#)zopen.c 8.1 (Berkeley) 6/27/93";
#else
const char z_rcsid[] =
- "$OpenBSD: zopen.c,v 1.9 2002/12/08 16:07:54 mickey Exp $";
+ "$OpenBSD: zopen.c,v 1.10 2003/06/03 02:56:07 millert Exp $";
#endif
/*-
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index e8607ed8ab3..30933b8b418 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $OpenBSD: cpp.sh,v 1.5 1999/06/17 23:27:17 espie Exp $
+# $OpenBSD: cpp.sh,v 1.6 2003/06/03 02:56:07 millert Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
@@ -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/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 0ffa294c8b1..ee8560a8369 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: C.c,v 1.8 2003/05/12 20:41:39 pjanzen Exp $ */
+/* $OpenBSD: C.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: C.c,v 1.3 1995/03/26 20:14:02 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: C.c,v 1.8 2003/05/12 20:41:39 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: C.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 0c2dd99c94c..8057e5d4d75 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ctags.1,v 1.11 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: ctags.1,v 1.12 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ctags/ctags.c b/usr.bin/ctags/ctags.c
index 0affda6c26e..3263a09d0af 100644
--- a/usr.bin/ctags/ctags.c
+++ b/usr.bin/ctags/ctags.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctags.c,v 1.8 2003/04/25 20:07:09 pvalchev Exp $ */
+/* $OpenBSD: ctags.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: ctags.c,v 1.4 1995/09/02 05:57:23 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
-static char rcsid[] = "$OpenBSD: ctags.c,v 1.8 2003/04/25 20:07:09 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: ctags.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/ctags/ctags.h b/usr.bin/ctags/ctags.h
index 7864d4416c0..5b4938e7746 100644
--- a/usr.bin/ctags/ctags.h
+++ b/usr.bin/ctags/ctags.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctags.h,v 1.4 2003/05/12 20:41:39 pjanzen Exp $ */
+/* $OpenBSD: ctags.h,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: ctags.h,v 1.3 1995/03/26 20:14:07 glass Exp $ */
/*
@@ -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/usr.bin/ctags/fortran.c b/usr.bin/ctags/fortran.c
index 53fad340e72..99c7d373f19 100644
--- a/usr.bin/ctags/fortran.c
+++ b/usr.bin/ctags/fortran.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fortran.c,v 1.4 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: fortran.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: fortran.c,v 1.3 1995/03/26 20:14:08 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fortran.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: fortran.c,v 1.4 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: fortran.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/lisp.c b/usr.bin/ctags/lisp.c
index 04e8e905e40..7db8940c0f3 100644
--- a/usr.bin/ctags/lisp.c
+++ b/usr.bin/ctags/lisp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lisp.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $ */
+/* $OpenBSD: lisp.c,v 1.4 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: lisp.c,v 1.3 1995/03/26 20:14:09 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lisp.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: lisp.c,v 1.3 2000/07/25 19:28:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lisp.c,v 1.4 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/print.c b/usr.bin/ctags/print.c
index 4950611382a..f18053d401a 100644
--- a/usr.bin/ctags/print.c
+++ b/usr.bin/ctags/print.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: print.c,v 1.3 1997/11/04 08:03:05 deraadt Exp $ */
+/* $OpenBSD: print.c,v 1.4 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: print.c,v 1.4 1995/09/27 01:06:58 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: print.c,v 1.3 1997/11/04 08:03:05 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: print.c,v 1.4 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/tree.c b/usr.bin/ctags/tree.c
index 15aa29f9feb..01c9a23b8fd 100644
--- a/usr.bin/ctags/tree.c
+++ b/usr.bin/ctags/tree.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tree.c,v 1.4 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: tree.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: tree.c,v 1.4 1995/03/26 20:14:11 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tree.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: tree.c,v 1.4 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: tree.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ctags/yacc.c b/usr.bin/ctags/yacc.c
index bf2b79e6a19..6593465a27f 100644
--- a/usr.bin/ctags/yacc.c
+++ b/usr.bin/ctags/yacc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yacc.c,v 1.5 2003/05/12 20:41:39 pjanzen Exp $ */
+/* $OpenBSD: yacc.c,v 1.6 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: yacc.c,v 1.3 1995/03/26 20:14:12 glass Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)yacc.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: yacc.c,v 1.5 2003/05/12 20:41:39 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: yacc.c,v 1.6 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index fa8f54f2671..6012f1607c4 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cut.1,v 1.7 2000/11/09 17:52:07 aaron Exp $
+.\" $OpenBSD: cut.1,v 1.8 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/cut/cut.c b/usr.bin/cut/cut.c
index 064bc3e97a5..8f0f681b1f9 100644
--- a/usr.bin/cut/cut.c
+++ b/usr.bin/cut/cut.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cut.c,v 1.9 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: cut.c,v 1.10 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: cut.c,v 1.9 1995/09/02 05:59:23 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)cut.c 8.3 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: cut.c,v 1.9 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: cut.c,v 1.10 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/deroff/deroff.1 b/usr.bin/deroff/deroff.1
index 8aa46300b56..24cf62e6efe 100644
--- a/usr.bin/deroff/deroff.1
+++ b/usr.bin/deroff/deroff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: deroff.1,v 1.3 2002/02/28 22:01:14 millert Exp $
+.\" $OpenBSD: deroff.1,v 1.4 2003/06/03 02:56:07 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/deroff/deroff.c b/usr.bin/deroff/deroff.c
index 0bf26d2fb21..8dceff32a9e 100644
--- a/usr.bin/deroff/deroff.c
+++ b/usr.bin/deroff/deroff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: deroff.c,v 1.4 2002/02/28 22:12:15 danh Exp $ */
+/* $OpenBSD: deroff.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -76,7 +72,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)deroff.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: deroff.c,v 1.4 2002/02/28 22:12:15 danh Exp $";
+static const char rcsid[] = "$OpenBSD: deroff.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/dirname/dirname.1 b/usr.bin/dirname/dirname.1
index 6f6a93ae83f..0eb24475964 100644
--- a/usr.bin/dirname/dirname.1
+++ b/usr.bin/dirname/dirname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dirname.1,v 1.2 2001/12/02 01:04:12 millert Exp $
+.\" $OpenBSD: dirname.1,v 1.3 2003/06/03 02:56:07 millert Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index ed427ba6757..5c58fa647b2 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: du.1,v 1.17 2002/01/24 19:25:12 mickey Exp $
+.\" $OpenBSD: du.1,v 1.18 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/du/du.c b/usr.bin/du/du.c
index 46b93a4aa70..f7d14bae37b 100644
--- a/usr.bin/du/du.c
+++ b/usr.bin/du/du.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: du.c,v 1.11 2002/02/16 21:27:45 millert Exp $ */
+/* $OpenBSD: du.c,v 1.12 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)du.c 8.5 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$OpenBSD: du.c,v 1.11 2002/02/16 21:27:45 millert Exp $";
+static char rcsid[] = "$OpenBSD: du.c,v 1.12 2003/06/03 02:56:07 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 8542137fa72..8eb1262301d 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: env.1,v 1.8 2000/11/10 05:10:24 aaron Exp $
+.\" $OpenBSD: env.1,v 1.9 2003/06/03 02:56:07 millert Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -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/usr.bin/env/env.c b/usr.bin/env/env.c
index eda66a36569..7ddd5e0940a 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: env.c,v 1.8 2002/12/08 16:50:07 millert Exp $ */
+/* $OpenBSD: env.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -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.
*
@@ -41,7 +37,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)env.c 8.3 (Berkeley) 4/2/94";*/
-static char rcsid[] = "$OpenBSD: env.c,v 1.8 2002/12/08 16:50:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: env.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 8238c3ac04c..a07518dad40 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: error.1,v 1.16 2003/03/31 07:52:56 jmc Exp $
+.\" $OpenBSD: error.1,v 1.17 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/error/error.h b/usr.bin/error/error.h
index c25d152143b..e4b40f05808 100644
--- a/usr.bin/error/error.h
+++ b/usr.bin/error/error.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.h,v 1.6 2002/06/14 21:35:00 todd Exp $ */
+/* $OpenBSD: error.h,v 1.7 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: error.h,v 1.3 1995/09/02 06:15:25 jtc Exp $ */
/*
@@ -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/usr.bin/error/filter.c b/usr.bin/error/filter.c
index f01df5cae04..d701ece1d90 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filter.c,v 1.6 2001/07/12 05:17:02 deraadt Exp $ */
+/* $OpenBSD: filter.c,v 1.7 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: filter.c,v 1.3 1995/09/02 06:15:28 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)filter.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: filter.c,v 1.6 2001/07/12 05:17:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: filter.c,v 1.7 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index c8989ffa6b9..7b42a4fd805 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: input.c,v 1.4 2002/06/14 21:35:00 todd Exp $ */
+/* $OpenBSD: input.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: input.c,v 1.4 1995/09/10 15:55:13 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)input.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: input.c,v 1.4 2002/06/14 21:35:00 todd Exp $";
+static char rcsid[] = "$OpenBSD: input.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index b5e03646c8b..c5ff50f4eba 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.8 2002/06/14 21:35:00 todd Exp $ */
+/* $OpenBSD: main.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: main.c,v 1.3 1995/09/02 06:15:37 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.8 2002/06/14 21:35:00 todd Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <signal.h>
diff --git a/usr.bin/error/pathnames.h b/usr.bin/error/pathnames.h
index 74170651395..29b1f2890b4 100644
--- a/usr.bin/error/pathnames.h
+++ b/usr.bin/error/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/09/16 02:26:04 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/02 06:15:40 jtc Exp $ */
/*
@@ -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/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 6eeffb8303a..238c10d8765 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pi.c,v 1.4 2002/06/14 21:35:00 todd Exp $ */
+/* $OpenBSD: pi.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: pi.c,v 1.3 1995/09/02 06:15:44 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pi.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: pi.c,v 1.4 2002/06/14 21:35:00 todd Exp $";
+static char rcsid[] = "$OpenBSD: pi.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index c818f9efba2..641dd0f1c37 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.c,v 1.8 2003/04/05 16:13:12 deraadt Exp $ */
+/* $OpenBSD: subr.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: subr.c,v 1.4 1995/09/10 15:55:15 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: subr.c,v 1.8 2003/04/05 16:13:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: subr.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index 3c47798654f..435f06f8a5d 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: touch.c,v 1.8 2001/07/12 05:17:02 deraadt Exp $ */
+/* $OpenBSD: touch.c,v 1.9 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: touch.c,v 1.3 1995/09/02 06:15:54 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)touch.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: touch.c,v 1.8 2001/07/12 05:17:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.9 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 45d634bc5c6..4929c54710c 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: expand.1,v 1.7 2000/03/07 21:11:08 aaron Exp $
+.\" $OpenBSD: expand.1,v 1.8 2003/06/03 02:56:07 millert Exp $
.\" $NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index 2622d097b78..bf60304600c 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.4 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: expand.c,v 1.5 2003/06/03 02:56:07 millert Exp $ */
/* $NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$OpenBSD: expand.c,v 1.4 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: expand.c,v 1.5 2003/06/03 02:56:07 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index 210bc6492cd..6512e264b79 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: false.1,v 1.4 1999/06/05 01:21:24 aaron Exp $
+.\" $OpenBSD: false.1,v 1.5 2003/06/03 02:56:08 millert Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -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/usr.bin/find/extern.h b/usr.bin/find/extern.h
index cbcf6f7631d..390e2a595a4 100644
--- a/usr.bin/find/extern.h
+++ b/usr.bin/find/extern.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: extern.h,v 1.12 2002/02/16 21:27:46 millert Exp $*/
+/* * $OpenBSD: extern.h,v 1.13 2003/06/03 02:56:08 millert Exp $*/
/*-
* Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/find/find.1 b/usr.bin/find/find.1
index 91ed3346e07..923abadab63 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: find.1,v 1.37 2003/03/07 06:30:38 david Exp $
+.\" $OpenBSD: find.1,v 1.38 2003/06/03 02:56:08 millert Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -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/usr.bin/find/find.c b/usr.bin/find/find.c
index fc42cb97880..ba15fdd4a25 100644
--- a/usr.bin/find/find.c
+++ b/usr.bin/find/find.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: find.c,v 1.8 2001/11/17 19:50:53 millert Exp $ */
+/* $OpenBSD: find.c,v 1.9 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)find.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: find.c,v 1.8 2001/11/17 19:50:53 millert Exp $";
+static char rcsid[] = "$OpenBSD: find.c,v 1.9 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h
index 62dd4bb4771..d97b2647e57 100644
--- a/usr.bin/find/find.h
+++ b/usr.bin/find/find.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: find.h,v 1.11 2002/02/16 21:27:46 millert Exp $*/
+/* * $OpenBSD: find.h,v 1.12 2003/06/03 02:56:08 millert Exp $*/
/*-
* Copyright (c) 1990, 1993
* The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 4611330df04..659932b1f2e 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: function.c,v 1.25 2002/06/30 15:16:41 matthieu Exp $ */
+/* $OpenBSD: function.c,v 1.26 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)function.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.25 2002/06/30 15:16:41 matthieu Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.26 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c
index da3f78bd1dc..1406c6cbc43 100644
--- a/usr.bin/find/ls.c
+++ b/usr.bin/find/ls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ls.c,v 1.9 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: ls.c,v 1.10 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: ls.c,v 1.9 2002/02/16 21:27:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: ls.c,v 1.10 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 94ba3ba2644..3b2224a2075 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.14 2002/05/17 15:04:32 millert Exp $ */
+/* $OpenBSD: main.c,v 1.15 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.14 2002/05/17 15:04:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.15 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/misc.c b/usr.bin/find/misc.c
index ade1fa5a178..db0fd3bb77b 100644
--- a/usr.bin/find/misc.c
+++ b/usr.bin/find/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.7 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: misc.c,v 1.8 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)misc.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.8 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/operator.c b/usr.bin/find/operator.c
index c7779a556ac..28fe6a57aae 100644
--- a/usr.bin/find/operator.c
+++ b/usr.bin/find/operator.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: operator.c,v 1.6 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: operator.c,v 1.7 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)operator.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: operator.c,v 1.6 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: operator.c,v 1.7 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index df0f189ab4f..86580203e7a 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: option.c,v 1.14 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: option.c,v 1.15 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)option.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: option.c,v 1.14 2002/02/16 21:27:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: option.c,v 1.15 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/extern.h b/usr.bin/finger/extern.h
index 2ef84222f7e..8c185963f46 100644
--- a/usr.bin/finger/extern.h
+++ b/usr.bin/finger/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.6 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 01e9bd3d26a..3ce9f78237f 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: finger.1,v 1.14 2000/11/09 17:52:08 aaron Exp $
+.\" $OpenBSD: finger.1,v 1.15 2003/06/03 02:56:08 millert Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index 58cdcd51280..978b4732175 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: finger.c,v 1.12 2001/11/19 19:02:13 mpech Exp $ */
+/* $OpenBSD: finger.c,v 1.13 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -54,7 +50,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)finger.c 5.22 (Berkeley) 6/29/90";*/
-static char rcsid[] = "$OpenBSD: finger.c,v 1.12 2001/11/19 19:02:13 mpech Exp $";
+static char rcsid[] = "$OpenBSD: finger.c,v 1.13 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 2a39201be9b..d07c6a34cda 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: finger.h,v 1.3 1997/05/30 23:35:51 kstailey Exp $*/
+/* * $OpenBSD: finger.h,v 1.4 2003/06/03 02:56:08 millert Exp $*/
/*
* Copyright (c) 1989 The Regents of the University of California.
* All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index b340f30202d..e7271b3f1e0 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lprint.c,v 1.5 2001/07/12 05:17:04 deraadt Exp $ */
+/* $OpenBSD: lprint.c,v 1.6 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)lprint.c 5.13 (Berkeley) 10/31/90";*/
-static char rcsid[] = "$OpenBSD: lprint.c,v 1.5 2001/07/12 05:17:04 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lprint.c,v 1.6 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index d4cdddb61f4..79361c3e5ec 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: net.c,v 1.8 2003/03/13 15:47:10 deraadt Exp $ */
+/* $OpenBSD: net.c,v 1.9 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)net.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: net.c,v 1.8 2003/03/13 15:47:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: net.c,v 1.9 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index 1ce12ef466a..9bc48c15fca 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sprint.c,v 1.6 2001/01/31 20:11:30 deraadt Exp $ */
+/* $OpenBSD: sprint.c,v 1.7 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)sprint.c 5.8 (Berkeley) 12/4/90";*/
-static char rcsid[] = "$OpenBSD: sprint.c,v 1.6 2001/01/31 20:11:30 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: sprint.c,v 1.7 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 0265e23a915..40eb703ad55 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.15 2001/01/15 18:16:06 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.16 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)util.c 5.14 (Berkeley) 1/17/91";*/
-static char rcsid[] = "$OpenBSD: util.c,v 1.15 2001/01/15 18:16:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.16 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index d5bddd7ab42..213be3f8bb0 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fmt.1,v 1.15 2001/11/29 00:33:06 millert Exp $
+.\" $OpenBSD: fmt.1,v 1.16 2003/06/03 02:56:08 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index fbfe9b34819..8abe76eec97 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fold.1,v 1.7 2001/06/26 01:45:17 pjanzen Exp $
+.\" $OpenBSD: fold.1,v 1.8 2003/06/03 02:56:08 millert Exp $
.\" $NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 93ff652a7f5..0b6531911dc 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fold.c,v 1.6 2002/06/17 07:06:12 deraadt Exp $ */
+/* $OpenBSD: fold.c,v 1.7 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: fold.c,v 1.6 1995/09/01 01:42:44 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)fold.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: fold.c,v 1.6 2002/06/17 07:06:12 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: fold.c,v 1.7 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index e668738c26b..fef312f8ac6 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: from.1,v 1.7 2000/11/09 17:52:11 aaron Exp $
+.\" $OpenBSD: from.1,v 1.8 2003/06/03 02:56:08 millert Exp $
.\" $NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 32a0a3c14a9..fbe3a07ea6a 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: from.c,v 1.8 2001/11/19 19:02:14 mpech Exp $ */
+/* $OpenBSD: from.c,v 1.9 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: from.c,v 1.6 1995/09/01 01:39:10 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)from.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: from.c,v 1.8 2001/11/19 19:02:14 mpech Exp $";
+static char rcsid[] = "$OpenBSD: from.c,v 1.9 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index c68fb3b1771..e4ce47c398c 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsplit.1,v 1.10 2002/11/14 02:57:27 deraadt Exp $
+.\" $OpenBSD: fsplit.1,v 1.11 2003/06/03 02:56:08 millert Exp $
.\" $NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index 699d5f0c22f..a99b68e704e 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsplit.c,v 1.11 2003/04/05 17:18:46 deraadt Exp $ */
+/* $OpenBSD: fsplit.c,v 1.12 2003/06/03 02:56:08 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)fsplit.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: fsplit.c,v 1.11 2003/04/05 17:18:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: fsplit.c,v 1.12 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 8ea8e2b8ea6..c4fb5f68227 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fstat.1,v 1.24 2003/03/10 15:37:30 jmc Exp $
+.\" $OpenBSD: fstat.1,v 1.25 2003/06/03 02:56:08 millert Exp $
.\"
.\" Copyright (c) 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index 8548dc14844..583bbe9aa01 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fstat.c,v 1.42 2003/05/13 01:41:48 tedu Exp $ */
+/* $OpenBSD: fstat.c,v 1.43 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)fstat.c 8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: fstat.c,v 1.42 2003/05/13 01:41:48 tedu Exp $";
+static char *rcsid = "$OpenBSD: fstat.c,v 1.43 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/fstat/fstat.h b/usr.bin/fstat/fstat.h
index 736b229bd2f..3dda480e194 100644
--- a/usr.bin/fstat/fstat.h
+++ b/usr.bin/fstat/fstat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fstat.h,v 1.2 1998/07/09 20:28:01 mickey Exp $ */
+/* $OpenBSD: fstat.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/fstat/isofs.c b/usr.bin/fstat/isofs.c
index 767d2a48ae3..f2c46ff3d43 100644
--- a/usr.bin/fstat/isofs.c
+++ b/usr.bin/fstat/isofs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isofs.c,v 1.5 2002/07/13 06:02:57 deraadt Exp $ */
+/* $OpenBSD: isofs.c,v 1.6 2003/06/03 02:56:08 millert Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index 87889eb1593..b984db03c13 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.44 2003/04/05 17:19:47 deraadt Exp $ */
+/* $OpenBSD: cmds.c,v 1.45 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */
/*
@@ -42,11 +42,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.
*
@@ -67,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.6 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.44 2003/04/05 17:19:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.45 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 27aca02a683..1edde2dc11c 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.15 2001/10/04 22:49:55 pjanzen Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.16 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.4 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.15 2001/10/04 22:49:55 pjanzen Exp $";
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.16 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index a55934b6cb1..f83c065868a 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: domacro.c,v 1.8 2003/01/22 05:35:39 itojun Exp $ */
+/* $OpenBSD: domacro.c,v 1.9 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)domacro.c 8.3 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: domacro.c,v 1.8 2003/01/22 05:35:39 itojun Exp $";
+static char rcsid[] = "$OpenBSD: domacro.c,v 1.9 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index 92b2a2fcfaf..0cb2b311a40 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.24 2002/11/08 03:30:17 fgsch Exp $ */
+/* $OpenBSD: extern.h,v 1.25 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: extern.h,v 1.17 1997/08/18 10:20:19 lukem Exp $ */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 0a25991f2a7..c7e0af4722e 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ftp.1,v 1.38 2003/03/31 19:40:44 jmc Exp $
+.\" $OpenBSD: ftp.1,v 1.39 2003/06/03 02:56:08 millert Exp $
.\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index 3ec77dcec6b..64b37928fad 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp.c,v 1.52 2003/04/05 17:19:47 deraadt Exp $ */
+/* $OpenBSD: ftp.c,v 1.53 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: ftp.c,v 1.27 1997/08/18 10:20:23 lukem Exp $ */
/*
@@ -42,11 +42,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.
*
@@ -67,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-static char rcsid[] = "$OpenBSD: ftp.c,v 1.52 2003/04/05 17:19:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ftp.c,v 1.53 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 2af8e180de5..f5bd8a9b14d 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ftp_var.h,v 1.21 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: ftp_var.h,v 1.22 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: ftp_var.h,v 1.18 1997/08/18 10:20:25 lukem Exp $ */
/*
@@ -42,11 +42,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index ea1b8a7a4d6..99566e611ce 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.52 2003/04/05 17:19:47 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.53 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */
/*
@@ -42,11 +42,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.
*
@@ -73,7 +69,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.52 2003/04/05 17:19:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.53 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index a7363267b09..3ac4dacdf17 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.6 1997/04/10 00:17:10 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.7 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $ */
/*
@@ -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/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index 39a62df5ce9..d22b0d689e1 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ruserpass.c,v 1.15 2003/04/05 17:19:47 deraadt Exp $ */
+/* $OpenBSD: ruserpass.c,v 1.16 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: ruserpass.c,v 1.14 1997/07/20 09:46:01 lukem Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ruserpass.c 8.4 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.15 2003/04/05 17:19:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ruserpass.c,v 1.16 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index 15cebb9669a..25bd5922f89 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.34 2003/04/07 22:15:57 millert Exp $ */
+/* $OpenBSD: util.c,v 1.35 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: util.c,v 1.12 1997/08/18 10:20:27 lukem Exp $ */
/*-
@@ -53,11 +53,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.
*
@@ -75,7 +71,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: util.c,v 1.34 2003/04/07 22:15:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: util.c,v 1.35 2003/06/03 02:56:08 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/gprof/PSD.doc/abstract.me b/usr.bin/gprof/PSD.doc/abstract.me
index 5a1d04af034..e0c93ec2052 100644
--- a/usr.bin/gprof/PSD.doc/abstract.me
+++ b/usr.bin/gprof/PSD.doc/abstract.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: abstract.me,v 1.2 1996/06/26 05:34:06 deraadt Exp $
+.\" $OpenBSD: abstract.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: abstract.me,v 1.2 1995/04/19 07:16:37 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/gathering.me b/usr.bin/gprof/PSD.doc/gathering.me
index de0317a739e..2308f08de5a 100644
--- a/usr.bin/gprof/PSD.doc/gathering.me
+++ b/usr.bin/gprof/PSD.doc/gathering.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gathering.me,v 1.2 1996/06/26 05:34:07 deraadt Exp $
+.\" $OpenBSD: gathering.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: gathering.me,v 1.2 1995/04/19 07:16:39 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/header.me b/usr.bin/gprof/PSD.doc/header.me
index 8937c6dde7a..99bd08ac249 100644
--- a/usr.bin/gprof/PSD.doc/header.me
+++ b/usr.bin/gprof/PSD.doc/header.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: header.me,v 1.2 1996/06/26 05:34:07 deraadt Exp $
+.\" $OpenBSD: header.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: header.me,v 1.2 1995/04/19 07:16:41 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/intro.me b/usr.bin/gprof/PSD.doc/intro.me
index ebb7e55b2fd..ce134b44d64 100644
--- a/usr.bin/gprof/PSD.doc/intro.me
+++ b/usr.bin/gprof/PSD.doc/intro.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.me,v 1.2 1996/06/26 05:34:08 deraadt Exp $
+.\" $OpenBSD: intro.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: intro.me,v 1.2 1995/04/19 07:16:42 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp.me b/usr.bin/gprof/PSD.doc/postp.me
index f810dd266f0..2cfa444bd99 100644
--- a/usr.bin/gprof/PSD.doc/postp.me
+++ b/usr.bin/gprof/PSD.doc/postp.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: postp.me,v 1.2 1996/06/26 05:34:09 deraadt Exp $
+.\" $OpenBSD: postp.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: postp.me,v 1.2 1995/04/19 07:16:44 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp1.pic b/usr.bin/gprof/PSD.doc/postp1.pic
index a32a15c0713..1ec64d5d9d0 100644
--- a/usr.bin/gprof/PSD.doc/postp1.pic
+++ b/usr.bin/gprof/PSD.doc/postp1.pic
@@ -1,4 +1,4 @@
-.\" $OpenBSD: postp1.pic,v 1.2 1996/06/26 05:34:09 deraadt Exp $
+.\" $OpenBSD: postp1.pic,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: postp1.pic,v 1.2 1995/04/19 07:16:46 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp2.pic b/usr.bin/gprof/PSD.doc/postp2.pic
index fda6658c4da..b40f9d2bf4e 100644
--- a/usr.bin/gprof/PSD.doc/postp2.pic
+++ b/usr.bin/gprof/PSD.doc/postp2.pic
@@ -1,4 +1,4 @@
-.\" $OpenBSD: postp2.pic,v 1.2 1996/06/26 05:34:10 deraadt Exp $
+.\" $OpenBSD: postp2.pic,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: postp2.pic,v 1.2 1995/04/19 07:16:48 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/postp3.pic b/usr.bin/gprof/PSD.doc/postp3.pic
index 2338156c658..e78d3846671 100644
--- a/usr.bin/gprof/PSD.doc/postp3.pic
+++ b/usr.bin/gprof/PSD.doc/postp3.pic
@@ -1,4 +1,4 @@
-.\" $OpenBSD: postp3.pic,v 1.2 1996/06/26 05:34:10 deraadt Exp $
+.\" $OpenBSD: postp3.pic,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: postp3.pic,v 1.2 1995/04/19 07:16:50 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/pres1.pic b/usr.bin/gprof/PSD.doc/pres1.pic
index 1f6c33bafdb..10e95fe58b6 100644
--- a/usr.bin/gprof/PSD.doc/pres1.pic
+++ b/usr.bin/gprof/PSD.doc/pres1.pic
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pres1.pic,v 1.2 1996/06/26 05:34:11 deraadt Exp $
+.\" $OpenBSD: pres1.pic,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: pres1.pic,v 1.2 1995/04/19 07:16:52 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/pres2.pic b/usr.bin/gprof/PSD.doc/pres2.pic
index 9f5ec115382..5579a599642 100644
--- a/usr.bin/gprof/PSD.doc/pres2.pic
+++ b/usr.bin/gprof/PSD.doc/pres2.pic
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pres2.pic,v 1.2 1996/06/26 05:34:11 deraadt Exp $
+.\" $OpenBSD: pres2.pic,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: pres2.pic,v 1.2 1995/04/19 07:16:53 cgd Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/present.me b/usr.bin/gprof/PSD.doc/present.me
index 0a34d1e252d..0c564094166 100644
--- a/usr.bin/gprof/PSD.doc/present.me
+++ b/usr.bin/gprof/PSD.doc/present.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: present.me,v 1.2 1996/06/26 05:34:12 deraadt Exp $
+.\" $OpenBSD: present.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: present.me,v 1.2 1995/04/19 07:16:54 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/profiling.me b/usr.bin/gprof/PSD.doc/profiling.me
index 72ce6dee66a..96f81e9cb16 100644
--- a/usr.bin/gprof/PSD.doc/profiling.me
+++ b/usr.bin/gprof/PSD.doc/profiling.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: profiling.me,v 1.2 1996/06/26 05:34:13 deraadt Exp $
+.\" $OpenBSD: profiling.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: profiling.me,v 1.2 1995/04/19 07:16:56 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/PSD.doc/refs.me b/usr.bin/gprof/PSD.doc/refs.me
index 1c6d9c83932..e28865400ce 100644
--- a/usr.bin/gprof/PSD.doc/refs.me
+++ b/usr.bin/gprof/PSD.doc/refs.me
@@ -1,4 +1,4 @@
-.\" $OpenBSD: refs.me,v 1.2 1996/06/26 05:34:13 deraadt Exp $
+.\" $OpenBSD: refs.me,v 1.3 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: refs.me,v 1.2 1995/04/19 07:16:58 cgd Exp $
.\"
.\" Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/alpha.h b/usr.bin/gprof/alpha.h
index d985942094c..20fa133e95d 100644
--- a/usr.bin/gprof/alpha.h
+++ b/usr.bin/gprof/alpha.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: alpha.h,v 1.4 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: alpha.h,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/aout.c b/usr.bin/gprof/aout.c
index a84e648d0c4..7ee25c2349f 100644
--- a/usr.bin/gprof/aout.c
+++ b/usr.bin/gprof/aout.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/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index bc3ef5342c6..3a7998c91ed 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: arcs.c,v 1.6 2002/03/25 16:30:55 danh Exp $ */
+/* $OpenBSD: arcs.c,v 1.7 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: arcs.c,v 1.6 1995/04/19 07:15:52 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)arcs.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: arcs.c,v 1.6 2002/03/25 16:30:55 danh Exp $";
+static char rcsid[] = "$OpenBSD: arcs.c,v 1.7 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/arm32.h b/usr.bin/gprof/arm32.h
index d4f78d6b7bd..1d8f889a46e 100644
--- a/usr.bin/gprof/arm32.h
+++ b/usr.bin/gprof/arm32.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: arm32.h,v 1.2 1996/06/26 05:33:49 deraadt Exp $ */
+/* $OpenBSD: arm32.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: arm32.h,v 1.1 1996/04/01 21:51:26 mark Exp $ */
/*-
@@ -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/usr.bin/gprof/dfn.c b/usr.bin/gprof/dfn.c
index b05bf7b3446..a903c09db0b 100644
--- a/usr.bin/gprof/dfn.c
+++ b/usr.bin/gprof/dfn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dfn.c,v 1.4 2002/03/25 16:30:55 danh Exp $ */
+/* $OpenBSD: dfn.c,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: dfn.c,v 1.5 1995/04/19 07:15:56 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dfn.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: dfn.c,v 1.4 2002/03/25 16:30:55 danh Exp $";
+static char rcsid[] = "$OpenBSD: dfn.c,v 1.5 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/elf.c b/usr.bin/gprof/elf.c
index dba5a3cd143..3a9931ee561 100644
--- a/usr.bin/gprof/elf.c
+++ b/usr.bin/gprof/elf.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/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 5a4222c3421..0a231d804cf 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gprof.1,v 1.17 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: gprof.1,v 1.18 2003/06/03 02:56:08 millert Exp $
.\" $NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index 45bb6f7d09b..42c9f2569c6 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gprof.c,v 1.11 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: gprof.c,v 1.12 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: gprof.c,v 1.8 1995/04/19 07:15:59 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)gprof.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: gprof.c,v 1.11 2002/05/08 16:46:35 art Exp $";
+static char rcsid[] = "$OpenBSD: gprof.c,v 1.12 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/gprof.h b/usr.bin/gprof/gprof.h
index 7cf52d7718a..65c97cf8085 100644
--- a/usr.bin/gprof/gprof.h
+++ b/usr.bin/gprof/gprof.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gprof.h,v 1.8 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: gprof.h,v 1.9 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: gprof.h,v 1.13 1996/04/01 21:54:06 mark Exp $ */
/*
@@ -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/usr.bin/gprof/hertz.c b/usr.bin/gprof/hertz.c
index b185f05d792..a7fe51914fb 100644
--- a/usr.bin/gprof/hertz.c
+++ b/usr.bin/gprof/hertz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hertz.c,v 1.3 2001/03/22 05:18:30 mickey Exp $ */
+/* $OpenBSD: hertz.c,v 1.4 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: hertz.c,v 1.5 1995/04/19 07:16:03 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hertz.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: hertz.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: hertz.c,v 1.4 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/hppa.h b/usr.bin/gprof/hppa.h
index daac13612bd..1485249cdcb 100644
--- a/usr.bin/gprof/hppa.h
+++ b/usr.bin/gprof/hppa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hppa.h,v 1.3 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: hppa.h,v 1.4 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/i386.h b/usr.bin/gprof/i386.h
index da43ae51f81..4acaae91ccb 100644
--- a/usr.bin/gprof/i386.h
+++ b/usr.bin/gprof/i386.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: i386.h,v 1.2 1996/06/26 05:33:53 deraadt Exp $ */
+/* $OpenBSD: i386.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: i386.h,v 1.4 1995/04/19 07:16:05 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/lookup.c b/usr.bin/gprof/lookup.c
index 62400baedb3..168b6668470 100644
--- a/usr.bin/gprof/lookup.c
+++ b/usr.bin/gprof/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.5 2002/03/25 16:30:55 danh Exp $ */
+/* $OpenBSD: lookup.c,v 1.6 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: lookup.c,v 1.5 1995/04/19 07:16:06 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lookup.c,v 1.5 2002/03/25 16:30:55 danh Exp $";
+static char rcsid[] = "$OpenBSD: lookup.c,v 1.6 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/m68k.h b/usr.bin/gprof/m68k.h
index e142b278184..5df3fd5b986 100644
--- a/usr.bin/gprof/m68k.h
+++ b/usr.bin/gprof/m68k.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: m68k.h,v 1.2 1996/06/26 05:33:54 deraadt Exp $ */
+/* $OpenBSD: m68k.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: m68k.h,v 1.3 1995/04/19 07:16:09 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/m88k.h b/usr.bin/gprof/m88k.h
index d292c1c78fd..388f1dbac0b 100644
--- a/usr.bin/gprof/m88k.h
+++ b/usr.bin/gprof/m88k.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: m88k.h,v 1.1 2000/12/28 23:44:37 smurph Exp $ */
+/* $OpenBSD: m88k.h,v 1.2 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: m88k.h,v 1.3 1995/04/19 07:16:09 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/mips.c b/usr.bin/gprof/mips.c
index 9543aa303b8..1debf58f34a 100644
--- a/usr.bin/gprof/mips.c
+++ b/usr.bin/gprof/mips.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mips.c,v 1.4 2001/11/19 19:02:14 mpech Exp $ */
+/* $OpenBSD: mips.c,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: mips.c,v 1.4 1995/04/19 07:16:11 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: mips.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
+static char rcsid[] = "$OpenBSD: mips.c,v 1.5 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/mips.h b/usr.bin/gprof/mips.h
index e66ab8d40d1..a64e4be7ed9 100644
--- a/usr.bin/gprof/mips.h
+++ b/usr.bin/gprof/mips.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mips.h,v 1.2 1996/06/26 05:33:55 deraadt Exp $ */
+/* $OpenBSD: mips.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: mips.h,v 1.3 1995/04/19 07:16:12 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/ns32k.h b/usr.bin/gprof/ns32k.h
index 60c6a5a04e3..616b5b1ee9a 100644
--- a/usr.bin/gprof/ns32k.h
+++ b/usr.bin/gprof/ns32k.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns32k.h,v 1.2 1996/06/26 05:33:56 deraadt Exp $ */
+/* $OpenBSD: ns32k.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: ns32k.h,v 1.2 1995/04/19 07:16:14 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/pathnames.h b/usr.bin/gprof/pathnames.h
index 0a390b2fd5f..093517e6fe2 100644
--- a/usr.bin/gprof/pathnames.h
+++ b/usr.bin/gprof/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:33:57 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1995/04/19 07:16:16 cgd Exp $ */
/*
@@ -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/usr.bin/gprof/pmax.c b/usr.bin/gprof/pmax.c
index 85ef7582e81..6702728bc4a 100644
--- a/usr.bin/gprof/pmax.c
+++ b/usr.bin/gprof/pmax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmax.c,v 1.4 2001/11/19 19:02:14 mpech Exp $ */
+/* $OpenBSD: pmax.c,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: pmax.c,v 1.3 1995/04/19 07:16:18 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)mips.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: pmax.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
+static char rcsid[] = "$OpenBSD: pmax.c,v 1.5 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/pmax.h b/usr.bin/gprof/pmax.h
index 5aac6bf7501..1389e55af14 100644
--- a/usr.bin/gprof/pmax.h
+++ b/usr.bin/gprof/pmax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmax.h,v 1.2 1996/06/26 05:33:58 deraadt Exp $ */
+/* $OpenBSD: pmax.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: pmax.h,v 1.2 1995/04/19 07:16:20 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/powerpc.h b/usr.bin/gprof/powerpc.h
index 020f2f73650..70c96cccb13 100644
--- a/usr.bin/gprof/powerpc.h
+++ b/usr.bin/gprof/powerpc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: powerpc.h,v 1.3 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: powerpc.h,v 1.4 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 66b64b1d395..f5beacf1ea3 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printgprof.c,v 1.7 2003/04/05 14:34:32 deraadt Exp $ */
+/* $OpenBSD: printgprof.c,v 1.8 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: printgprof.c,v 1.5 1995/04/19 07:16:21 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)printgprof.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: printgprof.c,v 1.7 2003/04/05 14:34:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printgprof.c,v 1.8 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index d2af9654a32..c6d9b893631 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printlist.c,v 1.3 2001/03/22 05:18:30 mickey Exp $ */
+/* $OpenBSD: printlist.c,v 1.4 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: printlist.c,v 1.5 1995/04/19 07:16:23 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)printlist.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: printlist.c,v 1.3 2001/03/22 05:18:30 mickey Exp $";
+static char rcsid[] = "$OpenBSD: printlist.c,v 1.4 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/sparc.c b/usr.bin/gprof/sparc.c
index 23f4d5c757d..ca8bb16a6a4 100644
--- a/usr.bin/gprof/sparc.c
+++ b/usr.bin/gprof/sparc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sparc.c,v 1.4 2001/11/19 19:02:14 mpech Exp $ */
+/* $OpenBSD: sparc.c,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.c,v 1.4 1995/04/19 07:16:24 cgd Exp $ */
/*
@@ -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.
*
@@ -42,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sparc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: sparc.c,v 1.4 2001/11/19 19:02:14 mpech Exp $";
+static char rcsid[] = "$OpenBSD: sparc.c,v 1.5 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/sparc.h b/usr.bin/gprof/sparc.h
index 967ca1bd6b0..448d412ae09 100644
--- a/usr.bin/gprof/sparc.h
+++ b/usr.bin/gprof/sparc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sparc.h,v 1.2 1996/06/26 05:34:00 deraadt Exp $ */
+/* $OpenBSD: sparc.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/sparc64.h b/usr.bin/gprof/sparc64.h
index db57ac42bec..ced95dbf688 100644
--- a/usr.bin/gprof/sparc64.h
+++ b/usr.bin/gprof/sparc64.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sparc64.h,v 1.1 2002/05/08 16:46:35 art Exp $ */
+/* $OpenBSD: sparc64.h,v 1.2 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: sparc.h,v 1.3 1995/04/19 07:16:25 cgd Exp $ */
/*-
@@ -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/usr.bin/gprof/tahoe.c b/usr.bin/gprof/tahoe.c
index 4484b5ec82b..2a189423385 100644
--- a/usr.bin/gprof/tahoe.c
+++ b/usr.bin/gprof/tahoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tahoe.c,v 1.4 2002/03/25 16:30:55 danh Exp $ */
+/* $OpenBSD: tahoe.c,v 1.5 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: tahoe.c,v 1.5 1995/04/19 07:16:27 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tahoe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tahoe.c,v 1.4 2002/03/25 16:30:55 danh Exp $";
+static char rcsid[] = "$OpenBSD: tahoe.c,v 1.5 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/tahoe.h b/usr.bin/gprof/tahoe.h
index a600af81214..f2dc47eec41 100644
--- a/usr.bin/gprof/tahoe.h
+++ b/usr.bin/gprof/tahoe.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tahoe.h,v 1.2 1996/06/26 05:34:02 deraadt Exp $ */
+/* $OpenBSD: tahoe.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: tahoe.h,v 1.4 1995/04/19 07:16:29 cgd Exp $ */
/*
@@ -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/usr.bin/gprof/vax.c b/usr.bin/gprof/vax.c
index b6676b216d0..4dd75530d3c 100644
--- a/usr.bin/gprof/vax.c
+++ b/usr.bin/gprof/vax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vax.c,v 1.5 2002/03/25 16:30:55 danh Exp $ */
+/* $OpenBSD: vax.c,v 1.6 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: vax.c,v 1.6 1996/04/20 14:56:37 ragge Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vax.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: vax.c,v 1.5 2002/03/25 16:30:55 danh Exp $";
+static char rcsid[] = "$OpenBSD: vax.c,v 1.6 2003/06/03 02:56:08 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/gprof/vax.h b/usr.bin/gprof/vax.h
index dd107fb6a06..d116d96ca70 100644
--- a/usr.bin/gprof/vax.h
+++ b/usr.bin/gprof/vax.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vax.h,v 1.2 1996/06/26 05:34:03 deraadt Exp $ */
+/* $OpenBSD: vax.h,v 1.3 2003/06/03 02:56:08 millert Exp $ */
/* $NetBSD: vax.h,v 1.4 1995/04/19 07:16:31 cgd Exp $ */
/*
@@ -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/usr.bin/head/head.1 b/usr.bin/head/head.1
index 79ebaef32df..0611fe58753 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: head.1,v 1.10 2000/11/10 05:10:29 aaron Exp $
+.\" $OpenBSD: head.1,v 1.11 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/head/head.c b/usr.bin/head/head.c
index 68005ebfdff..cee22150bc9 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: head.c,v 1.9 2002/03/14 16:44:24 mpech Exp $ */
+/* $OpenBSD: head.c,v 1.10 2003/06/03 02:56:09 millert Exp $ */
/*
* Copyright (c) 1980, 1987 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)head.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: head.c,v 1.9 2002/03/14 16:44:24 mpech Exp $";
+static char rcsid[] = "$OpenBSD: head.c,v 1.10 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/hexdump/conv.c b/usr.bin/hexdump/conv.c
index 7c9c6e7e944..9e1512bfd5c 100644
--- a/usr.bin/hexdump/conv.c
+++ b/usr.bin/hexdump/conv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conv.c,v 1.5 2003/03/13 09:09:31 deraadt Exp $ */
+/* $OpenBSD: conv.c,v 1.6 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: conv.c,v 1.7 2001/12/07 15:14:29 bjh21 Exp $ */
/*
@@ -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.
*
@@ -36,7 +32,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)conv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: conv.c,v 1.5 2003/03/13 09:09:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: conv.c,v 1.6 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index c12b83ffede..d6af2c19f8b 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.10 2002/02/16 21:27:46 millert Exp $ */
+/* $OpenBSD: display.c,v 1.11 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: display.c,v 1.12 2001/12/07 15:14:29 bjh21 Exp $ */
/*
@@ -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.
*
@@ -36,7 +32,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)display.c 5.11 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: display.c,v 1.10 2002/02/16 21:27:46 millert Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.11 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 19b66c794c1..753e330dee4 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hexdump.1,v 1.13 2001/12/30 08:17:32 pvalchev Exp $
+.\" $OpenBSD: hexdump.1,v 1.14 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: hexdump.1,v 1.14 2001/12/07 14:46:24 bjh21 Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index b1cd8b63dfc..85baebb521b 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hexdump.c,v 1.8 2002/02/16 21:27:47 millert Exp $ */
+/* $OpenBSD: hexdump.c,v 1.9 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: hexdump.c,v 1.7 1997/10/19 02:34:06 lukem Exp $ */
/*
@@ -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.
*
@@ -42,7 +38,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)hexdump.c 5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: hexdump.c,v 1.8 2002/02/16 21:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: hexdump.c,v 1.9 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 1263dee554f..17c41061ba5 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: hexdump.h,v 1.6 2002/04/08 15:59:05 millert Exp $ */
+/* $OpenBSD: hexdump.h,v 1.7 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: hexdump.h,v 1.7 2001/12/07 15:14:29 bjh21 Exp $ */
/*
@@ -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/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 9b17191d4f3..277f840dc7e 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hexsyntax.c,v 1.6 2001/12/30 08:17:32 pvalchev Exp $ */
+/* $OpenBSD: hexsyntax.c,v 1.7 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: hexsyntax.c,v 1.8 1998/04/08 23:48:57 jeremy Exp $ */
/*-
@@ -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.
*
@@ -36,7 +32,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)hexsyntax.c 5.2 (Berkeley) 5/8/90";*/
-static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.6 2001/12/30 08:17:32 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: hexsyntax.c,v 1.7 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 2efa4d9213d..0f5ad372c1a 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: odsyntax.c,v 1.11 2002/04/08 15:59:05 millert Exp $ */
+/* $OpenBSD: odsyntax.c,v 1.12 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: odsyntax.c,v 1.15 2001/12/07 15:14:29 bjh21 Exp $ */
/*-
@@ -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.
*
@@ -36,7 +32,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)odsyntax.c 5.4 (Berkeley) 3/8/91";*/
-static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.11 2002/04/08 15:59:05 millert Exp $";
+static char rcsid[] = "$OpenBSD: odsyntax.c,v 1.12 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index 9f8ef807d34..1bf91d20df7 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.c,v 1.11 2003/04/05 16:13:47 deraadt Exp $ */
+/* $OpenBSD: parse.c,v 1.12 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: parse.c,v 1.12 2001/12/07 13:37:39 bjh21 Exp $ */
/*
@@ -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.
*
@@ -36,7 +32,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)parse.c 5.6 (Berkeley) 3/9/91";*/
-static char rcsid[] = "$OpenBSD: parse.c,v 1.11 2003/04/05 16:13:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: parse.c,v 1.12 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/id/groups.1 b/usr.bin/id/groups.1
index dfd723fe9ed..8aa93dbcf7b 100644
--- a/usr.bin/id/groups.1
+++ b/usr.bin/id/groups.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: groups.1,v 1.8 2001/06/05 15:22:58 aaron Exp $
+.\" $OpenBSD: groups.1,v 1.9 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/id/id.1 b/usr.bin/id/id.1
index 3cff5c2b3de..c5942bb775b 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: id.1,v 1.9 2000/03/07 21:11:10 aaron Exp $
+.\" $OpenBSD: id.1,v 1.10 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
.\"
.\" Copyright (c) 1991, 1993, 1994
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 6f3aa1b836b..d2854b2de6c 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: id.c,v 1.11 2002/02/16 21:27:47 millert Exp $ */
+/* $OpenBSD: id.c,v 1.12 2003/06/03 02:56:09 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)id.c 8.3 (Berkeley) 4/28/95";*/
-static char rcsid[] = "$OpenBSD: id.c,v 1.11 2002/02/16 21:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: id.c,v 1.12 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/id/whoami.1 b/usr.bin/id/whoami.1
index bede3f0bcf2..20a2772a5aa 100644
--- a/usr.bin/id/whoami.1
+++ b/usr.bin/id/whoami.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whoami.1,v 1.9 2001/06/05 15:22:58 aaron Exp $
+.\" $OpenBSD: whoami.1,v 1.10 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 71ecbd71b3e..a555768ace5 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.6 2002/10/04 15:27:21 mickey Exp $ */
+/* $OpenBSD: io.c,v 1.7 2003/06/03 02:56:09 millert Exp $ */
/*
* Copyright (c) 1985 Sun Microsystems, Inc.
@@ -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.
*
@@ -37,7 +33,7 @@
#ifndef lint
/*static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: io.c,v 1.6 2002/10/04 15:27:21 mickey Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.7 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/join/join.1 b/usr.bin/join/join.1
index e3d56eccc3b..9f8db78f5d3 100644
--- a/usr.bin/join/join.1
+++ b/usr.bin/join/join.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: join.1,v 1.11 2000/11/10 05:10:30 aaron Exp $
+.\" $OpenBSD: join.1,v 1.12 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index 00b1d43ed5d..da69d935458 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $ */
+/* $OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)join.c 8.6 (Berkeley) 5/4/95"; */
-static char rcsid[] = "$OpenBSD: join.c,v 1.14 2002/02/16 21:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: join.c,v 1.15 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index 4971d2885f9..730d0411d7e 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: jot.1,v 1.8 2002/11/14 02:57:27 deraadt Exp $
+.\" $OpenBSD: jot.1,v 1.9 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: jot.1,v 1.2 1994/11/14 20:27:36 jtc Exp $
.\"
.\" Copyright (c) 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 6eacda591a4..1ab0cb21d54 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: jot.c,v 1.11 2003/01/12 02:45:28 beck Exp $ */
+/* $OpenBSD: jot.c,v 1.12 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: jot.c,v 1.3 1994/12/02 20:29:43 pk Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)jot.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: jot.c,v 1.11 2003/01/12 02:45:28 beck Exp $";
+static char rcsid[] = "$OpenBSD: jot.c,v 1.12 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 1875c7df77b..66c6bbaf1de 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kdump.1,v 1.9 2003/02/19 19:30:13 deraadt Exp $
+.\" $OpenBSD: kdump.1,v 1.10 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index 78fb1b3dce7..aeba2c8dc7e 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kdump.c,v 1.20 2003/02/19 19:30:13 deraadt Exp $ */
+/* $OpenBSD: kdump.c,v 1.21 2003/06/03 02:56:09 millert Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$OpenBSD: kdump.c,v 1.20 2003/02/19 19:30:13 deraadt Exp $";
+static char *rcsid = "$OpenBSD: kdump.c,v 1.21 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls
index ad9dabd725c..48019e95417 100644
--- a/usr.bin/kdump/mkioctls
+++ b/usr.bin/kdump/mkioctls
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: mkioctls,v 1.10 2002/12/04 17:41:00 mickey Exp $
+# $OpenBSD: mkioctls,v 1.11 2003/06/03 02:56:09 millert Exp $
#
# Copyright (c) 1994
@@ -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/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index bc83ad156df..34418b5c41e 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ktrace.1,v 1.11 2003/02/19 19:30:13 deraadt Exp $
+.\" $OpenBSD: ktrace.1,v 1.12 2003/06/03 02:56:09 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 5a2f3aa1c60..3249fe8c8dd 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ktrace.c,v 1.15 2003/02/19 19:30:13 deraadt Exp $ */
+/* $OpenBSD: ktrace.c,v 1.16 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ktrace.c 8.2 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$OpenBSD: ktrace.c,v 1.15 2003/02/19 19:30:13 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ktrace.c,v 1.16 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/ktrace/ktrace.h b/usr.bin/ktrace/ktrace.h
index 417dd3972f2..fdf135f8c27 100644
--- a/usr.bin/ktrace/ktrace.h
+++ b/usr.bin/ktrace/ktrace.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: ktrace.h,v 1.2 1996/06/26 05:34:47 deraadt Exp $*/
+/* * $OpenBSD: ktrace.h,v 1.3 2003/06/03 02:56:09 millert Exp $*/
/*-
* Copyright (c) 1988, 1993
* The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 80d51d0f10d..fba8d95a312 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr.c,v 1.4 2001/08/18 00:48:57 espie Exp $ */
+/* $OpenBSD: subr.c,v 1.5 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
#endif
-static char *rcsid = "$OpenBSD: subr.c,v 1.4 2001/08/18 00:48:57 espie Exp $";
+static char *rcsid = "$OpenBSD: subr.c,v 1.5 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lam/lam.1 b/usr.bin/lam/lam.1
index 5565d7914ec..e9860216586 100644
--- a/usr.bin/lam/lam.1
+++ b/usr.bin/lam/lam.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lam.1,v 1.4 2003/04/21 00:51:50 millert Exp $
+.\" $OpenBSD: lam.1,v 1.5 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: lam.1,v 1.4 2002/02/08 01:36:25 ross Exp $
.\"
.\" Copyright (c) 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 2c3e888efc4..6979141fc18 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lam.c,v 1.7 2003/04/21 00:42:49 millert Exp $ */
+/* $OpenBSD: lam.c,v 1.8 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lam.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: lam.c,v 1.7 2003/04/21 00:42:49 millert Exp $";
+static char rcsid[] = "$OpenBSD: lam.c,v 1.8 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 685b1ab00bd..fad2f19ee9d 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: last.1,v 1.19 2003/04/14 02:04:58 deraadt Exp $
+.\" $OpenBSD: last.1,v 1.20 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c
index 98e6f96fb2f..d0bf59a1651 100644
--- a/usr.bin/last/last.c
+++ b/usr.bin/last/last.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: last.c,v 1.25 2003/05/29 17:21:39 deraadt Exp $ */
+/* $OpenBSD: last.c,v 1.26 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: last.c,v 1.6 1994/12/24 16:49:02 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)last.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: last.c,v 1.25 2003/05/29 17:21:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: last.c,v 1.26 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index c36c5f33cb3..8b18c2b29c3 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lastcomm.1,v 1.13 2000/11/09 17:52:17 aaron Exp $
+.\" $OpenBSD: lastcomm.1,v 1.14 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 62bee36377a..bb0e3fd83d9 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lastcomm.c,v 1.10 2002/02/16 21:27:47 millert Exp $ */
+/* $OpenBSD: lastcomm.c,v 1.11 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: lastcomm.c,v 1.9 1995/10/22 01:43:42 ghudson Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lastcomm.c 8.2 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.10 2002/02/16 21:27:47 millert Exp $";
+static char rcsid[] = "$OpenBSD: lastcomm.c,v 1.11 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/lastcomm/pathnames.h b/usr.bin/lastcomm/pathnames.h
index 33caa9c9750..3d9949a3948 100644
--- a/usr.bin/lastcomm/pathnames.h
+++ b/usr.bin/lastcomm/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:34:54 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/22 01:07:05 jtc Exp $ */
/*
@@ -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/usr.bin/leave/leave.1 b/usr.bin/leave/leave.1
index d712cf770d7..cf2749e95e8 100644
--- a/usr.bin/leave/leave.1
+++ b/usr.bin/leave/leave.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: leave.1,v 1.10 2003/03/16 19:25:43 tedu Exp $
+.\" $OpenBSD: leave.1,v 1.11 2003/06/03 02:56:09 millert Exp $
.\" $NetBSD: leave.1,v 1.5 1995/08/31 22:32:10 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index 43b07628d15..7c68061be3b 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: leave.c,v 1.8 2002/06/12 06:07:15 mpech Exp $ */
+/* $OpenBSD: leave.c,v 1.9 2003/06/03 02:56:09 millert Exp $ */
/* $NetBSD: leave.c,v 1.4 1995/07/03 16:50:13 phil Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)leave.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: leave.c,v 1.8 2002/06/12 06:07:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: leave.c,v 1.9 2003/06/03 02:56:09 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index f51e86d78b1..c6a85d384cb 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $
+ * $OpenBSD: locate.bigram.c,v 1.8 2003/06/03 02:56:09 millert Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -36,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $
+ * $Id: locate.bigram.c,v 1.8 2003/06/03 02:56:09 millert Exp $
*/
#ifndef lint
@@ -45,7 +41,7 @@ static char copyright[] =
"@(#) Copyright (c) 1989, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#else
-static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.7 2001/11/19 19:02:14 mpech Exp $";
+static char rcsid[] = "$OpenBSD: locate.bigram.c,v 1.8 2003/06/03 02:56:09 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index a62002bde57..00a989a1788 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $
+ * $OpenBSD: locate.code.c,v 1.10 2003/06/03 02:56:10 millert Exp $
*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -35,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $
+ * $Id: locate.code.c,v 1.10 2003/06/03 02:56:10 millert Exp $
*/
#ifndef lint
@@ -48,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.code.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: locate.code.c,v 1.9 2002/02/16 21:27:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: locate.code.c,v 1.10 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index 408ceb3ebd6..d555cf46541 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fastfind.c,v 1.6 2001/11/19 19:02:15 mpech Exp $ */
+/* $OpenBSD: fastfind.c,v 1.7 2003/06/03 02:56:10 millert Exp $ */
/*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -36,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: fastfind.c,v 1.6 2001/11/19 19:02:15 mpech Exp $
+ * $Id: fastfind.c,v 1.7 2003/06/03 02:56:10 millert Exp $
*/
#ifndef _LOCATE_STATISTIC_
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index d4b448d78c9..e5a02ff72e6 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: locate.1,v 1.18 2003/01/02 23:26:18 henning Exp $
+.\" $OpenBSD: locate.1,v 1.19 2003/06/03 02:56:10 millert Exp $
.\"
.\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
.\" Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
@@ -33,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)locate.1 8.1 (Berkeley) 6/6/93
-.\" $Id: locate.1,v 1.18 2003/01/02 23:26:18 henning Exp $
+.\" $Id: locate.1,v 1.19 2003/06/03 02:56:10 millert Exp $
.\"
.Dd June 6, 1993
.Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index a566af73a94..e0864df335b 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: locate.c,v 1.14 2002/07/07 09:02:30 jufi Exp $
+ * $OpenBSD: locate.c,v 1.15 2003/06/03 02:56:10 millert Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -36,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: locate.c,v 1.14 2002/07/07 09:02:30 jufi Exp $
+ * $Id: locate.c,v 1.15 2003/06/03 02:56:10 millert Exp $
*/
#ifndef lint
@@ -50,7 +46,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)locate.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: locate.c,v 1.14 2002/07/07 09:02:30 jufi Exp $";
+static char rcsid[] = "$OpenBSD: locate.c,v 1.15 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 1b8b07691e8..d819092cd23 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: locate.h,v 1.8 1997/01/21 21:22:56 rahnds Exp $ */
+/* $OpenBSD: locate.h,v 1.9 2003/06/03 02:56:10 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/locate/locate/pathnames.h b/usr.bin/locate/locate/pathnames.h
index c06e3342679..0829fe562be 100644
--- a/usr.bin/locate/locate/pathnames.h
+++ b/usr.bin/locate/locate/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.4 1996/09/15 16:50:40 michaels Exp $ */
+/* $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:10 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index cb0bc972994..163c3c23c70 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: util.c,v 1.6 2002/06/24 12:37:20 naddy Exp $
+/* $OpenBSD: util.c,v 1.7 2003/06/03 02:56:10 millert Exp $
*
* Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -35,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: util.c,v 1.6 2002/06/24 12:37:20 naddy Exp $
+ * $Id: util.c,v 1.7 2003/06/03 02:56:10 millert Exp $
*/
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index 932a9475743..99193d701ea 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lock.1,v 1.11 2001/05/29 21:38:15 millert Exp $
+.\" $OpenBSD: lock.1,v 1.12 2003/06/03 02:56:10 millert Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index 2658d05b379..926e38118bf 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lock.c,v 1.19 2002/08/15 21:49:40 deraadt Exp $ */
+/* $OpenBSD: lock.c,v 1.20 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)lock.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: lock.c,v 1.19 2002/08/15 21:49:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lock.c,v 1.20 2003/06/03 02:56:10 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 73b8b50fbe5..8c9d5848415 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: logger.1,v 1.9 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: logger.1,v 1.10 2003/06/03 02:56:10 millert Exp $
.\" $NetBSD: logger.1,v 1.4 1994/12/22 06:26:59 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index a29b71472f9..50556eb3245 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logger.c,v 1.5 2002/02/16 21:27:48 millert Exp $ */
+/* $OpenBSD: logger.c,v 1.6 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: logger.c,v 1.4 1994/12/22 06:27:00 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)logger.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: logger.c,v 1.5 2002/02/16 21:27:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: logger.c,v 1.6 2003/06/03 02:56:10 millert Exp $";
#endif /* not lint */
#include <errno.h>
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index fe3342a5db0..01fc5fe1192 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login.1,v 1.20 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: login.1,v 1.21 2003/06/03 02:56:10 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/login/login.c b/usr.bin/login/login.c
index 8dbba8532f3..8cdf69781ea 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.49 2002/10/16 01:08:56 millert Exp $ */
+/* $OpenBSD: login.c,v 1.50 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -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.
*
@@ -77,7 +73,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-static const char rcsid[] = "$OpenBSD: login.c,v 1.49 2002/10/16 01:08:56 millert Exp $";
+static const char rcsid[] = "$OpenBSD: login.c,v 1.50 2003/06/03 02:56:10 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/login/pathnames.h b/usr.bin/login/pathnames.h
index 3e93a20732d..663115e5a86 100644
--- a/usr.bin/login/pathnames.h
+++ b/usr.bin/login/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.6 2002/10/16 01:08:56 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.7 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1994/12/23 06:53:03 jtc Exp $ */
/*-
@@ -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/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 4d79060f29b..300d89a9b19 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: logname.1,v 1.8 2000/03/10 19:07:20 aaron Exp $
+.\" $OpenBSD: logname.1,v 1.9 2003/06/03 02:56:10 millert Exp $
.\" $NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/logname/logname.c b/usr.bin/logname/logname.c
index cd4e189aa5b..7aa6c6c2cef 100644
--- a/usr.bin/logname/logname.c
+++ b/usr.bin/logname/logname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logname.c,v 1.4 2002/02/16 21:27:48 millert Exp $ */
+/* $OpenBSD: logname.c,v 1.5 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: logname.c,v 1.6 1994/12/22 06:39:32 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)logname.c 8.2 (Berkeley) 4/3/94";
#endif
-static char rcsid[] = "$OpenBSD: logname.c,v 1.4 2002/02/16 21:27:48 millert Exp $";
+static char rcsid[] = "$OpenBSD: logname.c,v 1.5 2003/06/03 02:56:10 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 9ac9bdbf1b7..d61a25a7d03 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: look.1,v 1.8 2000/03/10 19:07:20 aaron Exp $
+.\" $OpenBSD: look.1,v 1.9 2003/06/03 02:56:10 millert Exp $
.\" $NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index 7e852028fa7..6c5b0ea4508 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.8 2002/03/01 00:51:08 millert Exp $ */
+/* $OpenBSD: look.c,v 1.9 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: look.c,v 1.7 1995/08/31 22:41:02 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: look.c,v 1.8 2002/03/01 00:51:08 millert Exp $";
+static char rcsid[] = "$OpenBSD: look.c,v 1.9 2003/06/03 02:56:10 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/look/pathnames.h b/usr.bin/look/pathnames.h
index 85b8d891c95..9f77f8139f3 100644
--- a/usr.bin/look/pathnames.h
+++ b/usr.bin/look/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:36:07 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/23 01:11:03 jtc Exp $ */
/*
@@ -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/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1
index 739bfe0de47..3cc55c1b6e0 100644
--- a/usr.bin/lorder/lorder.1
+++ b/usr.bin/lorder/lorder.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lorder.1,v 1.6 2002/11/14 02:57:27 deraadt Exp $
+.\" $OpenBSD: lorder.1,v 1.7 2003/06/03 02:56:10 millert Exp $
.\" $NetBSD: lorder.1,v 1.5 1995/08/31 22:42:44 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/lorder/lorder.sh b/usr.bin/lorder/lorder.sh
index fda74c756bf..29eced70b3e 100644
--- a/usr.bin/lorder/lorder.sh
+++ b/usr.bin/lorder/lorder.sh
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: lorder.sh,v 1.12 2003/02/08 10:19:30 pvalchev Exp $
+# $OpenBSD: lorder.sh,v 1.13 2003/06/03 02:56:10 millert Exp $
# $NetBSD: lorder.sh.gnm,v 1.3 1995/12/20 04:45:11 cgd Exp $
#
# Copyright (c) 1990, 1993
@@ -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/usr.bin/m4/TEST/ack.m4 b/usr.bin/m4/TEST/ack.m4
index ef0b5ef5159..632e2070356 100644
--- a/usr.bin/m4/TEST/ack.m4
+++ b/usr.bin/m4/TEST/ack.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: ack.m4,v 1.2 1996/06/26 05:36:18 deraadt Exp $
+# $OpenBSD: ack.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: ack.m4,v 1.4 1995/09/28 05:37:54 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/TEST/hanoi.m4 b/usr.bin/m4/TEST/hanoi.m4
index d16f922ad0d..008ac146c49 100644
--- a/usr.bin/m4/TEST/hanoi.m4
+++ b/usr.bin/m4/TEST/hanoi.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: hanoi.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
+# $OpenBSD: hanoi.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: hanoi.m4,v 1.4 1995/09/28 05:37:56 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/TEST/hash.m4 b/usr.bin/m4/TEST/hash.m4
index 21b40e140c2..f46eb9e4757 100644
--- a/usr.bin/m4/TEST/hash.m4
+++ b/usr.bin/m4/TEST/hash.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: hash.m4,v 1.2 1996/06/26 05:36:19 deraadt Exp $
+# $OpenBSD: hash.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: hash.m4,v 1.4 1995/09/28 05:37:58 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/TEST/sqroot.m4 b/usr.bin/m4/TEST/sqroot.m4
index d01789bb4d0..fa01674d47f 100644
--- a/usr.bin/m4/TEST/sqroot.m4
+++ b/usr.bin/m4/TEST/sqroot.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: sqroot.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
+# $OpenBSD: sqroot.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: sqroot.m4,v 1.4 1995/09/28 05:38:01 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/TEST/string.m4 b/usr.bin/m4/TEST/string.m4
index bb0bba4d1b6..32d3a71faed 100644
--- a/usr.bin/m4/TEST/string.m4
+++ b/usr.bin/m4/TEST/string.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: string.m4,v 1.2 1996/06/26 05:36:20 deraadt Exp $
+# $OpenBSD: string.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: string.m4,v 1.4 1995/09/28 05:38:03 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/TEST/test.m4 b/usr.bin/m4/TEST/test.m4
index 1c77b9bdef9..dd20317eef3 100644
--- a/usr.bin/m4/TEST/test.m4
+++ b/usr.bin/m4/TEST/test.m4
@@ -1,4 +1,4 @@
-# $OpenBSD: test.m4,v 1.2 1996/06/26 05:36:21 deraadt Exp $
+# $OpenBSD: test.m4,v 1.3 2003/06/03 02:56:11 millert Exp $
# $NetBSD: test.m4,v 1.4 1995/09/28 05:38:05 tls Exp $
#
# Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 6fc972c6a8d..aafb63f4172 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eval.c,v 1.46 2003/04/05 14:42:11 espie Exp $ */
+/* $OpenBSD: eval.c,v 1.47 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: eval.c,v 1.7 1996/11/10 21:21:29 pk Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.2 (Berkeley) 4/27/95";
#else
-static char rcsid[] = "$OpenBSD: eval.c,v 1.46 2003/04/05 14:42:11 espie Exp $";
+static char rcsid[] = "$OpenBSD: eval.c,v 1.47 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index 10eacc91bd1..2814eb49616 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $ */
+/* $OpenBSD: expr.c,v 1.15 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: expr.c,v 1.7 1995/09/28 05:37:31 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expr.c 8.2 (Berkeley) 4/29/95";
#else
-static char rcsid[] = "$OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $";
+static char rcsid[] = "$OpenBSD: expr.c,v 1.15 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/extern.h b/usr.bin/m4/extern.h
index 7fb9000613b..6cae231f0af 100644
--- a/usr.bin/m4/extern.h
+++ b/usr.bin/m4/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.30 2002/04/28 14:37:12 espie Exp $ */
+/* $OpenBSD: extern.h,v 1.31 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1996/01/13 23:25:24 pk Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index ba76e805fda..6aa70e7963a 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.10 2002/04/26 16:15:16 espie Exp $ */
+/* $OpenBSD: look.c,v 1.11 2003/06/03 02:56:10 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index b33b4196338..a654535f2ce 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,4 +1,4 @@
-.\" @(#) $OpenBSD: m4.1,v 1.30 2003/04/14 06:39:24 jmc Exp $
+.\" @(#) $OpenBSD: m4.1,v 1.31 2003/06/03 02:56:10 millert Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index db3e834edcf..6d9770469c9 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.54 2002/04/28 14:37:12 espie Exp $ */
+/* $OpenBSD: main.c,v 1.55 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.54 2002/04/28 14:37:12 espie Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.55 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/mdef.h b/usr.bin/m4/mdef.h
index c387e088fd3..60e87a2f904 100644
--- a/usr.bin/m4/mdef.h
+++ b/usr.bin/m4/mdef.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mdef.h,v 1.22 2002/04/28 14:37:12 espie Exp $ */
+/* $OpenBSD: mdef.h,v 1.23 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: mdef.h,v 1.7 1996/01/13 23:25:27 pk Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 4943518aa85..cc299e2442f 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.28 2002/04/28 14:37:12 espie Exp $ */
+/* $OpenBSD: misc.c,v 1.29 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: misc.c,v 1.6 1995/09/28 05:37:41 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.28 2002/04/28 14:37:12 espie Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.29 2003/06/03 02:56:10 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/m4/pathnames.h b/usr.bin/m4/pathnames.h
index dc7f0d3dff5..69fa6c26333 100644
--- a/usr.bin/m4/pathnames.h
+++ b/usr.bin/m4/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.4 1997/04/04 18:41:29 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1995/09/29 00:27:55 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/m4/stdd.h b/usr.bin/m4/stdd.h
index 5c869b7f77d..90ea5f29c6d 100644
--- a/usr.bin/m4/stdd.h
+++ b/usr.bin/m4/stdd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdd.h,v 1.4 1999/11/09 18:16:18 deraadt Exp $ */
+/* $OpenBSD: stdd.h,v 1.5 2003/06/03 02:56:10 millert Exp $ */
/* $NetBSD: stdd.h,v 1.2 1995/09/28 05:37:50 tls Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index 73431aad098..9e3fff56ba7 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail0.nr,v 1.2 1996/06/11 12:54:18 deraadt Exp $
+.\" $OpenBSD: mail0.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail1.nr b/usr.bin/mail/USD.doc/mail1.nr
index 4e0176fcf56..71f6cb5895e 100644
--- a/usr.bin/mail/USD.doc/mail1.nr
+++ b/usr.bin/mail/USD.doc/mail1.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail1.nr,v 1.2 1996/06/11 12:54:18 deraadt Exp $
+.\" $OpenBSD: mail1.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail2.nr b/usr.bin/mail/USD.doc/mail2.nr
index 5057db7128c..6962f8e2972 100644
--- a/usr.bin/mail/USD.doc/mail2.nr
+++ b/usr.bin/mail/USD.doc/mail2.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail2.nr,v 1.3 1997/07/13 23:35:49 millert Exp $
+.\" $OpenBSD: mail2.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail3.nr b/usr.bin/mail/USD.doc/mail3.nr
index d6477b657b8..df934202be2 100644
--- a/usr.bin/mail/USD.doc/mail3.nr
+++ b/usr.bin/mail/USD.doc/mail3.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail3.nr,v 1.2 1996/06/11 12:54:20 deraadt Exp $
+.\" $OpenBSD: mail3.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail4.nr b/usr.bin/mail/USD.doc/mail4.nr
index f66aade88fc..6c8a901b58a 100644
--- a/usr.bin/mail/USD.doc/mail4.nr
+++ b/usr.bin/mail/USD.doc/mail4.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail4.nr,v 1.3 1997/07/13 23:35:49 millert Exp $
+.\" $OpenBSD: mail4.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 2a51d682bb1..145a3119645 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail5.nr,v 1.3 1997/07/13 23:35:50 millert Exp $
+.\" $OpenBSD: mail5.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail6.nr b/usr.bin/mail/USD.doc/mail6.nr
index 063aa454f34..cbbc47ebec5 100644
--- a/usr.bin/mail/USD.doc/mail6.nr
+++ b/usr.bin/mail/USD.doc/mail6.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail6.nr,v 1.3 1997/07/13 23:35:50 millert Exp $
+.\" $OpenBSD: mail6.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail7.nr b/usr.bin/mail/USD.doc/mail7.nr
index c7da12026af..eeb858ee1a8 100644
--- a/usr.bin/mail/USD.doc/mail7.nr
+++ b/usr.bin/mail/USD.doc/mail7.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail7.nr,v 1.2 1996/06/11 12:54:23 deraadt Exp $
+.\" $OpenBSD: mail7.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail8.nr b/usr.bin/mail/USD.doc/mail8.nr
index 291b4bd58a1..76cdd339c28 100644
--- a/usr.bin/mail/USD.doc/mail8.nr
+++ b/usr.bin/mail/USD.doc/mail8.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail8.nr,v 1.3 1997/07/13 23:35:51 millert Exp $
+.\" $OpenBSD: mail8.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/mail9.nr b/usr.bin/mail/USD.doc/mail9.nr
index efa569537bd..ed780716447 100644
--- a/usr.bin/mail/USD.doc/mail9.nr
+++ b/usr.bin/mail/USD.doc/mail9.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail9.nr,v 1.3 1997/07/13 23:35:51 millert Exp $
+.\" $OpenBSD: mail9.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/USD.doc/maila.nr b/usr.bin/mail/USD.doc/maila.nr
index 3a66facc7db..51e284dce2f 100644
--- a/usr.bin/mail/USD.doc/maila.nr
+++ b/usr.bin/mail/USD.doc/maila.nr
@@ -1,4 +1,4 @@
-.\" $OpenBSD: maila.nr,v 1.2 1996/06/11 12:54:25 deraadt Exp $
+.\" $OpenBSD: maila.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index 299a4dc3101..16f2781c19d 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aux.c,v 1.20 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: aux.c,v 1.21 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)aux.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: aux.c,v 1.20 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: aux.c,v 1.21 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 0ca979f2de9..6135c2f2ade 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd1.c,v 1.23 2003/05/15 02:47:47 pjanzen Exp $ */
+/* $OpenBSD: cmd1.c,v 1.24 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)cmd1.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: cmd1.c,v 1.23 2003/05/15 02:47:47 pjanzen Exp $";
+static const char rcsid[] = "$OpenBSD: cmd1.c,v 1.24 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index e8621d264e7..d55105c48cf 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd2.c,v 1.11 2001/11/21 20:41:55 millert Exp $ */
+/* $OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.11 2001/11/21 20:41:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.12 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmd3.c b/usr.bin/mail/cmd3.c
index a8ecb29d24c..8560502735c 100644
--- a/usr.bin/mail/cmd3.c
+++ b/usr.bin/mail/cmd3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd3.c,v 1.19 2002/08/12 00:42:56 aaron Exp $ */
+/* $OpenBSD: cmd3.c,v 1.20 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: cmd3.c,v 1.8 1997/07/09 05:29:49 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)cmd3.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: cmd3.c,v 1.19 2002/08/12 00:42:56 aaron Exp $";
+static const char rcsid[] = "$OpenBSD: cmd3.c,v 1.20 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 2c673c42682..69bf6a9ec75 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.6 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.7 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: cmdtab.c,v 1.7 1996/12/28 07:10:59 tls Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)cmdtab.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.6 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.7 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index 1ac2aa206e7..27dec8c8f40 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: collect.c,v 1.24 2002/04/08 20:27:17 millert Exp $ */
+/* $OpenBSD: collect.c,v 1.25 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)collect.c 8.2 (Berkeley) 4/19/94";
#else
-static const char rcsid[] = "$OpenBSD: collect.c,v 1.24 2002/04/08 20:27:17 millert Exp $";
+static const char rcsid[] = "$OpenBSD: collect.c,v 1.25 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/def.h b/usr.bin/mail/def.h
index d48f5ee0f02..027f9dbda14 100644
--- a/usr.bin/mail/def.h
+++ b/usr.bin/mail/def.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: def.h,v 1.11 2003/05/15 02:47:47 pjanzen Exp $ */
+/* $OpenBSD: def.h,v 1.12 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: def.h,v 1.9 1996/12/28 07:11:00 tls Exp $ */
/*
@@ -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.
*
@@ -34,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)def.h 8.4 (Berkeley) 4/20/95
- * $OpenBSD: def.h,v 1.11 2003/05/15 02:47:47 pjanzen Exp $
+ * $OpenBSD: def.h,v 1.12 2003/06/03 02:56:11 millert Exp $
*/
/*
diff --git a/usr.bin/mail/edit.c b/usr.bin/mail/edit.c
index af6839ebaed..2882d059aa6 100644
--- a/usr.bin/mail/edit.c
+++ b/usr.bin/mail/edit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: edit.c,v 1.11 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: edit.c,v 1.12 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: edit.c,v 1.5 1996/06/08 19:48:20 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)edit.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: edit.c,v 1.11 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: edit.c,v 1.12 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index d668571931f..4ff59140427 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.20 2001/11/28 01:26:35 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.21 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $ */
/*-
@@ -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.
*
@@ -34,7 +30,7 @@
* SUCH DAMAGE.
*
* @(#)extern.h 8.2 (Berkeley) 4/20/95
- * $OpenBSD: extern.h,v 1.20 2001/11/28 01:26:35 millert Exp $
+ * $OpenBSD: extern.h,v 1.21 2003/06/03 02:56:11 millert Exp $
*/
struct name;
diff --git a/usr.bin/mail/fio.c b/usr.bin/mail/fio.c
index c22f73f71e9..4f359276248 100644
--- a/usr.bin/mail/fio.c
+++ b/usr.bin/mail/fio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fio.c,v 1.22 2002/03/14 06:51:42 mpech Exp $ */
+/* $OpenBSD: fio.c,v 1.23 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: fio.c,v 1.8 1997/07/07 22:57:55 phil Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)fio.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: fio.c,v 1.22 2002/03/14 06:51:42 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: fio.c,v 1.23 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/getname.c b/usr.bin/mail/getname.c
index d42500bad56..6289c4a0c2e 100644
--- a/usr.bin/mail/getname.c
+++ b/usr.bin/mail/getname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getname.c,v 1.6 2002/10/07 22:45:37 vincent Exp $ */
+/* $OpenBSD: getname.c,v 1.7 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: getname.c,v 1.4 1996/06/08 19:48:23 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)getname.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: getname.c,v 1.6 2002/10/07 22:45:37 vincent Exp $";
+static const char rcsid[] = "$OpenBSD: getname.c,v 1.7 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/glob.h b/usr.bin/mail/glob.h
index 014f27b3769..ffa44a7e084 100644
--- a/usr.bin/mail/glob.h
+++ b/usr.bin/mail/glob.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: glob.h,v 1.6 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: glob.h,v 1.7 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: glob.h,v 1.4 1996/06/08 19:48:25 christos Exp $ */
/*
@@ -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/usr.bin/mail/head.c b/usr.bin/mail/head.c
index 4eff2996e21..1784947d5f3 100644
--- a/usr.bin/mail/head.c
+++ b/usr.bin/mail/head.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: head.c,v 1.8 2002/06/14 21:35:00 todd Exp $ */
+/* $OpenBSD: head.c,v 1.9 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: head.c,v 1.6 1996/12/28 07:11:03 tls Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)head.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: head.c,v 1.8 2002/06/14 21:35:00 todd Exp $";
+static const char rcsid[] = "$OpenBSD: head.c,v 1.9 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/lex.c b/usr.bin/mail/lex.c
index aea3fb8b671..5939b8f073d 100644
--- a/usr.bin/mail/lex.c
+++ b/usr.bin/mail/lex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lex.c,v 1.27 2001/11/21 20:41:55 millert Exp $ */
+/* $OpenBSD: lex.c,v 1.28 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: lex.c,v 1.10 1997/05/17 19:55:13 pk Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)lex.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: lex.c,v 1.27 2001/11/21 20:41:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: lex.c,v 1.28 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index 9b0fcccdc2e..6fb2262540a 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: list.c,v 1.12 2001/11/21 20:41:55 millert Exp $ */
+/* $OpenBSD: list.c,v 1.13 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: list.c,v 1.7 1997/07/09 05:23:36 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)list.c 8.4 (Berkeley) 5/1/95";
#else
-static const char rcsid[] = "$OpenBSD: list.c,v 1.12 2001/11/21 20:41:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: list.c,v 1.13 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 32f1e4aa0bc..723e7584c91 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail.1,v 1.36 2003/01/03 19:17:17 millert Exp $
+.\" $OpenBSD: mail.1,v 1.37 2003/06/03 02:56:11 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/mail/main.c b/usr.bin/mail/main.c
index e98ca244343..ca4b4710d17 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.17 2001/11/21 15:28:25 millert Exp $ */
+/* $OpenBSD: main.c,v 1.18 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: main.c,v 1.7 1997/05/13 06:15:57 mikel Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: main.c,v 1.17 2001/11/21 15:28:25 millert Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.18 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/names.c b/usr.bin/mail/names.c
index 26bb61817fe..7b66a7ea705 100644
--- a/usr.bin/mail/names.c
+++ b/usr.bin/mail/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.16 2001/11/21 20:41:55 millert Exp $ */
+/* $OpenBSD: names.c,v 1.17 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: names.c,v 1.5 1996/06/08 19:48:32 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)names.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: names.c,v 1.16 2001/11/21 20:41:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: names.c,v 1.17 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/pathnames.h b/usr.bin/mail/pathnames.h
index 9aacc30190f..f1f51001232 100644
--- a/usr.bin/mail/pathnames.h
+++ b/usr.bin/mail/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.6 2001/10/04 04:23:26 pvalchev Exp $ */
+/* $OpenBSD: pathnames.h,v 1.7 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.4 1996/06/08 19:48:34 christos Exp $ */
/*
@@ -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/usr.bin/mail/popen.c b/usr.bin/mail/popen.c
index 206cdbf774b..b4d8c1e0f00 100644
--- a/usr.bin/mail/popen.c
+++ b/usr.bin/mail/popen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: popen.c,v 1.32 2002/06/12 06:07:15 mpech Exp $ */
+/* $OpenBSD: popen.c,v 1.33 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: popen.c,v 1.6 1997/05/13 06:48:42 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)popen.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: popen.c,v 1.32 2002/06/12 06:07:15 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: popen.c,v 1.33 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index 3e54de63aec..eff860ec736 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quit.c,v 1.16 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: quit.c,v 1.17 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)quit.c 8.2 (Berkeley) 4/28/95";
#else
-static const char rcsid[] = "$OpenBSD: quit.c,v 1.16 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: quit.c,v 1.17 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/rcv.h b/usr.bin/mail/rcv.h
index 6e7cd87d468..26b5135364a 100644
--- a/usr.bin/mail/rcv.h
+++ b/usr.bin/mail/rcv.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rcv.h,v 1.2 1996/06/11 12:53:48 deraadt Exp $ */
+/* $OpenBSD: rcv.h,v 1.3 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: rcv.h,v 1.4 1996/06/08 19:48:38 christos Exp $ */
/*
@@ -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/usr.bin/mail/send.c b/usr.bin/mail/send.c
index 204a576cca0..6bb9180015a 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: send.c,v 1.16 2003/05/15 02:47:47 pjanzen Exp $ */
+/* $OpenBSD: send.c,v 1.17 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: send.c,v 1.6 1996/06/08 19:48:39 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)send.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: send.c,v 1.16 2003/05/15 02:47:47 pjanzen Exp $";
+static const char rcsid[] = "$OpenBSD: send.c,v 1.17 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/strings.c b/usr.bin/mail/strings.c
index f36549061ef..6cbdb70f3a7 100644
--- a/usr.bin/mail/strings.c
+++ b/usr.bin/mail/strings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strings.c,v 1.7 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: strings.c,v 1.8 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: strings.c,v 1.5 1996/06/08 19:48:40 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)strings.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: strings.c,v 1.7 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: strings.c,v 1.8 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index 13b85f4dae7..57ca0f9ff2e 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: temp.c,v 1.13 2002/01/24 23:01:19 millert Exp $ */
+/* $OpenBSD: temp.c,v 1.14 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: temp.c,v 1.5 1996/06/08 19:48:42 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)temp.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: temp.c,v 1.13 2002/01/24 23:01:19 millert Exp $";
+static const char rcsid[] = "$OpenBSD: temp.c,v 1.14 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index d8d1153b543..e647002e5e6 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.16 2001/11/28 01:04:34 millert Exp $ */
+/* $OpenBSD: tty.c,v 1.17 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 4/20/95";
#else
-static const char rcsid[] = "$OpenBSD: tty.c,v 1.16 2001/11/28 01:04:34 millert Exp $";
+static const char rcsid[] = "$OpenBSD: tty.c,v 1.17 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index b9b8f4464c4..d863f07d3a2 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v7.local.c,v 1.13 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: v7.local.c,v 1.14 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: v7.local.c,v 1.8 1997/05/13 06:15:58 mikel Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)v7.local.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: v7.local.c,v 1.13 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: v7.local.c,v 1.14 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/vars.c b/usr.bin/mail/vars.c
index 9237583df1e..f616ebd7d0b 100644
--- a/usr.bin/mail/vars.c
+++ b/usr.bin/mail/vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vars.c,v 1.9 2002/08/12 00:42:56 aaron Exp $ */
+/* $OpenBSD: vars.c,v 1.10 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: vars.c,v 1.4 1996/06/08 19:48:45 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: vars.c,v 1.9 2002/08/12 00:42:56 aaron Exp $";
+static const char rcsid[] = "$OpenBSD: vars.c,v 1.10 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/mail/version.c b/usr.bin/mail/version.c
index aa736bf0db0..e837be7ed2f 100644
--- a/usr.bin/mail/version.c
+++ b/usr.bin/mail/version.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.c,v 1.5 2001/11/21 15:26:39 millert Exp $ */
+/* $OpenBSD: version.c,v 1.6 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: version.c,v 1.4 1996/06/08 19:48:46 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)version.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: version.c,v 1.5 2001/11/21 15:26:39 millert Exp $";
+static const char rcsid[] = "$OpenBSD: version.c,v 1.6 2003/06/03 02:56:11 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index b5d757f9652..ac557c16408 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tutorial.ms,v 1.5 1999/06/06 07:03:15 pjanzen Exp $
+.\" $OpenBSD: tutorial.ms,v 1.6 2003/06/03 02:56:12 millert Exp $
.\" $NetBSD: tutorial.ms,v 1.3 1996/03/06 00:15:31 christos Exp $
.\" Copyright (c) 1988, 1989 by Adam de Boor
.\" Copyright (c) 1989 by Berkeley Softworks
@@ -16,11 +16,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index ebbbf784b1a..72d6e39ab26 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: arch.c,v 1.52 2003/04/06 22:47:14 espie Exp $ */
+/* $OpenBSD: arch.c,v 1.53 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 094b26ddc2a..b0cbe8cdf24 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: buf.c,v 1.18 2001/05/30 00:43:00 deraadt Exp $ */
+/* $OpenBSD: buf.c,v 1.19 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: buf.c,v 1.9 1996/12/31 17:53:21 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 8a3a63c4174..f6e24ceb6b4 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -2,7 +2,7 @@
#define _BUF_H
/* $OpenPackages$ */
-/* $OpenBSD: buf.h,v 1.15 2001/05/23 12:34:40 espie Exp $ */
+/* $OpenBSD: buf.h,v 1.16 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: buf.h,v 1.7 1996/12/31 17:53:22 christos Exp $ */
/*
@@ -49,11 +49,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index c0aba643bc2..9a6613c6848 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: compat.c,v 1.48 2002/07/31 19:29:20 mickey Exp $ */
+/* $OpenBSD: compat.c,v 1.49 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 7dc574f802a..0f2d45091a7 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: cond.c,v 1.28 2002/06/11 21:12:11 espie Exp $ */
+/* $OpenBSD: cond.c,v 1.29 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 0ffd60b7ddc..fe9e3c23307 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -2,7 +2,7 @@
#define CONFIG_H
/* $OpenPackages$ */
-/* $OpenBSD: config.h,v 1.13 2002/01/30 18:40:26 matthieu Exp $ */
+/* $OpenBSD: config.h,v 1.14 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: config.h,v 1.7 1996/11/06 17:59:03 christos Exp $ */
/*
@@ -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/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 2b4bbb89975..ed9c285b381 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: dir.c,v 1.39 2003/04/21 23:10:52 espie Exp $ */
+/* $OpenBSD: dir.c,v 1.40 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 80e626395c8..d4eb5976eb8 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -2,7 +2,7 @@
#define DIR_H
/* $OpenPackages$ */
-/* $OpenBSD: dir.h,v 1.15 2001/05/23 12:34:42 espie Exp $ */
+/* $OpenBSD: dir.h,v 1.16 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: dir.h,v 1.4 1996/11/06 17:59:05 christos Exp $ */
/*
@@ -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/usr.bin/make/extern.h b/usr.bin/make/extern.h
index 9c94bccd45e..45cce1d0b39 100644
--- a/usr.bin/make/extern.h
+++ b/usr.bin/make/extern.h
@@ -2,7 +2,7 @@
#define EXTERN_H
/* $OpenPackages$ */
-/* $OpenBSD: extern.h,v 1.38 2001/05/23 12:34:42 espie Exp $ */
+/* $OpenBSD: extern.h,v 1.39 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: nonints.h,v 1.12 1996/11/06 17:59:19 christos Exp $ */
/*-
@@ -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/usr.bin/make/for.c b/usr.bin/make/for.c
index 889bc3960ec..f141f04c6ce 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: for.c,v 1.28 2002/06/13 23:26:39 espie Exp $ */
+/* $OpenBSD: for.c,v 1.29 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */
/*
@@ -41,11 +41,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 7d8382d1ae3..46f4516809a 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: job.c,v 1.54 2003/04/06 22:47:14 espie Exp $ */
+/* $OpenBSD: job.c,v 1.55 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 985a64e4c72..676eadb420a 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -2,7 +2,7 @@
#define _JOB_H_
/* $OpenPackages$ */
-/* $OpenBSD: job.h,v 1.13 2002/03/19 00:08:31 espie Exp $ */
+/* $OpenBSD: job.h,v 1.14 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: job.h,v 1.5 1996/11/06 17:59:10 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.h b/usr.bin/make/lst.h
index b3b0fff16b8..6e1af60b989 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -2,7 +2,7 @@
#define _LST_H_
/* $OpenPackages$ */
-/* $OpenBSD: lst.h,v 1.24 2001/11/11 12:35:02 espie Exp $ */
+/* $OpenBSD: lst.h,v 1.25 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 751502d631c..9c9acfb702c 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstAppend.c,v 1.14 2001/05/29 12:53:44 espie Exp $ */
+/* $OpenBSD: lstAppend.c,v 1.15 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstAppend.c,v 1.5 1996/11/06 17:59:31 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index ce848c3a9ae..a1b990c8137 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstConcat.c,v 1.14 2001/05/29 12:53:45 espie Exp $ */
+/* $OpenBSD: lstConcat.c,v 1.15 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstConcatDestroy.c b/usr.bin/make/lst.lib/lstConcatDestroy.c
index 030d7978a68..6b5ec0329a3 100644
--- a/usr.bin/make/lst.lib/lstConcatDestroy.c
+++ b/usr.bin/make/lst.lib/lstConcatDestroy.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstConcatDestroy.c,v 1.5 2001/05/29 12:53:45 espie Exp $ */
+/* $OpenBSD: lstConcatDestroy.c,v 1.6 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index d7c8dc31743..70d44569813 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstDeQueue.c,v 1.13 2001/05/29 12:53:45 espie Exp $ */
+/* $OpenBSD: lstDeQueue.c,v 1.14 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstDeQueue.c,v 1.5 1996/11/06 17:59:36 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 8d19372233b..c077bdeea2a 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstDestroy.c,v 1.14 2001/05/29 12:53:45 espie Exp $ */
+/* $OpenBSD: lstDestroy.c,v 1.15 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstDestroy.c,v 1.6 1996/11/06 17:59:37 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index 9257c4eede2..4816cd9f9a3 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstDupl.c,v 1.16 2001/05/29 12:53:46 espie Exp $ */
+/* $OpenBSD: lstDupl.c,v 1.17 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstDupl.c,v 1.6 1996/11/06 17:59:37 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 4a6a33d47d1..b13aa47c346 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstFindFrom.c,v 1.12 2001/05/29 12:53:46 espie Exp $ */
+/* $OpenBSD: lstFindFrom.c,v 1.13 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstFindFrom.c,v 1.6 1996/11/06 17:59:40 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 1bf3763f7df..24407f77e56 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstForEachFrom.c,v 1.12 2001/05/29 12:53:46 espie Exp $ */
+/* $OpenBSD: lstForEachFrom.c,v 1.13 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstForEachFrom.c,v 1.5 1996/11/06 17:59:42 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index a10c63ba57a..6bc6ea73a97 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstInit.c,v 1.13 2001/05/29 12:53:46 espie Exp $ */
+/* $OpenBSD: lstInit.c,v 1.14 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstInit.c,v 1.5 1996/11/06 17:59:43 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 49c21612f91..a4321e7cc16 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstInsert.c,v 1.14 2001/05/29 12:53:46 espie Exp $ */
+/* $OpenBSD: lstInsert.c,v 1.15 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstInsert.c,v 1.5 1996/11/06 17:59:44 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 85d061a64fc..9547d8bcfce 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstInt.h,v 1.13 2001/05/23 12:34:56 espie Exp $ */
+/* $OpenBSD: lstInt.h,v 1.14 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstInt.h,v 1.7 1996/11/06 17:59:44 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index cb46ab68a65..6f7228fd3cc 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstMember.c,v 1.11 2001/05/29 12:53:47 espie Exp $ */
+/* $OpenBSD: lstMember.c,v 1.12 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstMember.c,v 1.5 1996/11/06 17:59:48 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index a27b5f01efa..3edb07dcbc0 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstRemove.c,v 1.13 2001/05/29 12:53:47 espie Exp $ */
+/* $OpenBSD: lstRemove.c,v 1.14 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstRemove.c,v 1.5 1996/11/06 17:59:50 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index e84ff7c9a3b..5f88f6c7357 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstReplace.c,v 1.12 2001/05/29 12:53:47 espie Exp $ */
+/* $OpenBSD: lstReplace.c,v 1.13 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstReplace.c,v 1.5 1996/11/06 17:59:51 christos Exp $ */
/*
@@ -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/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 70abc0241fe..96a32d4e497 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: lstSucc.c,v 1.11 2002/12/09 00:45:38 millert Exp $ */
+/* $OpenBSD: lstSucc.c,v 1.12 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: lstSucc.c,v 1.5 1996/11/06 17:59:52 christos Exp $ */
/*
@@ -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/usr.bin/make/main.c b/usr.bin/make/main.c
index 9cfa1309ea1..0862420046d 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: main.c,v 1.61 2003/04/21 23:14:06 millert Exp $ */
+/* $OpenBSD: main.c,v 1.62 2003/06/03 02:56:11 millert Exp $ */
/* $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 2732bd092e4..43b05d139f5 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: make.1,v 1.50 2003/03/28 09:56:06 jmc Exp $
+.\" $OpenBSD: make.1,v 1.51 2003/06/03 02:56:12 millert Exp $
.\" $OpenPackages$
.\" $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
.\"
@@ -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/usr.bin/make/make.c b/usr.bin/make/make.c
index 0621810ffdb..c13c32555e8 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: make.c,v 1.32 2001/11/23 23:42:45 deraadt Exp $ */
+/* $OpenBSD: make.c,v 1.33 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 0d1d649a12f..61a72b2ee06 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -2,7 +2,7 @@
#define _MAKE_H_
/* $OpenPackages$ */
-/* $OpenBSD: make.h,v 1.32 2001/05/23 12:34:46 espie Exp $ */
+/* $OpenBSD: make.h,v 1.33 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $ */
/*
@@ -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/usr.bin/make/memory.c b/usr.bin/make/memory.c
index 3abd1513a32..4b756ca5435 100644
--- a/usr.bin/make/memory.c
+++ b/usr.bin/make/memory.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: memory.c,v 1.1 2001/05/23 12:34:47 espie Exp $ */
+/* $OpenBSD: memory.c,v 1.2 2003/06/03 02:56:12 millert Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/memory.h b/usr.bin/make/memory.h
index 5d1e29fab74..e2787a11044 100644
--- a/usr.bin/make/memory.h
+++ b/usr.bin/make/memory.h
@@ -2,7 +2,7 @@
#define MEMORY_H
/* $OpenPackages$ */
-/* $OpenBSD: memory.h,v 1.1 2001/05/23 12:34:47 espie Exp $ */
+/* $OpenBSD: memory.h,v 1.2 2003/06/03 02:56:12 millert Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -21,11 +21,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index f7e90e12f70..40e50ef896f 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: parse.c,v 1.67 2002/06/11 21:12:11 espie Exp $ */
+/* $OpenBSD: parse.c,v 1.68 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 30786672f49..9fd6d112bc4 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: pathnames.h,v 1.9 2001/05/23 12:34:48 espie Exp $ */
+/* $OpenBSD: pathnames.h,v 1.10 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.6 1996/11/06 17:59:21 christos Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index c1f2abec2e0..3e0d56427a7 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: str.c,v 1.19 2001/05/23 12:34:49 espie Exp $ */
+/* $OpenBSD: str.c,v 1.20 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $ */
/*-
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index d35b6b6c25b..86be942717a 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: suff.c,v 1.49 2002/02/26 14:33:45 espie Exp $ */
+/* $OpenBSD: suff.c,v 1.50 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $ */
/*
@@ -19,11 +19,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index a2987a15ad4..e3f04fc242d 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: targ.c,v 1.37 2003/01/03 17:44:48 espie Exp $ */
+/* $OpenBSD: targ.c,v 1.38 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 09e49d55e6a..a930a965225 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: var.c,v 1.56 2002/06/05 18:45:39 espie Exp $ */
+/* $OpenBSD: var.c,v 1.57 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/make/varmodifiers.c b/usr.bin/make/varmodifiers.c
index e9daf7a7e69..7ea33452236 100644
--- a/usr.bin/make/varmodifiers.c
+++ b/usr.bin/make/varmodifiers.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: varmodifiers.c,v 1.10 2001/09/07 12:19:46 espie Exp $ */
+/* $OpenBSD: varmodifiers.c,v 1.11 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $ */
/*
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/man/config.c b/usr.bin/man/config.c
index 1508e7ffaa1..a9d018e0339 100644
--- a/usr.bin/man/config.c
+++ b/usr.bin/man/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.3 2002/09/17 19:37:39 deraadt Exp $ */
+/* $OpenBSD: config.c,v 1.4 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: config.c,v 1.7 1995/09/28 06:05:21 tls Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)config.c 8.8 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$OpenBSD: config.c,v 1.3 2002/09/17 19:37:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: config.c,v 1.4 2003/06/03 02:56:12 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index 8ed927fbed4..9d69f265702 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.1,v 1.17 2002/01/24 20:33:45 mickey Exp $
+.\" $OpenBSD: man.1,v 1.18 2003/06/03 02:56:12 millert Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/man/man.c b/usr.bin/man/man.c
index 21177aa6e46..329cc50f00e 100644
--- a/usr.bin/man/man.c
+++ b/usr.bin/man/man.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: man.c,v 1.24 2003/03/13 09:09:32 deraadt Exp $ */
+/* $OpenBSD: man.c,v 1.25 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: man.c,v 1.7 1995/09/28 06:05:34 tls Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)man.c 8.17 (Berkeley) 1/31/95";
#else
-static char rcsid[] = "$OpenBSD: man.c,v 1.24 2003/03/13 09:09:32 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: man.c,v 1.25 2003/06/03 02:56:12 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index 43667ba9c12..8014040a11a 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.conf.5,v 1.8 2003/01/21 19:59:09 jmc Exp $
+.\" $OpenBSD: man.conf.5,v 1.9 2003/06/03 02:56:12 millert Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/man/pathnames.h b/usr.bin/man/pathnames.h
index 0881da63adf..4a00ef5ebdb 100644
--- a/usr.bin/man/pathnames.h
+++ b/usr.bin/man/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.4 1997/06/06 10:05:09 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:12 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:05:40 tls Exp $ */
/*
@@ -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/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index aec224cfc70..c7a10ac3082 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mesg.1,v 1.8 2002/01/24 20:33:45 mickey Exp $
+.\" $OpenBSD: mesg.1,v 1.9 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: mesg.1,v 1.3 1994/12/23 07:16:31 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index a6d6dd53b6a..c0dba79852c 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mesg.c,v 1.4 1997/07/31 14:56:33 flipk Exp $ */
+/* $OpenBSD: mesg.c,v 1.5 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: mesg.c,v 1.4 1994/12/23 07:16:32 jtc Exp $ */
/*
@@ -18,11 +18,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -49,7 +45,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)mesg.c 8.2 (Berkeley) 1/21/94";
#endif
-static char rcsid[] = "$OpenBSD: mesg.c,v 1.4 1997/07/31 14:56:33 flipk Exp $";
+static char rcsid[] = "$OpenBSD: mesg.c,v 1.5 2003/06/03 02:56:13 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 7ce1fbc8078..797fc3b0d47 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mkdep.1,v 1.5 2000/11/10 05:10:36 aaron Exp $
+.\" $OpenBSD: mkdep.1,v 1.6 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mkdep/mkdep.append b/usr.bin/mkdep/mkdep.append
index a1242039b98..b8db6e37ccb 100644
--- a/usr.bin/mkdep/mkdep.append
+++ b/usr.bin/mkdep/mkdep.append
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.append,v 1.6 2002/12/15 13:30:17 henning Exp $
+# $OpenBSD: mkdep.append,v 1.7 2003/06/03 02:56:13 millert Exp $
# $NetBSD: mkdep.append,v 1.2 1994/12/23 07:34:57 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index 27a7b5c19b7..aa3355dede5 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.gcc.sh,v 1.11 2002/02/25 03:37:45 pvalchev Exp $
+# $OpenBSD: mkdep.gcc.sh,v 1.12 2003/06/03 02:56:13 millert Exp $
# $NetBSD: mkdep.gcc.sh,v 1.9 1994/12/23 07:34:59 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/mkdep/mkdep.old.compiler b/usr.bin/mkdep/mkdep.old.compiler
index e0c182450e9..f41f744b027 100644
--- a/usr.bin/mkdep/mkdep.old.compiler
+++ b/usr.bin/mkdep/mkdep.old.compiler
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.old.compiler,v 1.5 2002/12/15 13:30:17 henning Exp $
+# $OpenBSD: mkdep.old.compiler,v 1.6 2003/06/03 02:56:13 millert Exp $
# $NetBSD: mkdep.old.compiler,v 1.2 1994/12/23 07:35:00 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/mkdep/mkdep.sh b/usr.bin/mkdep/mkdep.sh
index 09eae037ed2..e95043f98b3 100644
--- a/usr.bin/mkdep/mkdep.sh
+++ b/usr.bin/mkdep/mkdep.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.sh,v 1.7 2000/07/23 22:22:07 millert Exp $
+# $OpenBSD: mkdep.sh,v 1.8 2003/06/03 02:56:13 millert Exp $
# $NetBSD: mkdep.sh,v 1.3 1994/12/23 07:35:02 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/mkdep/mkdep.ultrix b/usr.bin/mkdep/mkdep.ultrix
index b032565241b..562bdd0c2f6 100644
--- a/usr.bin/mkdep/mkdep.ultrix
+++ b/usr.bin/mkdep/mkdep.ultrix
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: mkdep.ultrix,v 1.6 2002/12/15 13:30:17 henning Exp $
+# $OpenBSD: mkdep.ultrix,v 1.7 2003/06/03 02:56:13 millert Exp $
# $NetBSD: mkdep.ultrix,v 1.2 1994/12/23 07:35:04 jtc Exp $
#
# Copyright (c) 1991, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index 404d4b3f38f..fe94ad893cc 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mkstr.1,v 1.8 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: mkstr.1,v 1.9 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: mkstr.1,v 1.3 1995/09/28 06:22:19 tls Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index c51bf61947c..71185eeb36c 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkstr.c,v 1.7 2002/12/13 14:39:55 millert Exp $ */
+/* $OpenBSD: mkstr.c,v 1.8 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)mkstr.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: mkstr.c,v 1.7 2002/12/13 14:39:55 millert Exp $";
+static const char rcsid[] = "$OpenBSD: mkstr.c,v 1.8 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index b32de7f35f8..3a47fcf533e 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: msgs.1,v 1.13 2003/01/15 15:05:35 deraadt Exp $
+.\" $OpenBSD: msgs.1,v 1.14 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: msgs.1,v 1.5 1995/09/28 06:57:39 tls Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 0decb021d69..f2832eaaea7 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msgs.c,v 1.25 2003/04/07 21:13:54 deraadt Exp $ */
+/* $OpenBSD: msgs.c,v 1.26 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: msgs.c,v 1.7 1995/09/28 06:57:40 tls Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)msgs.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: msgs.c,v 1.25 2003/04/07 21:13:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: msgs.c,v 1.26 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/msgs/pathnames.h b/usr.bin/msgs/pathnames.h
index a3c7fed17d7..e6d52cc4fbc 100644
--- a/usr.bin/msgs/pathnames.h
+++ b/usr.bin/msgs/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/09/16 02:26:13 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1995/09/28 06:57:41 tls Exp $ */
/*
@@ -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/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index f3871495d54..2a2c9677abf 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: atalk.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: atalk.c,v 1.11 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: atalk.c,v 1.2 1997/05/22 17:21:26 christos Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from @(#)atalk.c 1.1 (Whistle) 6/6/96";
#else
-static char rcsid[] = "$OpenBSD: atalk.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: atalk.c,v 1.11 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index d6dc173a2ca..5733497e1aa 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.34 2003/05/14 23:37:05 itojun Exp $ */
+/* $OpenBSD: if.c,v 1.35 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: if.c,v 1.16.4.2 1996/06/07 21:46:46 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)if.c 8.2 (Berkeley) 2/21/94";
#else
-static char *rcsid = "$OpenBSD: if.c,v 1.34 2003/05/14 23:37:05 itojun Exp $";
+static char *rcsid = "$OpenBSD: if.c,v 1.35 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 8467cfb51f0..22e15747f00 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inet.c,v 1.64 2003/02/19 19:15:13 jason Exp $ */
+/* $OpenBSD: inet.c,v 1.65 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-static char *rcsid = "$OpenBSD: inet.c,v 1.64 2003/02/19 19:15:13 jason Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.65 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index d9e7a7070be..5bf57bad7fc 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inet6.c,v 1.28 2003/05/14 23:37:05 itojun Exp $ */
+/* $OpenBSD: inet6.c,v 1.29 2003/06/03 02:56:13 millert Exp $ */
/* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */
/*
* Copyright (c) 1983, 1988, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-/*__RCSID("$OpenBSD: inet6.c,v 1.28 2003/05/14 23:37:05 itojun Exp $");*/
+/*__RCSID("$OpenBSD: inet6.c,v 1.29 2003/06/03 02:56:13 millert Exp $");*/
/*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 5780e8daaae..f227dcb159f 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx.c,v 1.13 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: ipx.c,v 1.14 2003/06/03 02:56:13 millert Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$OpenBSD: ipx.c,v 1.13 2003/02/01 01:51:31 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ipx.c,v 1.14 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index f07d08bcb8a..8088958f086 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iso.c,v 1.11 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: iso.c,v 1.12 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: iso.c,v 1.12 1995/10/03 21:42:38 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)iso.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$OpenBSD: iso.c,v 1.11 2003/02/01 01:51:31 deraadt Exp $";
+static char *rcsid = "$OpenBSD: iso.c,v 1.12 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 69ddc8fae3f..334b502e089 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.35 2003/02/01 14:09:16 dhartmei Exp $ */
+/* $OpenBSD: main.c,v 1.36 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: main.c,v 1.9 1996/05/07 02:55:02 thorpej Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ char copyright[] =
#if 0
static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94";
#else
-static char *rcsid = "$OpenBSD: main.c,v 1.35 2003/02/01 14:09:16 dhartmei Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.36 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index a874bf95882..cc918e10c72 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbuf.c,v 1.18 2003/03/21 16:55:23 pb Exp $ */
+/* $OpenBSD: mbuf.c,v 1.19 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: mbuf.c,v 1.9 1996/05/07 02:55:03 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)mbuf.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$OpenBSD: mbuf.c,v 1.18 2003/03/21 16:55:23 pb Exp $";
+static char *rcsid = "$OpenBSD: mbuf.c,v 1.19 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c
index c5b66c503ee..2d1808cbfad 100644
--- a/usr.bin/netstat/mroute.c
+++ b/usr.bin/netstat/mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mroute.c,v 1.9 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: mroute.c,v 1.10 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: mroute.c,v 1.10 1996/05/11 13:51:27 mycroft Exp $ */
/*
@@ -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/usr.bin/netstat/mroute6.c b/usr.bin/netstat/mroute6.c
index fcc3af6efed..4ccac5d4b70 100644
--- a/usr.bin/netstat/mroute6.c
+++ b/usr.bin/netstat/mroute6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mroute6.c,v 1.6 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: mroute6.c,v 1.7 2003/06/03 02:56:13 millert Exp $ */
/*
* Copyright (C) 1998 WIDE Project.
@@ -45,11 +45,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 3bc12602368..adeee5dc901 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netstat.1,v 1.28 2002/09/18 07:33:47 deraadt Exp $
+.\" $OpenBSD: netstat.1,v 1.29 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index eb72e2932d8..e0a6028e516 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netstat.h,v 1.22 2002/06/07 21:58:38 itojun Exp $ */
+/* $OpenBSD: netstat.h,v 1.23 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: netstat.h,v 1.6 1996/05/07 02:55:05 thorpej Exp $ */
/*
@@ -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/usr.bin/netstat/ns.c b/usr.bin/netstat/ns.c
index 6eba9fb387d..fbaa754bf38 100644
--- a/usr.bin/netstat/ns.c
+++ b/usr.bin/netstat/ns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: ns.c,v 1.11 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: ns.c,v 1.8 1995/10/03 21:42:46 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)ns.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$OpenBSD: ns.c,v 1.10 2003/02/01 01:51:31 deraadt Exp $";
+static char *rcsid = "$OpenBSD: ns.c,v 1.11 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 332a51de3f1..5155289110c 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: route.c,v 1.52 2003/05/14 23:37:05 itojun Exp $ */
+/* $OpenBSD: route.c,v 1.53 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-static char *rcsid = "$OpenBSD: route.c,v 1.52 2003/05/14 23:37:05 itojun Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.53 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 5f69eedb3e1..d362e066238 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unix.c,v 1.9 2003/02/01 01:51:31 deraadt Exp $ */
+/* $OpenBSD: unix.c,v 1.10 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: unix.c,v 1.13 1995/10/03 21:42:48 thorpej Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)unix.c 8.1 (Berkeley) 6/6/93";
#else
-static char *rcsid = "$OpenBSD: unix.c,v 1.9 2003/02/01 01:51:31 deraadt Exp $";
+static char *rcsid = "$OpenBSD: unix.c,v 1.10 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 63af96547a6..4d60cb3ab0d 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nfsstat.1,v 1.9 2000/04/18 20:46:22 mickey Exp $
+.\" $OpenBSD: nfsstat.1,v 1.10 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: nfsstat.1,v 1.8 1996/03/03 17:21:28 thorpej Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 588ae880e4e..f8d08bc2ba9 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfsstat.c,v 1.17 2003/01/15 22:57:42 millert Exp $ */
+/* $OpenBSD: nfsstat.c,v 1.18 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -48,7 +44,7 @@ static char copyright[] =
static char sccsid[] = "from: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";
static char *rcsid = "$NetBSD: nfsstat.c,v 1.7 1996/03/03 17:21:30 thorpej Exp $";
#else
-static char *rcsid = "$OpenBSD: nfsstat.c,v 1.17 2003/01/15 22:57:42 millert Exp $";
+static char *rcsid = "$OpenBSD: nfsstat.c,v 1.18 2003/06/03 02:56:13 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 028b8fd1159..42dd8886750 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nice.1,v 1.10 2000/11/10 05:10:37 aaron Exp $
+.\" $OpenBSD: nice.1,v 1.11 2003/06/03 02:56:13 millert Exp $
.\" $NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nice/nice.c b/usr.bin/nice/nice.c
index fd3eee45c83..c68f9ba860e 100644
--- a/usr.bin/nice/nice.c
+++ b/usr.bin/nice/nice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nice.c,v 1.7 2002/06/17 07:06:25 deraadt Exp $ */
+/* $OpenBSD: nice.c,v 1.8 2003/06/03 02:56:13 millert Exp $ */
/* $NetBSD: nice.c,v 1.9 1995/08/31 23:30:58 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)nice.c 5.4 (Berkeley) 6/1/90";
#endif
-static char rcsid[] = "$OpenBSD: nice.c,v 1.7 2002/06/17 07:06:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: nice.c,v 1.8 2003/06/03 02:56:13 millert Exp $";
#endif /* not lint */
#include <sys/time.h>
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index 69c3d076e5e..ad486b304e1 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nm.1,v 1.11 2001/08/16 15:45:05 espie Exp $
+.\" $OpenBSD: nm.1,v 1.12 2003/06/03 02:56:14 millert Exp $
.\" $NetBSD: nm.1,v 1.3 1995/08/31 23:41:58 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 0e08b42f7b4..8a1ba72838f 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nm.c,v 1.17 2003/04/05 17:15:06 deraadt Exp $ */
+/* $OpenBSD: nm.c,v 1.18 2003/06/03 02:56:14 millert Exp $ */
/* $NetBSD: nm.c,v 1.7 1996/01/14 23:04:03 pk Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)nm.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: nm.c,v 1.17 2003/04/05 17:15:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: nm.c,v 1.18 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 077c05495eb..7aca87addca 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nohup.1,v 1.7 2001/05/01 17:58:03 aaron Exp $
+.\" $OpenBSD: nohup.1,v 1.8 2003/06/03 02:56:14 millert Exp $
.\" $NetBSD: nohup.1,v 1.5 1995/08/31 23:35:24 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index d5e9a055c54..278117701ff 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nohup.c,v 1.11 2003/02/18 01:17:44 cloder Exp $ */
+/* $OpenBSD: nohup.c,v 1.12 2003/06/03 02:56:14 millert Exp $ */
/* $NetBSD: nohup.c,v 1.6 1995/08/31 23:35:25 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)nohup.c 5.4 (Berkeley) 6/1/90";
#endif
-static char rcsid[] = "$OpenBSD: nohup.c,v 1.11 2003/02/18 01:17:44 cloder Exp $";
+static char rcsid[] = "$OpenBSD: nohup.c,v 1.12 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/oldrdist/defs.h b/usr.bin/oldrdist/defs.h
index ed73ab7cdda..72f4d9437ed 100644
--- a/usr.bin/oldrdist/defs.h
+++ b/usr.bin/oldrdist/defs.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: defs.h,v 1.10 2002/02/17 19:42:31 millert Exp $*/
+/* * $OpenBSD: defs.h,v 1.11 2003/06/03 02:56:14 millert Exp $*/
/*
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/oldrdist/docmd.c b/usr.bin/oldrdist/docmd.c
index 8bb3cff3461..a11dfd48129 100644
--- a/usr.bin/oldrdist/docmd.c
+++ b/usr.bin/oldrdist/docmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: docmd.c,v 1.17 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: docmd.c,v 1.18 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)docmd.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: docmd.c,v 1.17 2002/06/12 06:07:16 mpech Exp $";
+static char *rcsid = "$OpenBSD: docmd.c,v 1.18 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/expand.c b/usr.bin/oldrdist/expand.c
index 4e29fbcd3a0..c853acf7580 100644
--- a/usr.bin/oldrdist/expand.c
+++ b/usr.bin/oldrdist/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.10 2003/04/06 17:57:45 ho Exp $ */
+/* $OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)expand.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: expand.c,v 1.10 2003/04/06 17:57:45 ho Exp $";
+static char *rcsid = "$OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/gram.y b/usr.bin/oldrdist/gram.y
index ec61939a4d9..fddac6ec6d6 100644
--- a/usr.bin/oldrdist/gram.y
+++ b/usr.bin/oldrdist/gram.y
@@ -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.
*
@@ -34,7 +30,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)gram.y 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$Id: gram.y,v 1.4 2002/02/16 21:27:50 millert Exp $";
+static char *rcsid = "$Id: gram.y,v 1.5 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/lookup.c b/usr.bin/oldrdist/lookup.c
index c9b0b0ecd7a..536948d55ae 100644
--- a/usr.bin/oldrdist/lookup.c
+++ b/usr.bin/oldrdist/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.7 2002/05/27 03:14:22 deraadt Exp $ */
+/* $OpenBSD: lookup.c,v 1.8 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)lookup.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: lookup.c,v 1.7 2002/05/27 03:14:22 deraadt Exp $";
+static char *rcsid = "$OpenBSD: lookup.c,v 1.8 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/oldrdist/main.c b/usr.bin/oldrdist/main.c
index 2483917c0b1..5fd10be7a4a 100644
--- a/usr.bin/oldrdist/main.c
+++ b/usr.bin/oldrdist/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.17 2003/04/06 04:15:31 millert Exp $ */
+/* $OpenBSD: main.c,v 1.18 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: main.c,v 1.17 2003/04/06 04:15:31 millert Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.18 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <stdarg.h>
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index be998d4e12d..922a18885a5 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: oldrdist.1,v 1.9 2000/11/10 05:10:38 aaron Exp $
+.\" $OpenBSD: oldrdist.1,v 1.10 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/oldrdist/pathnames.h b/usr.bin/oldrdist/pathnames.h
index e741e4be578..d1c032aa915 100644
--- a/usr.bin/oldrdist/pathnames.h
+++ b/usr.bin/oldrdist/pathnames.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: pathnames.h,v 1.4 1996/08/22 20:33:23 millert Exp $*/
+/* * $OpenBSD: pathnames.h,v 1.5 2003/06/03 02:56:14 millert Exp $*/
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/oldrdist/server.c b/usr.bin/oldrdist/server.c
index b835d55f5a5..e1854d1929e 100644
--- a/usr.bin/oldrdist/server.c
+++ b/usr.bin/oldrdist/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.23 2003/06/01 15:53:35 deraadt Exp $ */
+/* $OpenBSD: server.c,v 1.24 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -35,7 +31,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)server.c 8.1 (Berkeley) 6/9/93"; */
-static char *rcsid = "$OpenBSD: server.c,v 1.23 2003/06/01 15:53:35 deraadt Exp $";
+static char *rcsid = "$OpenBSD: server.c,v 1.24 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/wait.h>
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index d903d0e74a8..a5113c65249 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pagesize.1,v 1.5 1999/06/05 01:21:36 aaron Exp $
+.\" $OpenBSD: pagesize.1,v 1.6 2003/06/03 02:56:14 millert Exp $
.\" $NetBSD: pagesize.1,v 1.4 1995/08/31 23:38:50 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/passwd/kpasswd_proto.h b/usr.bin/passwd/kpasswd_proto.h
index e6785a74123..2f89abef87f 100644
--- a/usr.bin/passwd/kpasswd_proto.h
+++ b/usr.bin/passwd/kpasswd_proto.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/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index c3ffa7b612f..ad6c3c4585f 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: local_passwd.c,v 1.28 2003/04/28 01:40:06 deraadt Exp $ */
+/* $OpenBSD: local_passwd.c,v 1.29 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static const char sccsid[] = "from: @(#)local_passwd.c 5.5 (Berkeley) 5/6/91";*/
-static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.28 2003/04/28 01:40:06 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.29 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index f258253bdba..460c24eaf91 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: passwd.1,v 1.23 2003/01/06 08:50:11 deraadt Exp $
+.\" $OpenBSD: passwd.1,v 1.24 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 40c2fef5697..e45273795c2 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: passwd.c,v 1.15 2002/06/28 22:28:17 deraadt Exp $ */
+/* $OpenBSD: passwd.c,v 1.16 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static const char sccsid[] = "from: @(#)passwd.c 5.5 (Berkeley) 7/6/91";*/
-static const char rcsid[] = "$OpenBSD: passwd.c,v 1.15 2002/06/28 22:28:17 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: passwd.c,v 1.16 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index 08a90c8b0fc..af105592f94 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yp_passwd.c,v 1.23 2002/06/28 22:28:17 deraadt Exp $ */
+/* $OpenBSD: yp_passwd.c,v 1.24 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -34,7 +30,7 @@
*/
#ifndef lint
/*static const char sccsid[] = "from: @(#)yp_passwd.c 1.0 2/2/93";*/
-static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.23 2002/06/28 22:28:17 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: yp_passwd.c,v 1.24 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#ifdef YP
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 825fd969322..3a67e305564 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: paste.1,v 1.6 2000/11/09 17:52:29 aaron Exp $
+.\" $OpenBSD: paste.1,v 1.7 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index f9faf8807ee..3e204930573 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paste.c,v 1.10 2002/02/16 21:27:51 millert Exp $ */
+/* $OpenBSD: paste.c,v 1.11 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -44,7 +40,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)paste.c 5.7 (Berkeley) 10/30/90";*/
-static char rcsid[] = "$OpenBSD: paste.c,v 1.10 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: paste.c,v 1.11 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/pr/egetopt.c b/usr.bin/pr/egetopt.c
index 54dd2a2fbc1..8ffceac49ff 100644
--- a/usr.bin/pr/egetopt.c
+++ b/usr.bin/pr/egetopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $ */
+/* $OpenBSD: egetopt.c,v 1.5 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)egetopt.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: egetopt.c,v 1.4 2001/11/19 19:02:15 mpech Exp $";
+static char *rcsid = "$OpenBSD: egetopt.c,v 1.5 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/pr/extern.h b/usr.bin/pr/extern.h
index d42b6a5bf2a..9fbbcd67df6 100644
--- a/usr.bin/pr/extern.h
+++ b/usr.bin/pr/extern.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: extern.h,v 1.4 2002/02/16 21:27:51 millert Exp $*/
+/* * $OpenBSD: extern.h,v 1.5 2003/06/03 02:56:14 millert Exp $*/
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f441247ca8c..ca161e73578 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pr.1,v 1.14 2003/01/15 15:05:35 deraadt Exp $
+.\" $OpenBSD: pr.1,v 1.15 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1991 Keith Muller.
.\" Copyright (c) 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 06bd73bc6cf..2fd22532e9d 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr.c,v 1.15 2002/04/30 01:59:47 deraadt Exp $ */
+/* $OpenBSD: pr.c,v 1.16 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1991 Keith Muller.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)pr.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: pr.c,v 1.15 2002/04/30 01:59:47 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr.c,v 1.16 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index cff4da247d7..0759f16e93d 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: pr.h,v 1.3 1997/04/23 08:08:29 grr Exp $*/
+/* * $OpenBSD: pr.h,v 1.4 2003/06/03 02:56:14 millert Exp $*/
/*-
* Copyright (c) 1991 Keith Muller.
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index 7f6b7be5327..5701f1cb84c 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: printenv.1,v 1.4 2000/03/10 20:17:49 aaron Exp $
+.\" $OpenBSD: printenv.1,v 1.5 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/printenv/printenv.c b/usr.bin/printenv/printenv.c
index b0b50313198..f645533396d 100644
--- a/usr.bin/printenv/printenv.c
+++ b/usr.bin/printenv/printenv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printenv.c,v 1.3 2001/11/19 19:02:15 mpech Exp $ */
+/* $OpenBSD: printenv.c,v 1.4 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)printenv.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printenv.c,v 1.3 2001/11/19 19:02:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: printenv.c,v 1.4 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index ff21f11ff88..2a02824a3e8 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: printf.1,v 1.15 2003/03/18 08:37:35 jmc Exp $
+.\" $OpenBSD: printf.1,v 1.16 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/printf/printf.c b/usr.bin/printf/printf.c
index f7bfd89d6ec..26d9f9a1c1c 100644
--- a/usr.bin/printf/printf.c
+++ b/usr.bin/printf/printf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: printf.c,v 1.8 2003/03/30 20:46:29 deraadt Exp $ */
+/* $OpenBSD: printf.c,v 1.9 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -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.
*
@@ -43,7 +39,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)printf.c 5.9 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$OpenBSD: printf.c,v 1.8 2003/03/30 20:46:29 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.9 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 635648ede2c..56f49ad53d7 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: quota.1,v 1.11 2000/04/15 11:45:55 aaron Exp $
+.\" $OpenBSD: quota.1,v 1.12 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index fb27d4bce58..5170f244a2d 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: quota.c,v 1.21 2003/03/15 19:16:10 deraadt Exp $ */
+/* $OpenBSD: quota.c,v 1.22 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@ static const char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)quota.c 8.1 (Berkeley) 6/6/93";*/
static const char rcsid[] =
-"$OpenBSD: quota.c,v 1.21 2003/03/15 19:16:10 deraadt Exp $";
+"$OpenBSD: quota.c,v 1.22 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index 51a942e292a..ae92943f827 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: build.c,v 1.9 2003/04/04 22:12:09 deraadt Exp $ */
+/* $OpenBSD: build.c,v 1.10 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)build.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$OpenBSD: build.c,v 1.9 2003/04/04 22:12:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: build.c,v 1.10 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/ranlib/extern.h b/usr.bin/ranlib/extern.h
index 2d8455e80e9..1028ac07fbe 100644
--- a/usr.bin/ranlib/extern.h
+++ b/usr.bin/ranlib/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.2 2002/02/16 21:27:51 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.3 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -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/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 33e10200a4f..4ee132929d7 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.6 2001/11/19 19:02:15 mpech Exp $ */
+/* $OpenBSD: misc.c,v 1.7 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)misc.c 5.2 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: misc.c,v 1.6 2001/11/19 19:02:15 mpech Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.7 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/ranlib/pathnames.h b/usr.bin/ranlib/pathnames.h
index 91ee2bcaabd..ca2978c1cf2 100644
--- a/usr.bin/ranlib/pathnames.h
+++ b/usr.bin/ranlib/pathnames.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: pathnames.h,v 1.3 1999/08/27 08:43:22 fgsch Exp $*/
+/* * $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:14 millert Exp $*/
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index 23cf90b19c3..3234e97932e 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ranlib.1,v 1.8 2001/05/01 17:58:03 aaron Exp $
+.\" $OpenBSD: ranlib.1,v 1.9 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1990 Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/ranlib/ranlib.5 b/usr.bin/ranlib/ranlib.5
index fabfce2c305..ca8856b9964 100644
--- a/usr.bin/ranlib/ranlib.5
+++ b/usr.bin/ranlib/ranlib.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ranlib.5,v 1.5 2003/01/21 19:59:09 jmc Exp $
+.\" $OpenBSD: ranlib.5,v 1.6 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 0940ee125e4..bd6193080b2 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ranlib.c,v 1.4 1999/09/21 13:15:43 espie Exp $ */
+/* $OpenBSD: ranlib.c,v 1.5 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -44,7 +40,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)ranlib.c 5.6 (Berkeley) 2/26/91";*/
-static char rcsid[] = "$OpenBSD: ranlib.c,v 1.4 1999/09/21 13:15:43 espie Exp $";
+static char rcsid[] = "$OpenBSD: ranlib.c,v 1.5 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index eb181229778..18ef68de8e5 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: touch.c,v 1.4 2003/04/04 22:12:09 deraadt Exp $ */
+/* $OpenBSD: touch.c,v 1.5 2003/06/03 02:56:14 millert Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -38,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)touch.c 5.3 (Berkeley) 3/12/91";*/
-static char rcsid[] = "$OpenBSD: touch.c,v 1.4 2003/04/04 22:12:09 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.5 2003/06/03 02:56:14 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rdist/child.c b/usr.bin/rdist/child.c
index 59a8f2c8c87..30303e1c365 100644
--- a/usr.bin/rdist/child.c
+++ b/usr.bin/rdist/child.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: child.c,v 1.12 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: child.c,v 1.13 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: child.c,v 1.3 1999/11/01 00:20:55 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: child.c,v 1.12 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: child.c,v 1.13 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/client.c b/usr.bin/rdist/client.c
index 7455d514d76..dbcace8c4be 100644
--- a/usr.bin/rdist/client.c
+++ b/usr.bin/rdist/client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: client.c,v 1.18 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: client.c,v 1.19 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -42,7 +38,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: client.c,v 1.13 1999/11/01 00:22:14 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: client.c,v 1.18 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: client.c,v 1.19 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/common.c b/usr.bin/rdist/common.c
index 4d2e3f69df0..2d1c8a5ebc4 100644
--- a/usr.bin/rdist/common.c
+++ b/usr.bin/rdist/common.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.c,v 1.20 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: common.c,v 1.21 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: common.c,v 1.8 2001/03/12 18:16:36 kim Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: common.c,v 1.20 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: common.c,v 1.21 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/config-data.h b/usr.bin/rdist/config-data.h
index 1ead6b745ac..cc1cee4ac9d 100644
--- a/usr.bin/rdist/config-data.h
+++ b/usr.bin/rdist/config-data.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config-data.h,v 1.5 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: config-data.h,v 1.6 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -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/usr.bin/rdist/config-def.h b/usr.bin/rdist/config-def.h
index 5c6bc052170..b2b9063e7a9 100644
--- a/usr.bin/rdist/config-def.h
+++ b/usr.bin/rdist/config-def.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config-def.h,v 1.5 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: config-def.h,v 1.6 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -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/usr.bin/rdist/config.h b/usr.bin/rdist/config.h
index 271c4f1bbdf..be134e0905e 100644
--- a/usr.bin/rdist/config.h
+++ b/usr.bin/rdist/config.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.h,v 1.7 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: config.h,v 1.8 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -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/usr.bin/rdist/defs.h b/usr.bin/rdist/defs.h
index d6940a253ea..18c4a4f60ad 100644
--- a/usr.bin/rdist/defs.h
+++ b/usr.bin/rdist/defs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: defs.h,v 1.13 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: defs.h,v 1.14 2003/06/03 02:56:14 millert Exp $ */
#ifndef __DEFS_H__
#define __DEFS_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/usr.bin/rdist/distopt.c b/usr.bin/rdist/distopt.c
index 8c29f1bd010..3199598bf31 100644
--- a/usr.bin/rdist/distopt.c
+++ b/usr.bin/rdist/distopt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: distopt.c,v 1.8 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: distopt.c,v 1.9 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: distopt.c,v 1.5 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: distopt.c,v 1.8 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: distopt.c,v 1.9 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index a45d61f89e8..cbb86413c45 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: docmd.c,v 1.16 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: docmd.c,v 1.17 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: docmd.c,v 1.8 2001/03/12 18:42:23 kim Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: docmd.c,v 1.16 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: docmd.c,v 1.17 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index e72f25f7725..6b5617c0a6d 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: expand.c,v 1.10 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: expand.c,v 1.4 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: expand.c,v 1.10 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: expand.c,v 1.11 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/filesys.h b/usr.bin/rdist/filesys.h
index 4192c8810de..59ff2c00cfc 100644
--- a/usr.bin/rdist/filesys.h
+++ b/usr.bin/rdist/filesys.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: filesys.h,v 1.1 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: filesys.h,v 1.2 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index a4200451012..3edeeab9f5c 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -1,5 +1,5 @@
%{
-/* $OpenBSD: gram.y,v 1.7 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: gram.y,v 1.8 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1993 Michael A. Cooper
@@ -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.
*
@@ -43,7 +39,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: gram.y,v 1.3 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: gram.y,v 1.7 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: gram.y,v 1.8 2003/06/03 02:56:14 millert Exp $";
#endif
static char *sccsid __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/isexec.c b/usr.bin/rdist/isexec.c
index 8968ea1722d..8eaf2bb327b 100644
--- a/usr.bin/rdist/isexec.c
+++ b/usr.bin/rdist/isexec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isexec.c,v 1.6 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: isexec.c,v 1.7 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: isexec.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: isexec.c,v 1.6 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: isexec.c,v 1.7 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index 5b959d3b4a2..90d6e25d6ce 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lookup.c,v 1.11 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: lookup.c,v 1.12 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: lookup.c,v 1.4 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: lookup.c,v 1.11 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: lookup.c,v 1.12 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/message.c b/usr.bin/rdist/message.c
index 542b4f48448..ce3d7dbe420 100644
--- a/usr.bin/rdist/message.c
+++ b/usr.bin/rdist/message.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: message.c,v 1.14 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: message.c,v 1.15 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: message.c,v 1.5 1999/11/01 00:21:39 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: message.c,v 1.14 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: message.c,v 1.15 2003/06/03 02:56:14 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/os-openbsd.h b/usr.bin/rdist/os-openbsd.h
index 96c29e9bbd1..d564ec00a10 100644
--- a/usr.bin/rdist/os-openbsd.h
+++ b/usr.bin/rdist/os-openbsd.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.
*
@@ -33,7 +29,7 @@
*/
/*
- * $OpenBSD: os-openbsd.h,v 1.12 2003/05/14 01:34:35 millert Exp $
+ * $OpenBSD: os-openbsd.h,v 1.13 2003/06/03 02:56:14 millert Exp $
*/
/*
diff --git a/usr.bin/rdist/pathnames.h b/usr.bin/rdist/pathnames.h
index 3546cdd36ab..50475edf1b1 100644
--- a/usr.bin/rdist/pathnames.h
+++ b/usr.bin/rdist/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.7 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.8 2003/06/03 02:56:14 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -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/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index b037a22a84e..09248d59acf 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rdist.1,v 1.17 2003/05/14 01:34:35 millert Exp $
+.\" $OpenBSD: rdist.1,v 1.18 2003/06/03 02:56:14 millert Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index 40ea1c09e1d..caa21241195 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdist.c,v 1.16 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: rdist.c,v 1.17 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -42,7 +38,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: rdist.c,v 1.6 2001/03/12 18:16:36 kim Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: rdist.c,v 1.16 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: rdist.c,v 1.17 2003/06/03 02:56:15 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdist/version.h b/usr.bin/rdist/version.h
index cda63122476..43e11c1bd99 100644
--- a/usr.bin/rdist/version.h
+++ b/usr.bin/rdist/version.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: version.h,v 1.6 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: version.h,v 1.7 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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/usr.bin/rdistd/filesys-os.c b/usr.bin/rdistd/filesys-os.c
index cef5e5e1d0e..e278f1681f3 100644
--- a/usr.bin/rdistd/filesys-os.c
+++ b/usr.bin/rdistd/filesys-os.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filesys-os.c,v 1.8 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: filesys-os.c,v 1.5 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: filesys-os.c,v 1.8 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: filesys-os.c,v 1.9 2003/06/03 02:56:15 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/filesys.c b/usr.bin/rdistd/filesys.c
index 74d3739d2af..a76448486a5 100644
--- a/usr.bin/rdistd/filesys.c
+++ b/usr.bin/rdistd/filesys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: filesys.c,v 1.9 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: filesys.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: filesys.c,v 1.9 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: filesys.c,v 1.10 2003/06/03 02:56:15 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/rdistd.1 b/usr.bin/rdistd/rdistd.1
index 00c5f1b1b6a..ec923d1f6e5 100644
--- a/usr.bin/rdistd/rdistd.1
+++ b/usr.bin/rdistd/rdistd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rdistd.1,v 1.6 2003/04/21 01:12:02 millert Exp $
+.\" $OpenBSD: rdistd.1,v 1.7 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rdistd/rdistd.c b/usr.bin/rdistd/rdistd.c
index d582a7d7e0a..173197ea3e9 100644
--- a/usr.bin/rdistd/rdistd.c
+++ b/usr.bin/rdistd/rdistd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rdistd.c,v 1.5 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: rdistd.c,v 1.6 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: rdistd.c,v 1.2 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: rdistd.c,v 1.5 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: rdistd.c,v 1.6 2003/06/03 02:56:15 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/rdistd/server.c b/usr.bin/rdistd/server.c
index 9454f590562..365753cbc36 100644
--- a/usr.bin/rdistd/server.c
+++ b/usr.bin/rdistd/server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server.c,v 1.14 2003/05/14 01:34:35 millert Exp $ */
+/* $OpenBSD: server.c,v 1.15 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 Regents of the University of California.
@@ -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.
*
@@ -40,7 +36,7 @@ static char RCSid[] __attribute__((__unused__)) =
"$From: server.c,v 1.10 1999/08/04 15:57:33 christos Exp $";
#else
static char RCSid[] __attribute__((__unused__)) =
-"$OpenBSD: server.c,v 1.14 2003/05/14 01:34:35 millert Exp $";
+"$OpenBSD: server.c,v 1.15 2003/06/03 02:56:15 millert Exp $";
#endif
static char sccsid[] __attribute__((__unused__)) =
diff --git a/usr.bin/readlink/readlink.1 b/usr.bin/readlink/readlink.1
index 6d04a0390a4..fa045144ab1 100644
--- a/usr.bin/readlink/readlink.1
+++ b/usr.bin/readlink/readlink.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: readlink.1,v 1.7 2000/11/09 17:52:31 aaron Exp $
+.\" $OpenBSD: readlink.1,v 1.8 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index ba5e96e9e00..a8d8d4d9456 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: renice.8,v 1.13 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: renice.8,v 1.14 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index 42c71d8373d..7323460d7fc 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: renice.c,v 1.8 2002/02/16 21:27:51 millert Exp $ */
+/* $OpenBSD: renice.c,v 1.9 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983, 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)renice.c 8.1 (Berkeley) 6/9/93";
#else
-static char rcsid[] = "$OpenBSD: renice.c,v 1.8 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: renice.c,v 1.9 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rev/rev.1 b/usr.bin/rev/rev.1
index 9d2ee0b5766..d02fc483279 100644
--- a/usr.bin/rev/rev.1
+++ b/usr.bin/rev/rev.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rev.1,v 1.4 2000/03/06 13:02:46 aaron Exp $
+.\" $OpenBSD: rev.1,v 1.5 2003/06/03 02:56:15 millert Exp $
.\" $NetBSD: rev.1,v 1.3 1995/09/28 08:49:39 tls Exp $
.\"
.\" Copyright (c) 1985, 1992, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/rev/rev.c b/usr.bin/rev/rev.c
index fff4a4cb861..30c797dc344 100644
--- a/usr.bin/rev/rev.c
+++ b/usr.bin/rev/rev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rev.c,v 1.5 2002/02/16 21:27:51 millert Exp $ */
+/* $OpenBSD: rev.c,v 1.6 2003/06/03 02:56:15 millert Exp $ */
/* $NetBSD: rev.c,v 1.5 1995/09/28 08:49:40 tls Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)rev.c 8.3 (Berkeley) 5/4/95";
#else
-static char rcsid[] = "$OpenBSD: rev.c,v 1.5 2002/02/16 21:27:51 millert Exp $";
+static char rcsid[] = "$OpenBSD: rev.c,v 1.6 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rs/rs.1 b/usr.bin/rs/rs.1
index 54f2c46ef38..4cd8fcc5821 100644
--- a/usr.bin/rs/rs.1
+++ b/usr.bin/rs/rs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rs.1,v 1.7 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: rs.1,v 1.8 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index 16ed7a2e7b9..b207de5c398 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rs.c,v 1.7 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: rs.c,v 1.8 2003/06/03 02:56:15 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/rsh/des_rw.c b/usr.bin/rsh/des_rw.c
index dcb3b12a17b..654a74b646e 100644
--- a/usr.bin/rsh/des_rw.c
+++ b/usr.bin/rsh/des_rw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_rw.c,v 1.3 2002/07/15 22:54:26 deraadt Exp $ */
+/* $OpenBSD: des_rw.c,v 1.4 2003/06/03 02:56:15 millert Exp $ */
/* $NetBSD: des_rw.c,v 1.2 1995/03/21 07:58:30 cgd Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)des_rw.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: des_rw.c,v 1.3 2002/07/15 22:54:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: des_rw.c,v 1.4 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rsh/kcmd.c b/usr.bin/rsh/kcmd.c
index a6db09af20e..19c572dc685 100644
--- a/usr.bin/rsh/kcmd.c
+++ b/usr.bin/rsh/kcmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kcmd.c,v 1.6 2003/04/15 08:05:33 deraadt Exp $ */
+/* $OpenBSD: kcmd.c,v 1.7 2003/06/03 02:56:15 millert Exp $ */
/* $NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $ */
/*
@@ -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.
*
@@ -39,7 +35,7 @@
static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88";
static char sccsid[] = "@(#)kcmd.c 8.2 (Berkeley) 8/19/93";
#else
-static char rcsid[] = "$OpenBSD: kcmd.c,v 1.6 2003/04/15 08:05:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: kcmd.c,v 1.7 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rsh/krcmd.c b/usr.bin/rsh/krcmd.c
index f655a455e18..ecd12890dff 100644
--- a/usr.bin/rsh/krcmd.c
+++ b/usr.bin/rsh/krcmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: krcmd.c,v 1.2 2002/07/15 22:54:26 deraadt Exp $ */
+/* $OpenBSD: krcmd.c,v 1.3 2003/06/03 02:56:15 millert Exp $ */
/* $NetBSD: krcmd.c,v 1.2 1995/03/21 07:58:36 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)krcmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: krcmd.c,v 1.2 2002/07/15 22:54:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: krcmd.c,v 1.3 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/rsh/pathnames.h b/usr.bin/rsh/pathnames.h
index e23c6152dec..40da4a9249c 100644
--- a/usr.bin/rsh/pathnames.h
+++ b/usr.bin/rsh/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 2002/05/06 22:50:03 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1989 The Regents of the University of California.
@@ -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/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 2f5e76fbe82..43f6efb7fd1 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rsh.1,v 1.12 2002/11/14 02:57:28 deraadt Exp $
+.\" $OpenBSD: rsh.1,v 1.13 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index af0a25ae722..f714ea86963 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsh.c,v 1.31 2003/04/08 22:11:56 millert Exp $ */
+/* $OpenBSD: rsh.c,v 1.32 2003/06/03 02:56:15 millert Exp $ */
/*-
* Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)rsh.c 5.24 (Berkeley) 7/1/91";*/
-static char rcsid[] = "$OpenBSD: rsh.c,v 1.31 2003/04/08 22:11:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: rsh.c,v 1.32 2003/06/03 02:56:15 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 346474dd4af..26aa444b1ea 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rup.1,v 1.9 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: rup.1,v 1.10 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 670ef4d3820..b21e142fa42 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ruptime.1,v 1.8 2000/03/10 20:17:51 aaron Exp $
+.\" $OpenBSD: ruptime.1,v 1.9 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 43ca8696f2b..18e78c08813 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ruptime.c,v 1.8 2002/05/27 03:14:22 deraadt Exp $ */
+/* $OpenBSD: ruptime.c,v 1.9 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)ruptime.c 5.8 (Berkeley) 7/21/90";*/
-static char rcsid[] = "$OpenBSD: ruptime.c,v 1.8 2002/05/27 03:14:22 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ruptime.c,v 1.9 2003/06/03 02:56:15 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 709c483ab63..2019f06cfc6 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rusers.1,v 1.12 2001/11/07 00:02:58 millert Exp $
+.\" $OpenBSD: rusers.1,v 1.13 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index d14bdac4e22..3153e0b7b46 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rwall.1,v 1.6 2000/04/15 02:15:12 aaron Exp $
+.\" $OpenBSD: rwall.1,v 1.7 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index e7f6ca9a57d..e1b7e57a188 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwall.c,v 1.6 2001/11/05 13:11:07 deraadt Exp $ */
+/* $OpenBSD: rwall.c,v 1.7 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -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.
*
@@ -42,7 +38,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$OpenBSD: rwall.c,v 1.6 2001/11/05 13:11:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rwall.c,v 1.7 2003/06/03 02:56:15 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 377e6541d0f..1203b0351c6 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rwho.1,v 1.6 2001/09/27 18:38:58 millert Exp $
+.\" $OpenBSD: rwho.1,v 1.7 2003/06/03 02:56:15 millert Exp $
.\"
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index 727cf523c9b..ba6b3a22599 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rwho.c,v 1.14 2003/04/30 21:30:38 vincent Exp $ */
+/* $OpenBSD: rwho.c,v 1.15 2003/06/03 02:56:15 millert Exp $ */
/*
* Copyright (c) 1983 The Regents of the University of California.
@@ -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.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "from: @(#)rwho.c 5.5 (Berkeley) 6/1/90";
#else
-static const char rcsid[] = "$OpenBSD: rwho.c,v 1.14 2003/04/30 21:30:38 vincent Exp $";
+static const char rcsid[] = "$OpenBSD: rwho.c,v 1.15 2003/06/03 02:56:15 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index ca0bbc7302e..fb7e51a4508 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: script.1,v 1.9 2001/05/01 17:58:04 aaron Exp $
+.\" $OpenBSD: script.1,v 1.10 2003/06/03 02:56:15 millert Exp $
.\" $NetBSD: script.1,v 1.3 1994/12/21 08:55:41 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 55fa8308566..e94efad6029 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: script.c,v 1.17 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: script.c,v 1.18 2003/06/03 02:56:15 millert Exp $ */
/* $NetBSD: script.c,v 1.3 1994/12/21 08:55:43 jtc Exp $ */
/*
@@ -38,11 +38,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.
*
@@ -69,7 +65,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)script.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: script.c,v 1.17 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: script.c,v 1.18 2003/06/03 02:56:15 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/TEST/sed.test b/usr.bin/sed/TEST/sed.test
index d1c12392c66..d3c92c6e6d7 100644
--- a/usr.bin/sed/TEST/sed.test
+++ b/usr.bin/sed/TEST/sed.test
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $OpenBSD: sed.test,v 1.2 1996/06/26 05:39:11 deraadt Exp $
+# $OpenBSD: sed.test,v 1.3 2003/06/03 02:56:16 millert Exp $
#
# Copyright (c) 1992 Diomidis Spinellis.
# Copyright (c) 1992, 1993
@@ -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/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index eba74937ced..c32191fb097 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compile.c,v 1.13 2002/07/09 21:31:03 deraadt Exp $ */
+/* $OpenBSD: compile.c,v 1.14 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)compile.c 8.2 (Berkeley) 4/28/95"; */
-static char *rcsid = "$OpenBSD: compile.c,v 1.13 2002/07/09 21:31:03 deraadt Exp $";
+static char *rcsid = "$OpenBSD: compile.c,v 1.14 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/defs.h b/usr.bin/sed/defs.h
index 1bb67b30694..a8259dcb0f6 100644
--- a/usr.bin/sed/defs.h
+++ b/usr.bin/sed/defs.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: defs.h,v 1.2 1996/06/26 05:39:05 deraadt Exp $*/
+/* * $OpenBSD: defs.h,v 1.3 2003/06/03 02:56:16 millert Exp $*/
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sed/extern.h b/usr.bin/sed/extern.h
index a1c4b0f4c5d..283b443baa4 100644
--- a/usr.bin/sed/extern.h
+++ b/usr.bin/sed/extern.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:52 millert Exp $*/
+/* * $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:16 millert Exp $*/
/*-
* Copyright (c) 1992 Diomidis Spinellis.
* Copyright (c) 1992, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index ffc7b769f29..09bc212eba3 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.7 2003/03/13 15:47:11 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.8 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -45,7 +41,7 @@ static char copyright[] =
#ifndef lint
/* from: static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 1/3/94"; */
-static char *rcsid = "$OpenBSD: main.c,v 1.7 2003/03/13 15:47:11 deraadt Exp $";
+static char *rcsid = "$OpenBSD: main.c,v 1.8 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index c23a66c05b5..2d8a82af432 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 2002/02/19 19:39:39 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: misc.c,v 1.4 2002/02/19 19:39:39 millert Exp $";
+static char *rcsid = "$OpenBSD: misc.c,v 1.5 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index 4cdbf0cefef..c7c25a51626 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: process.c,v 1.9 2002/06/11 06:16:36 jsyn Exp $ */
+/* $OpenBSD: process.c,v 1.10 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -39,7 +35,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)process.c 8.1 (Berkeley) 6/6/93"; */
-static char *rcsid = "$OpenBSD: process.c,v 1.9 2002/06/11 06:16:36 jsyn Exp $";
+static char *rcsid = "$OpenBSD: process.c,v 1.10 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index a069620d785..d8853164ab7 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sed.1,v 1.16 2000/11/09 17:52:37 aaron Exp $
+.\" $OpenBSD: sed.1,v 1.17 2003/06/03 02:56:16 millert Exp $
.\"
.\" Copyright (c) 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 6b1e2ff1122..6d59ece9c76 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: shar.1,v 1.7 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: shar.1,v 1.8 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/shar/shar.sh b/usr.bin/shar/shar.sh
index 759ac2973ae..5df5ba2e670 100644
--- a/usr.bin/shar/shar.sh
+++ b/usr.bin/shar/shar.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: shar.sh,v 1.2 1996/06/26 05:39:14 deraadt Exp $
+# $OpenBSD: shar.sh,v 1.3 2003/06/03 02:56:16 millert Exp $
# $NetBSD: shar.sh,v 1.2 1994/12/21 08:42:04 jtc Exp $
#
# Copyright (c) 1990, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index a1429fddf2f..285f4f76692 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: showmount.8,v 1.9 2000/03/23 21:39:54 aaron Exp $
+.\" $OpenBSD: showmount.8,v 1.10 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: showmount.8,v 1.5 1995/08/31 22:26:07 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index d2a3aef0123..ffe984cea40 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: showmount.c,v 1.11 2003/04/30 21:27:23 vincent Exp $ */
+/* $OpenBSD: showmount.c,v 1.12 2003/06/03 02:56:16 millert Exp $ */
/* $NetBSD: showmount.c,v 1.7 1996/05/01 18:14:10 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)showmount.c 8.3 (Berkeley) 3/29/95";
#endif
-static char rcsid[] = "$OpenBSD: showmount.c,v 1.11 2003/04/30 21:27:23 vincent Exp $";
+static char rcsid[] = "$OpenBSD: showmount.c,v 1.12 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index e15112dc56b..5e62f5f3503 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: size.1,v 1.9 2001/05/30 16:58:39 smart Exp $
+.\" $OpenBSD: size.1,v 1.10 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: size.1,v 1.6 1996/01/14 23:07:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -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/usr.bin/size/size.c b/usr.bin/size/size.c
index 95bd572f472..be5505dadbf 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: size.c,v 1.17 2003/04/15 15:54:07 deraadt Exp $ */
+/* $OpenBSD: size.c,v 1.18 2003/06/03 02:56:16 millert Exp $ */
/* $NetBSD: size.c,v 1.7 1996/01/14 23:07:12 pk Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)size.c 8.2 (Berkeley) 12/9/93";
#endif
-static char rcsid[] = "$OpenBSD: size.c,v 1.17 2003/04/15 15:54:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: size.c,v 1.18 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index efe08dec471..3b6d5117e44 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: soelim.1,v 1.5 2000/03/11 21:40:02 aaron Exp $
+.\" $OpenBSD: soelim.1,v 1.6 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: soelim.1,v 1.3 1994/12/21 08:11:24 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 1b41da0c6ae..39d72ee9656 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: soelim.c,v 1.5 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: soelim.c,v 1.6 2003/06/03 02:56:16 millert Exp $ */
/* $NetBSD: soelim.c,v 1.3 1994/12/21 08:11:26 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)soelim.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: soelim.c,v 1.5 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: soelim.c,v 1.6 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/sort/append.c b/usr.bin/sort/append.c
index 18c204a0c28..f191d2bd05f 100644
--- a/usr.bin/sort/append.c
+++ b/usr.bin/sort/append.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: append.c,v 1.7 2001/03/20 19:36:27 millert Exp $ */
+/* $OpenBSD: append.c,v 1.8 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)append.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: append.c,v 1.7 2001/03/20 19:36:27 millert Exp $";
+static char rcsid[] = "$OpenBSD: append.c,v 1.8 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/extern.h b/usr.bin/sort/extern.h
index f9b5c3d1031..63d7bb83886 100644
--- a/usr.bin/sort/extern.h
+++ b/usr.bin/sort/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.5 2002/02/17 19:42:31 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.6 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/fields.c b/usr.bin/sort/fields.c
index b48affe434a..8bab1ef118b 100644
--- a/usr.bin/sort/fields.c
+++ b/usr.bin/sort/fields.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fields.c,v 1.6 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: fields.c,v 1.7 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)fields.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: fields.c,v 1.6 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: fields.c,v 1.7 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/files.c b/usr.bin/sort/files.c
index 6835782101f..e4c50b0ba16 100644
--- a/usr.bin/sort/files.c
+++ b/usr.bin/sort/files.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: files.c,v 1.8 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: files.c,v 1.9 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)files.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: files.c,v 1.8 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: files.c,v 1.9 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/fsort.c b/usr.bin/sort/fsort.c
index 6036f38fdbb..a377025a729 100644
--- a/usr.bin/sort/fsort.c
+++ b/usr.bin/sort/fsort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsort.c,v 1.8 2001/02/04 21:27:00 ericj Exp $ */
+/* $OpenBSD: fsort.c,v 1.9 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)fsort.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: fsort.c,v 1.8 2001/02/04 21:27:00 ericj Exp $";
+static char rcsid[] = "$OpenBSD: fsort.c,v 1.9 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/fsort.h b/usr.bin/sort/fsort.h
index 61b8563962e..2881cdf2f25 100644
--- a/usr.bin/sort/fsort.h
+++ b/usr.bin/sort/fsort.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsort.h,v 1.3 2001/02/04 21:27:01 ericj Exp $ */
+/* $OpenBSD: fsort.h,v 1.4 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/init.c b/usr.bin/sort/init.c
index 7ec0050c545..23611f673f8 100644
--- a/usr.bin/sort/init.c
+++ b/usr.bin/sort/init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init.c,v 1.4 2003/04/06 18:39:11 millert Exp $ */
+/* $OpenBSD: init.c,v 1.5 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: init.c,v 1.4 2003/04/06 18:39:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.5 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/msort.c b/usr.bin/sort/msort.c
index ddaa8e52d14..7a38582e03d 100644
--- a/usr.bin/sort/msort.c
+++ b/usr.bin/sort/msort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msort.c,v 1.11 2002/02/16 21:27:52 millert Exp $ */
+/* $OpenBSD: msort.c,v 1.12 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)msort.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: msort.c,v 1.11 2002/02/16 21:27:52 millert Exp $";
+static char rcsid[] = "$OpenBSD: msort.c,v 1.12 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/pathnames.h b/usr.bin/sort/pathnames.h
index 1a2ae6b6c56..717b9bdd01d 100644
--- a/usr.bin/sort/pathnames.h
+++ b/usr.bin/sort/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.1 1997/01/20 19:39:54 millert Exp $ */
+/* $OpenBSD: pathnames.h,v 1.2 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1
index 64b04b4c39d..203e4993da0 100644
--- a/usr.bin/sort/sort.1
+++ b/usr.bin/sort/sort.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sort.1,v 1.19 2003/03/31 18:28:50 tdeval Exp $
+.\" $OpenBSD: sort.1,v 1.20 2003/06/03 02:56:16 millert Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c
index 77fb4b15deb..50a74325c84 100644
--- a/usr.bin/sort/sort.c
+++ b/usr.bin/sort/sort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sort.c,v 1.19 2003/03/30 23:11:41 millert Exp $ */
+/* $OpenBSD: sort.c,v 1.20 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -46,7 +42,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)sort.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: sort.c,v 1.19 2003/03/30 23:11:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: sort.c,v 1.20 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sort/sort.h b/usr.bin/sort/sort.h
index ff450e4f136..7664ce627a6 100644
--- a/usr.bin/sort/sort.h
+++ b/usr.bin/sort/sort.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sort.h,v 1.5 2001/02/04 21:27:01 ericj Exp $ */
+/* $OpenBSD: sort.h,v 1.6 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/sort/tmp.c b/usr.bin/sort/tmp.c
index 4a8f22e3a10..fa581af1ab6 100644
--- a/usr.bin/sort/tmp.c
+++ b/usr.bin/sort/tmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmp.c,v 1.4 2003/03/30 23:11:41 millert Exp $ */
+/* $OpenBSD: tmp.c,v 1.5 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)tmp.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tmp.c,v 1.4 2003/03/30 23:11:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: tmp.c,v 1.5 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/spell/look.c b/usr.bin/spell/look.c
index ddf14bc3ca9..8c9678bde34 100644
--- a/usr.bin/spell/look.c
+++ b/usr.bin/spell/look.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look.c,v 1.2 2002/06/03 17:53:32 kjell Exp $ */
+/* $OpenBSD: look.c,v 1.3 2003/06/03 02:56:16 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static const char sccsid[] = "@(#)look.c 8.2 (Berkeley) 5/4/95";
#endif
-static const char rcsid[] = "$OpenBSD: look.c,v 1.2 2002/06/03 17:53:32 kjell Exp $";
+static const char rcsid[] = "$OpenBSD: look.c,v 1.3 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/spell/spellprog.c b/usr.bin/spell/spellprog.c
index 1d569791072..70aa381f9fb 100644
--- a/usr.bin/spell/spellprog.c
+++ b/usr.bin/spell/spellprog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spellprog.c,v 1.3 2002/06/03 17:53:32 kjell Exp $ */
+/* $OpenBSD: spellprog.c,v 1.4 2003/06/03 02:56:16 millert Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -79,7 +75,7 @@ static const char copyright[] =
static const char sccsid[] = "@(#)spell.c 8.1 (Berkeley) 6/6/93";
#else
#endif
-static const char rcsid[] = "$OpenBSD: spellprog.c,v 1.3 2002/06/03 17:53:32 kjell Exp $";
+static const char rcsid[] = "$OpenBSD: spellprog.c,v 1.4 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index c0b1003cbce..e9b33642c6a 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: split.1,v 1.8 2002/01/24 20:33:46 mickey Exp $
+.\" $OpenBSD: split.1,v 1.9 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: split.1,v 1.5 1994/12/21 08:20:35 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
@@ -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/usr.bin/split/split.c b/usr.bin/split/split.c
index bc8be83fa95..41e428c622e 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: split.c,v 1.7 2002/12/08 16:50:07 millert Exp $ */
+/* $OpenBSD: split.c,v 1.8 2003/06/03 02:56:16 millert Exp $ */
/* $NetBSD: split.c,v 1.5 1995/08/31 22:22:05 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
#else
-static char rcsid[] = "$OpenBSD: split.c,v 1.7 2002/12/08 16:50:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: split.c,v 1.8 2003/06/03 02:56:16 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index bc69309f971..a1892e1b939 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -52,11 +52,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.
*
@@ -75,7 +71,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.102 2003/03/05 22:33:43 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.103 2003/06/03 02:56:16 millert Exp $");
#include "xmalloc.h"
#include "atomicio.h"
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 56219a42087..16b5b610a22 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strings.1,v 1.7 2000/06/19 18:40:31 aaron Exp $
+.\" $OpenBSD: strings.1,v 1.8 2003/06/03 02:56:16 millert Exp $
.\" $NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 89882bc1cd0..ee03275ef52 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strings.c,v 1.9 2002/12/08 16:50:07 millert Exp $ */
+/* $OpenBSD: strings.c,v 1.10 2003/06/03 02:56:16 millert Exp $ */
/* $NetBSD: strings.c,v 1.7 1995/02/15 15:49:19 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)strings.c 8.2 (Berkeley) 1/28/94";
#endif
-static char rcsid[] = "$OpenBSD: strings.c,v 1.9 2002/12/08 16:50:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: strings.c,v 1.10 2003/06/03 02:56:16 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index 87da927c98b..f98a14b887d 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strip.1,v 1.4 2000/09/26 16:12:42 aaron Exp $
+.\" $OpenBSD: strip.1,v 1.5 2003/06/03 02:56:17 millert Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index ea2d40ba0b3..7f0d8beae66 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strip.c,v 1.18 2002/08/21 15:53:12 espie Exp $ */
+/* $OpenBSD: strip.c,v 1.19 2003/06/03 02:56:17 millert Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)strip.c 5.8 (Berkeley) 11/6/91";*/
-static char rcsid[] = "$OpenBSD: strip.c,v 1.18 2002/08/21 15:53:12 espie Exp $";
+static char rcsid[] = "$OpenBSD: strip.c,v 1.19 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 7a80fc04a23..c410ddecd07 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: su.1,v 1.17 2002/11/14 02:57:28 deraadt Exp $
+.\" $OpenBSD: su.1,v 1.18 2003/06/03 02:56:17 millert Exp $
.\"
.\" Copyright (c) 1988, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/su/su.c b/usr.bin/su/su.c
index 9f8a4072c9b..7b9d519872d 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: su.c,v 1.51 2002/12/17 19:52:02 millert Exp $ */
+/* $OpenBSD: su.c,v 1.52 2003/06/03 02:56:17 millert Exp $ */
/*
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "from: @(#)su.c 5.26 (Berkeley) 7/6/91";
#else
-static const char rcsid[] = "$OpenBSD: su.c,v 1.51 2002/12/17 19:52:02 millert Exp $";
+static const char rcsid[] = "$OpenBSD: su.c,v 1.52 2003/06/03 02:56:17 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/sup/src/snprintf.c b/usr.bin/sup/src/snprintf.c
index 768c15796bd..79efc01371e 100644
--- a/usr.bin/sup/src/snprintf.c
+++ b/usr.bin/sup/src/snprintf.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.
*
@@ -34,7 +30,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: snprintf.c,v 1.2 2002/02/19 19:39:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: snprintf.c,v 1.3 2003/06/03 02:56:17 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
diff --git a/usr.bin/sup/src/unvis.c b/usr.bin/sup/src/unvis.c
index ea1550dea4c..dd128490c7f 100644
--- a/usr.bin/sup/src/unvis.c
+++ b/usr.bin/sup/src/unvis.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.
*
@@ -32,7 +28,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.3 2002/02/19 19:39:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: unvis.c,v 1.4 2003/06/03 02:56:17 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/usr.bin/sup/src/vis.c b/usr.bin/sup/src/vis.c
index c4d25c75c26..69e21eeb1e8 100644
--- a/usr.bin/sup/src/vis.c
+++ b/usr.bin/sup/src/vis.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.
*
@@ -32,7 +28,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: vis.c,v 1.3 2002/02/19 19:39:39 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.4 2003/06/03 02:56:17 millert Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/types.h>
diff --git a/usr.bin/sup/src/vis.h b/usr.bin/sup/src/vis.h
index 69fba380491..7bf0f3d713d 100644
--- a/usr.bin/sup/src/vis.h
+++ b/usr.bin/sup/src/vis.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vis.h,v 1.3 2002/02/19 19:39:39 millert Exp $ */
+/* $OpenBSD: vis.h,v 1.4 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $ */
/*-
@@ -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/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index 9f3934b0215..c31435117ea 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: cmds.c,v 1.12 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: cmds.c,v 1.4 1996/05/10 23:16:32 thorpej Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$OpenBSD: cmds.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmds.c,v 1.12 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index fcd9c868d5e..22e2874f79a 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.5 2001/12/07 09:18:08 deraadt Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.6 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: cmdtab.c,v 1.2 1995/01/20 08:51:51 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.5 2001/12/07 09:18:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: cmdtab.c,v 1.6 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/systat/disks.c b/usr.bin/systat/disks.c
index b1ed2a65ee8..06aa92475b6 100644
--- a/usr.bin/systat/disks.c
+++ b/usr.bin/systat/disks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disks.c,v 1.13 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: disks.c,v 1.14 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: disks.c,v 1.4 1996/05/10 23:16:33 thorpej Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: disks.c,v 1.13 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disks.c,v 1.14 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <string.h>
diff --git a/usr.bin/systat/extern.h b/usr.bin/systat/extern.h
index 9949bd728ad..5965752ccb5 100644
--- a/usr.bin/systat/extern.h
+++ b/usr.bin/systat/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.10 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.11 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1996/05/10 23:16:34 thorpej Exp $ */
/*-
@@ -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/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c
index da202eb19b8..d006adde79a 100644
--- a/usr.bin/systat/fetch.c
+++ b/usr.bin/systat/fetch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fetch.c,v 1.6 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: fetch.c,v 1.7 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: fetch.c,v 1.2 1995/01/20 08:51:56 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: fetch.c,v 1.6 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: fetch.c,v 1.7 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index 739a525cb35..e54871e5386 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iostat.c,v 1.20 2003/02/02 18:20:41 henning Exp $ */
+/* $OpenBSD: iostat.c,v 1.21 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: iostat.c,v 1.5 1996/05/10 23:16:35 thorpej Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: iostat.c,v 1.20 2003/02/02 18:20:41 henning Exp $";
+static char rcsid[] = "$OpenBSD: iostat.c,v 1.21 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c
index fbddd3f3bcd..724337a315e 100644
--- a/usr.bin/systat/keyboard.c
+++ b/usr.bin/systat/keyboard.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keyboard.c,v 1.12 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: keyboard.c,v 1.13 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: keyboard.c,v 1.2 1995/01/20 08:51:59 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: keyboard.c,v 1.12 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: keyboard.c,v 1.13 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 1a61014e6e4..bda368a4b09 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.25 2002/08/04 00:50:42 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.26 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: main.c,v 1.8 1996/05/10 23:16:36 thorpej Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: main.c,v 1.25 2002/08/04 00:50:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.26 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index c1d386e638f..89b794553b0 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mbufs.c,v 1.12 2002/06/19 08:45:52 deraadt Exp $ */
+/* $OpenBSD: mbufs.c,v 1.13 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: mbufs.c,v 1.2 1995/01/20 08:52:02 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: mbufs.c,v 1.12 2002/06/19 08:45:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mbufs.c,v 1.13 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 83034efffea..032c4e4d689 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcmds.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $ */
+/* $OpenBSD: netcmds.c,v 1.12 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: netcmds.c,v 1.4 1995/05/21 17:14:38 mycroft Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: netcmds.c,v 1.11 2002/06/18 00:46:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: netcmds.c,v 1.12 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 904383e530e..699edb642db 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netstat.c,v 1.23 2002/06/19 08:45:52 deraadt Exp $ */
+/* $OpenBSD: netstat.c,v 1.24 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: netstat.c,v 1.23 2002/06/19 08:45:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: netstat.c,v 1.24 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 7550f680be6..4c47051e9f2 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pigs.c,v 1.14 2002/06/18 00:46:48 deraadt Exp $ */
+/* $OpenBSD: pigs.c,v 1.15 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)pigs.c 8.2 (Berkeley) 9/23/93";
#endif
-static char rcsid[] = "$OpenBSD: pigs.c,v 1.14 2002/06/18 00:46:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: pigs.c,v 1.15 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index a6bab38952f..1aaa5a9539f 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swap.c,v 1.16 2002/06/18 00:46:48 deraadt Exp $ */
+/* $OpenBSD: swap.c,v 1.17 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: swap.c,v 1.9 1998/12/26 07:05:08 marc Exp $ */
/*-
@@ -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.
*
@@ -39,7 +35,7 @@
#if 0
static char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95";
#endif
-static char rcsid[] = "$OpenBSD: swap.c,v 1.16 2002/06/18 00:46:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: swap.c,v 1.17 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index d6c9e8875a8..4008ecd07b2 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: systat.1,v 1.27 2003/04/15 19:57:10 jmc Exp $
+.\" $OpenBSD: systat.1,v 1.28 2003/06/03 02:56:17 millert Exp $
.\" $NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index 597b756c16d..0175357cde4 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: systat.h,v 1.7 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: systat.h,v 1.8 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: systat.h,v 1.2 1995/01/20 08:52:14 jtc Exp $ */
/*-
@@ -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/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index 6fcdb1c4369..f57a6ac82b8 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmstat.c,v 1.40 2003/04/14 04:45:45 deraadt Exp $ */
+/* $OpenBSD: vmstat.c,v 1.41 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94";
#endif
-static char rcsid[] = "$OpenBSD: vmstat.c,v 1.40 2003/04/14 04:45:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vmstat.c,v 1.41 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tail/extern.h b/usr.bin/tail/extern.h
index bdd043380cd..5397118d37d 100644
--- a/usr.bin/tail/extern.h
+++ b/usr.bin/tail/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.7 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.8 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: extern.h,v 1.3 1994/11/23 07:42:00 jtc Exp $ */
/*-
@@ -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/usr.bin/tail/forward.c b/usr.bin/tail/forward.c
index 3dfd18c0792..8e02abdf5b4 100644
--- a/usr.bin/tail/forward.c
+++ b/usr.bin/tail/forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: forward.c,v 1.14 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: forward.c,v 1.15 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: forward.c,v 1.7 1996/02/13 16:49:10 ghudson Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: forward.c,v 1.14 2002/02/16 21:27:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: forward.c,v 1.15 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c
index f997a0da727..0650d590cb8 100644
--- a/usr.bin/tail/misc.c
+++ b/usr.bin/tail/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.4 1999/02/03 02:09:30 millert Exp $ */
+/* $OpenBSD: misc.c,v 1.5 2003/06/03 02:56:17 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: misc.c,v 1.4 1999/02/03 02:09:30 millert Exp $";
+static char rcsid[] = "$OpenBSD: misc.c,v 1.5 2003/06/03 02:56:17 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c
index 8b8c7b0b56d..6af902da653 100644
--- a/usr.bin/tail/read.c
+++ b/usr.bin/tail/read.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: read.c,v 1.6 2001/11/19 19:02:16 mpech Exp $ */
+/* $OpenBSD: read.c,v 1.7 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: read.c,v 1.4 1994/11/23 07:42:07 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: read.c,v 1.6 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: read.c,v 1.7 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 20e908cf451..5c343a3868f 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reverse.c,v 1.12 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: reverse.c,v 1.13 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: reverse.c,v 1.6 1994/11/23 07:42:10 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)reverse.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: reverse.c,v 1.12 2002/02/16 21:27:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: reverse.c,v 1.13 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index bbec69b3435..aec1a113973 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tail.1,v 1.10 2000/10/07 14:32:15 aaron Exp $
+.\" $OpenBSD: tail.1,v 1.11 2003/06/03 02:56:17 millert Exp $
.\" $NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c
index 6f8c7806ec4..cbbe143e95b 100644
--- a/usr.bin/tail/tail.c
+++ b/usr.bin/tail/tail.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tail.c,v 1.9 2003/04/08 00:04:06 dhartmei Exp $ */
+/* $OpenBSD: tail.c,v 1.10 2003/06/03 02:56:17 millert Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -46,7 +42,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tail.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tail.c,v 1.9 2003/04/08 00:04:06 dhartmei Exp $";
+static char rcsid[] = "$OpenBSD: tail.c,v 1.10 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index 0da3ffda3d9..ec5c86253c5 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctl.c,v 1.6 2002/06/02 22:29:19 deraadt Exp $ */
+/* $OpenBSD: ctl.c,v 1.7 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: ctl.c,v 1.3 1994/12/09 02:14:10 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: ctl.c,v 1.6 2002/06/02 22:29:19 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ctl.c,v 1.7 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index dd3b2368392..889b2ae6e0f 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctl_transact.c,v 1.7 2001/09/05 00:29:20 deraadt Exp $ */
+/* $OpenBSD: ctl_transact.c,v 1.8 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: ctl_transact.c,v 1.3 1994/12/09 02:14:12 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: ctl_transact.c,v 1.7 2001/09/05 00:29:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ctl_transact.c,v 1.8 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 24260ea4449..ea212f31315 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.12 2002/06/20 19:25:55 millert Exp $ */
+/* $OpenBSD: display.c,v 1.13 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: display.c,v 1.3 1994/12/09 02:14:13 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: display.c,v 1.12 2002/06/20 19:25:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: display.c,v 1.13 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index d0286ece990..ed00281a131 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get_addrs.c,v 1.4 1998/08/18 04:02:11 millert Exp $ */
+/* $OpenBSD: get_addrs.c,v 1.5 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: get_addrs.c,v 1.3 1994/12/09 02:14:14 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: get_addrs.c,v 1.4 1998/08/18 04:02:11 millert Exp $";
+static char rcsid[] = "$OpenBSD: get_addrs.c,v 1.5 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index b1720eb95f0..26f64b4b784 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: get_names.c,v 1.11 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: get_names.c,v 1.12 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: get_names.c,v 1.4 1994/12/09 02:14:16 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: get_names.c,v 1.11 2002/06/21 06:16:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: get_names.c,v 1.12 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index 0d31ba76e86..eecac9c8a8e 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_disp.c,v 1.15 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: init_disp.c,v 1.16 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: init_disp.c,v 1.6 1994/12/09 02:14:17 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94";
#endif
-static char rcsid[] = "$OpenBSD: init_disp.c,v 1.15 2002/06/21 06:16:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: init_disp.c,v 1.16 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index 74157c20026..c6c927789bd 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: invite.c,v 1.8 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: invite.c,v 1.9 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: invite.c,v 1.3 1994/12/09 02:14:18 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: invite.c,v 1.8 2002/06/21 06:16:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: invite.c,v 1.9 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 6181f5104be..a36a80854e9 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: io.c,v 1.11 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: io.c,v 1.12 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: io.c,v 1.4 1994/12/09 02:14:20 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: io.c,v 1.11 2002/06/21 06:16:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: io.c,v 1.12 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 79a7352a16c..fa9b4d838ef 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: look_up.c,v 1.7 2001/07/17 02:23:58 pvalchev Exp $ */
+/* $OpenBSD: look_up.c,v 1.8 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: look_up.c,v 1.3 1994/12/09 02:14:21 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: look_up.c,v 1.7 2001/07/17 02:23:58 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: look_up.c,v 1.8 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 48da0e8951f..9dcad94cfaf 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msgs.c,v 1.5 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: msgs.c,v 1.6 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: msgs.c,v 1.3 1994/12/09 02:14:22 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: msgs.c,v 1.5 2002/06/21 06:16:44 millert Exp $";
+static char rcsid[] = "$OpenBSD: msgs.c,v 1.6 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 7c5a78ad4bd..6280406dd68 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: talk.1,v 1.16 2003/01/09 11:37:28 fgsch Exp $
+.\" $OpenBSD: talk.1,v 1.17 2003/06/03 02:56:17 millert Exp $
.\" $NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index b58b236662c..dd652e41a1d 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: talk.c,v 1.5 2001/07/17 02:23:58 pvalchev Exp $ */
+/* $OpenBSD: talk.c,v 1.6 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: talk.c,v 1.3 1994/12/09 02:14:25 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: talk.c,v 1.5 2001/07/17 02:23:58 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: talk.c,v 1.6 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include "talk.h"
diff --git a/usr.bin/talk/talk.h b/usr.bin/talk/talk.h
index cdb93b5f014..7f8100a344f 100644
--- a/usr.bin/talk/talk.h
+++ b/usr.bin/talk/talk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: talk.h,v 1.9 2002/06/21 06:16:44 millert Exp $ */
+/* $OpenBSD: talk.h,v 1.10 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: talk.h,v 1.3 1994/12/09 02:14:27 jtc Exp $ */
/*
@@ -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/usr.bin/talk/talk_ctl.h b/usr.bin/talk/talk_ctl.h
index c7ed3efcff6..6831850af26 100644
--- a/usr.bin/talk/talk_ctl.h
+++ b/usr.bin/talk/talk_ctl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: talk_ctl.h,v 1.2 1996/06/26 05:40:27 deraadt Exp $ */
+/* $OpenBSD: talk_ctl.h,v 1.3 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: talk_ctl.h,v 1.3 1994/12/09 02:14:28 jtc Exp $ */
/*
@@ -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/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 42786eb73cf..aac239e7b74 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tcopy.1,v 1.8 2000/11/09 17:52:41 aaron Exp $
+.\" $OpenBSD: tcopy.1,v 1.9 2003/06/03 02:56:17 millert Exp $
.\" $NetBSD: tcopy.1,v 1.4 1997/04/15 07:23:07 lukem Exp $
.\"
.\" Copyright (c) 1985, 1990, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index 7bcf62437e7..49f7cc2274e 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcopy.c,v 1.7 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: tcopy.c,v 1.8 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: tcopy.c,v 1.5 1997/04/15 07:23:08 lukem Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tcopy.c 8.3 (Berkeley) 1/23/95";
#endif
-static char rcsid[] = "$OpenBSD: tcopy.c,v 1.7 2002/02/16 21:27:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: tcopy.c,v 1.8 2003/06/03 02:56:17 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tee/tee.1 b/usr.bin/tee/tee.1
index e0a446abbd4..e0d4a5a48c0 100644
--- a/usr.bin/tee/tee.1
+++ b/usr.bin/tee/tee.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tee.1,v 1.4 2000/03/05 00:28:55 aaron Exp $
+.\" $OpenBSD: tee.1,v 1.5 2003/06/03 02:56:17 millert Exp $
.\" $NetBSD: tee.1,v 1.4 1994/12/09 01:43:37 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index 4d2554ba826..68d898c0f88 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tee.c,v 1.4 2002/02/16 21:27:54 millert Exp $ */
+/* $OpenBSD: tee.c,v 1.5 2003/06/03 02:56:17 millert Exp $ */
/* $NetBSD: tee.c,v 1.5 1994/12/09 01:43:39 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tee.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tee.c,v 1.4 2002/02/16 21:27:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: tee.c,v 1.5 2003/06/03 02:56:17 millert Exp $";
#endif
#include <sys/types.h>
diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index cbd2059c159..248fa8657ef 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/05/14 06:49:59 mho Exp $
+# $OpenBSD: Makefile,v 1.20 2003/06/03 02:56:17 millert Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -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/usr.bin/telnet/authenc.c b/usr.bin/telnet/authenc.c
index 6742bb051f7..2b8cae647ec 100644
--- a/usr.bin/telnet/authenc.c
+++ b/usr.bin/telnet/authenc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authenc.c,v 1.5 2002/03/22 13:49:28 hin Exp $ */
+/* $OpenBSD: authenc.c,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: authenc.c,v 1.5 1996/02/28 21:03:52 thorpej Exp $ */
/*-
@@ -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.
*
@@ -35,7 +31,7 @@
*/
/*
-RCSID("$Id: authenc.c,v 1.5 2002/03/22 13:49:28 hin Exp $");
+RCSID("$Id: authenc.c,v 1.6 2003/06/03 02:56:18 millert Exp $");
*/
#include "telnet_locl.h"
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 2a9a2446163..c5c25e73956 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: commands.c,v 1.44 2003/04/25 20:07:09 pvalchev Exp $ */
+/* $OpenBSD: commands.c,v 1.45 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $ */
/*
@@ -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/usr.bin/telnet/defines.h b/usr.bin/telnet/defines.h
index 6287b6deb63..4cfc2b05ee6 100644
--- a/usr.bin/telnet/defines.h
+++ b/usr.bin/telnet/defines.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: defines.h,v 1.5 2002/02/17 17:20:49 millert Exp $ */
+/* $OpenBSD: defines.h,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: defines.h,v 1.5 1996/02/28 21:03:55 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/externs.h b/usr.bin/telnet/externs.h
index a4ada49930b..38ca807ca14 100644
--- a/usr.bin/telnet/externs.h
+++ b/usr.bin/telnet/externs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: externs.h,v 1.10 2002/03/25 10:52:32 hin Exp $ */
+/* $OpenBSD: externs.h,v 1.11 2003/06/03 02:56:18 millert Exp $ */
/* $KTH: externs.h,v 1.16 1997/11/29 02:28:35 joda Exp $ */
/*
@@ -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/usr.bin/telnet/getent.c b/usr.bin/telnet/getent.c
index a4285f11e01..d853b22a37d 100644
--- a/usr.bin/telnet/getent.c
+++ b/usr.bin/telnet/getent.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.
*
@@ -34,7 +30,7 @@
#ifndef lint
/* from: static char sccsid[] = "@(#)getent.c 8.2 (Berkeley) 12/15/93"; */
/* from: static char *rcsid = "$NetBSD: getent.c,v 1.5 1996/02/24 01:15:22 jtk Exp $"; */
-static char *rcsid = "$OpenBSD: getent.c,v 1.1 2003/05/14 01:46:51 hin Exp $";
+static char *rcsid = "$OpenBSD: getent.c,v 1.2 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <stdlib.h>
diff --git a/usr.bin/telnet/main.c b/usr.bin/telnet/main.c
index 6f8833eaa9a..e42a5b804a2 100644
--- a/usr.bin/telnet/main.c
+++ b/usr.bin/telnet/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.13 2002/03/22 13:49:28 hin Exp $ */
+/* $OpenBSD: main.c,v 1.14 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: main.c,v 1.5 1996/02/28 21:04:05 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/network.c b/usr.bin/telnet/network.c
index e7e2043d986..3f0af179a06 100644
--- a/usr.bin/telnet/network.c
+++ b/usr.bin/telnet/network.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: network.c,v 1.7 2001/11/19 19:02:16 mpech Exp $ */
+/* $OpenBSD: network.c,v 1.8 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: network.c,v 1.5 1996/02/28 21:04:06 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/ring.c b/usr.bin/telnet/ring.c
index d7538a0775c..729e6dc416f 100644
--- a/usr.bin/telnet/ring.c
+++ b/usr.bin/telnet/ring.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ring.c,v 1.4 1998/05/15 03:16:40 art Exp $ */
+/* $OpenBSD: ring.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: ring.c,v 1.7 1996/02/28 21:04:07 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/ring.h b/usr.bin/telnet/ring.h
index 50ae730e61e..b1bc9e2840e 100644
--- a/usr.bin/telnet/ring.h
+++ b/usr.bin/telnet/ring.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ring.h,v 1.5 2002/02/17 17:20:49 millert Exp $ */
+/* $OpenBSD: ring.h,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: ring.h,v 1.5 1996/02/28 21:04:09 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index 5b193642403..126742f0589 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_bsd.c,v 1.13 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: sys_bsd.c,v 1.14 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: sys_bsd.c,v 1.11 1996/02/28 21:04:10 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index f4d9257d0d8..d6d868315ec 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: telnet.1,v 1.31 2003/01/15 15:05:36 deraadt Exp $
+.\" $OpenBSD: telnet.1,v 1.32 2003/06/03 02:56:18 millert Exp $
.\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index b31928f5574..58403275bca 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: telnet.c,v 1.15 2002/03/22 13:49:28 hin Exp $ */
+/* $OpenBSD: telnet.c,v 1.16 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/terminal.c b/usr.bin/telnet/terminal.c
index 9f82b9e784e..a32973416d1 100644
--- a/usr.bin/telnet/terminal.c
+++ b/usr.bin/telnet/terminal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: terminal.c,v 1.5 2002/12/07 20:41:21 millert Exp $ */
+/* $OpenBSD: terminal.c,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: terminal.c,v 1.5 1996/02/28 21:04:17 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/tn3270.c b/usr.bin/telnet/tn3270.c
index fb9cf0bd516..2f7c87b2853 100644
--- a/usr.bin/telnet/tn3270.c
+++ b/usr.bin/telnet/tn3270.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tn3270.c,v 1.5 2003/04/03 12:05:58 hin Exp $ */
+/* $OpenBSD: tn3270.c,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tn3270.c,v 1.5 1996/02/28 21:04:18 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/types.h b/usr.bin/telnet/types.h
index d36b443ffd5..e2132653d7a 100644
--- a/usr.bin/telnet/types.h
+++ b/usr.bin/telnet/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.2 1996/03/27 19:33:13 niklas Exp $ */
+/* $OpenBSD: types.h,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: types.h,v 1.5 1996/02/28 21:04:20 thorpej Exp $ */
/*
@@ -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/usr.bin/telnet/utilities.c b/usr.bin/telnet/utilities.c
index ee8ff1bbd3e..3b5f5c2ed7a 100644
--- a/usr.bin/telnet/utilities.c
+++ b/usr.bin/telnet/utilities.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: utilities.c,v 1.8 2003/04/03 12:05:58 hin Exp $ */
+/* $OpenBSD: utilities.c,v 1.9 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: utilities.c,v 1.5 1996/02/28 21:04:21 thorpej Exp $ */
/*
@@ -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/usr.bin/tftp/extern.h b/usr.bin/tftp/extern.h
index 043d9a8a2a7..97b6430f7ae 100644
--- a/usr.bin/tftp/extern.h
+++ b/usr.bin/tftp/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: extern.h,v 1.2 1994/12/08 09:51:24 jtc Exp $ */
/*
@@ -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/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index a808013969d..3903421d323 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.12 2003/04/17 17:17:27 henning Exp $ */
+/* $OpenBSD: main.c,v 1.13 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: main.c,v 1.12 2003/04/17 17:17:27 henning Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.13 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index f5494f107af..fc00b72eaf0 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tftp.1,v 1.6 2000/03/11 21:40:04 aaron Exp $
+.\" $OpenBSD: tftp.1,v 1.7 2003/06/03 02:56:18 millert Exp $
.\" $NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -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/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 19b4842c873..4d5368f929c 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftp.c,v 1.11 2003/04/17 17:17:27 henning Exp $ */
+/* $OpenBSD: tftp.c,v 1.12 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: tftp.c,v 1.11 2003/04/17 17:17:27 henning Exp $";
+static const char rcsid[] = "$OpenBSD: tftp.c,v 1.12 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index c5761499c10..869adb425f3 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpsubs.c,v 1.5 2003/04/17 17:17:27 henning Exp $ */
+/* $OpenBSD: tftpsubs.c,v 1.6 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.5 2003/04/17 17:17:27 henning Exp $";
+static const char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.6 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/tftp/tftpsubs.h b/usr.bin/tftp/tftpsubs.h
index d32b5c0d15c..fe2e4103891 100644
--- a/usr.bin/tftp/tftpsubs.h
+++ b/usr.bin/tftp/tftpsubs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpsubs.h,v 1.3 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: tftpsubs.h,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tftpsubs.h,v 1.2 1994/12/08 09:51:32 jtc Exp $ */
/*
@@ -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/usr.bin/time/time.1 b/usr.bin/time/time.1
index 5a9d8a12aaf..dfbc45078c1 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: time.1,v 1.11 2002/01/24 20:33:46 mickey Exp $
+.\" $OpenBSD: time.1,v 1.12 2003/06/03 02:56:18 millert Exp $
.\" $NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 51d90ee646c..8c4220342b1 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: time.c,v 1.13 2002/05/26 09:27:10 deraadt Exp $ */
+/* $OpenBSD: time.c,v 1.14 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: time.c,v 1.7 1995/06/27 00:34:00 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)time.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: time.c,v 1.13 2002/05/26 09:27:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: time.c,v 1.14 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/tip/acu.c b/usr.bin/tip/acu.c
index 9c2f93df57d..c949c68e762 100644
--- a/usr.bin/tip/acu.c
+++ b/usr.bin/tip/acu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acu.c,v 1.8 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: acu.c,v 1.9 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: acu.c,v 1.4 1996/12/29 10:34:03 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)acu.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: acu.c,v 1.8 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: acu.c,v 1.9 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz22.c b/usr.bin/tip/aculib/biz22.c
index 162c69ae0d5..75a0d13f46b 100644
--- a/usr.bin/tip/aculib/biz22.c
+++ b/usr.bin/tip/aculib/biz22.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz22.c,v 1.10 2003/05/05 20:07:37 avsm Exp $ */
+/* $OpenBSD: biz22.c,v 1.11 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: biz22.c,v 1.6 1997/02/11 09:24:11 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)biz22.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: biz22.c,v 1.10 2003/05/05 20:07:37 avsm Exp $";
+static const char rcsid[] = "$OpenBSD: biz22.c,v 1.11 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/biz31.c b/usr.bin/tip/aculib/biz31.c
index 57aeb2ce773..c5b5e6aa330 100644
--- a/usr.bin/tip/aculib/biz31.c
+++ b/usr.bin/tip/aculib/biz31.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: biz31.c,v 1.8 2003/05/05 20:07:37 avsm Exp $ */
+/* $OpenBSD: biz31.c,v 1.9 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: biz31.c,v 1.5 1997/02/11 09:24:14 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)biz31.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: biz31.c,v 1.8 2003/05/05 20:07:37 avsm Exp $";
+static char rcsid[] = "$OpenBSD: biz31.c,v 1.9 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/aculib/courier.c b/usr.bin/tip/aculib/courier.c
index 91811c76edf..91350089355 100644
--- a/usr.bin/tip/aculib/courier.c
+++ b/usr.bin/tip/aculib/courier.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: courier.c,v 1.12 2003/04/04 21:50:00 deraadt Exp $ */
+/* $OpenBSD: courier.c,v 1.13 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: courier.c,v 1.7 1997/02/11 09:24:16 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)courier.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: courier.c,v 1.12 2003/04/04 21:50:00 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: courier.c,v 1.13 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/df.c b/usr.bin/tip/aculib/df.c
index 4642f98c3d4..85ceed0f613 100644
--- a/usr.bin/tip/aculib/df.c
+++ b/usr.bin/tip/aculib/df.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: df.c,v 1.6 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: df.c,v 1.7 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: df.c,v 1.4 1995/10/29 00:49:51 pk Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)df.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: df.c,v 1.6 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: df.c,v 1.7 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/dn11.c b/usr.bin/tip/aculib/dn11.c
index ab0effd965b..3d5d18cd299 100644
--- a/usr.bin/tip/aculib/dn11.c
+++ b/usr.bin/tip/aculib/dn11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dn11.c,v 1.7 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: dn11.c,v 1.8 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: dn11.c,v 1.4 1995/10/29 00:49:53 pk Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dn11.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: dn11.c,v 1.7 2002/06/12 06:07:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: dn11.c,v 1.8 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/hayes.c b/usr.bin/tip/aculib/hayes.c
index d333a814f87..b8b06b56671 100644
--- a/usr.bin/tip/aculib/hayes.c
+++ b/usr.bin/tip/aculib/hayes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hayes.c,v 1.10 2003/04/04 21:50:00 deraadt Exp $ */
+/* $OpenBSD: hayes.c,v 1.11 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: hayes.c,v 1.6 1997/02/11 09:24:17 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hayes.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: hayes.c,v 1.10 2003/04/04 21:50:00 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: hayes.c,v 1.11 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/t3000.c b/usr.bin/tip/aculib/t3000.c
index 3a4ffded4c2..625c4c4a04c 100644
--- a/usr.bin/tip/aculib/t3000.c
+++ b/usr.bin/tip/aculib/t3000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t3000.c,v 1.11 2003/04/04 21:50:00 deraadt Exp $ */
+/* $OpenBSD: t3000.c,v 1.12 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: t3000.c,v 1.5 1997/02/11 09:24:18 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)t3000.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: t3000.c,v 1.11 2003/04/04 21:50:00 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: t3000.c,v 1.12 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v3451.c b/usr.bin/tip/aculib/v3451.c
index b4b902dcfb6..1f9f55f3c38 100644
--- a/usr.bin/tip/aculib/v3451.c
+++ b/usr.bin/tip/aculib/v3451.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3451.c,v 1.7 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: v3451.c,v 1.8 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: v3451.c,v 1.6 1997/02/11 09:24:20 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)v3451.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: v3451.c,v 1.7 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: v3451.c,v 1.8 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/v831.c b/usr.bin/tip/aculib/v831.c
index 2b5576ad049..93801bfcb93 100644
--- a/usr.bin/tip/aculib/v831.c
+++ b/usr.bin/tip/aculib/v831.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v831.c,v 1.8 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: v831.c,v 1.9 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: v831.c,v 1.5 1996/12/29 10:42:01 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)v831.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: v831.c,v 1.8 2002/06/12 06:07:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: v831.c,v 1.9 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/aculib/ventel.c b/usr.bin/tip/aculib/ventel.c
index 7930d946863..523269392b2 100644
--- a/usr.bin/tip/aculib/ventel.c
+++ b/usr.bin/tip/aculib/ventel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ventel.c,v 1.9 2003/04/04 21:50:00 deraadt Exp $ */
+/* $OpenBSD: ventel.c,v 1.10 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: ventel.c,v 1.6 1997/02/11 09:24:21 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)ventel.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: ventel.c,v 1.9 2003/04/04 21:50:00 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ventel.c,v 1.10 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/acutab.c b/usr.bin/tip/acutab.c
index e8bbd5e1882..1d8a4ec23e0 100644
--- a/usr.bin/tip/acutab.c
+++ b/usr.bin/tip/acutab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acutab.c,v 1.3 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: acutab.c,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: acutab.c,v 1.3 1994/12/08 09:30:41 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)acutab.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: acutab.c,v 1.3 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: acutab.c,v 1.4 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmds.c b/usr.bin/tip/cmds.c
index 192f5247766..1ef949cec9f 100644
--- a/usr.bin/tip/cmds.c
+++ b/usr.bin/tip/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.15 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: cmds.c,v 1.16 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: cmds.c,v 1.7 1997/02/11 09:24:03 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.15 2002/06/12 06:07:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: cmds.c,v 1.16 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cmdtab.c b/usr.bin/tip/cmdtab.c
index 87653e0d1b7..c6044955e7d 100644
--- a/usr.bin/tip/cmdtab.c
+++ b/usr.bin/tip/cmdtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmdtab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: cmdtab.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: cmdtab.c,v 1.3 1994/12/08 09:30:46 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.5 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/cu.c b/usr.bin/tip/cu.c
index e815d0a958b..949efec9ce1 100644
--- a/usr.bin/tip/cu.c
+++ b/usr.bin/tip/cu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cu.c,v 1.13 2002/05/29 22:58:56 millert Exp $ */
+/* $OpenBSD: cu.c,v 1.14 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: cu.c,v 1.5 1997/02/11 09:24:05 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)cu.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: cu.c,v 1.13 2002/05/29 22:58:56 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cu.c,v 1.14 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/hunt.c b/usr.bin/tip/hunt.c
index 04b9913e769..fa513d352be 100644
--- a/usr.bin/tip/hunt.c
+++ b/usr.bin/tip/hunt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hunt.c,v 1.9 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: hunt.c,v 1.10 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: hunt.c,v 1.6 1997/04/20 00:02:10 mellon Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)hunt.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: hunt.c,v 1.9 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: hunt.c,v 1.10 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/log.c b/usr.bin/tip/log.c
index b2497613cda..8a7ceab1f5c 100644
--- a/usr.bin/tip/log.c
+++ b/usr.bin/tip/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.6 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: log.c,v 1.7 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: log.c,v 1.4 1994/12/24 17:56:28 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)log.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: log.c,v 1.6 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: log.c,v 1.7 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/partab.c b/usr.bin/tip/partab.c
index 7c0ab3c4333..0b8df9c65a4 100644
--- a/usr.bin/tip/partab.c
+++ b/usr.bin/tip/partab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: partab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: partab.c,v 1.4 1996/12/29 10:38:21 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)partab.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: partab.c,v 1.4 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: partab.c,v 1.5 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/pathnames.h b/usr.bin/tip/pathnames.h
index cc7cbf4a7a2..cc5995756c6 100644
--- a/usr.bin/tip/pathnames.h
+++ b/usr.bin/tip/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:40:45 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/12/08 09:30:59 jtc Exp $ */
/*
@@ -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/usr.bin/tip/remote.c b/usr.bin/tip/remote.c
index ebff8cee51a..a93c5e24413 100644
--- a/usr.bin/tip/remote.c
+++ b/usr.bin/tip/remote.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: remote.c,v 1.11 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: remote.c,v 1.12 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: remote.c,v 1.5 1997/04/20 00:02:45 mellon Exp $ */
/*
@@ -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.
*
@@ -45,7 +41,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)remote.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: remote.c,v 1.11 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: remote.c,v 1.12 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index 81979f65aec..25d6f695518 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tip.1,v 1.23 2003/03/11 08:11:08 jmc Exp $
+.\" $OpenBSD: tip.1,v 1.24 2003/06/03 02:56:18 millert Exp $
.\" $NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tip/tip.c b/usr.bin/tip/tip.c
index 67457f249b9..ace375b273a 100644
--- a/usr.bin/tip/tip.c
+++ b/usr.bin/tip/tip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.c,v 1.19 2002/05/29 22:58:56 millert Exp $ */
+/* $OpenBSD: tip.c,v 1.20 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tip.c,v 1.13 1997/04/20 00:03:05 mellon Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)tip.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: tip.c,v 1.19 2002/05/29 22:58:56 millert Exp $";
+static const char rcsid[] = "$OpenBSD: tip.c,v 1.20 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tip/tip.h b/usr.bin/tip/tip.h
index a5b5451c000..ddf281dceb0 100644
--- a/usr.bin/tip/tip.h
+++ b/usr.bin/tip/tip.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tip.h,v 1.14 2002/06/04 00:09:08 deraadt Exp $ */
+/* $OpenBSD: tip.h,v 1.15 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tip.h,v 1.7 1997/04/20 00:02:46 mellon Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tip/tipout.c b/usr.bin/tip/tipout.c
index 3be2541dde3..57ca3e356ef 100644
--- a/usr.bin/tip/tipout.c
+++ b/usr.bin/tip/tipout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tipout.c,v 1.9 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: tipout.c,v 1.10 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: tipout.c,v 1.5 1996/12/29 10:34:12 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tipout.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: tipout.c,v 1.9 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: tipout.c,v 1.10 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/uucplock.c b/usr.bin/tip/uucplock.c
index a787522e8d4..7f4728d00a8 100644
--- a/usr.bin/tip/uucplock.c
+++ b/usr.bin/tip/uucplock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uucplock.c,v 1.9 2002/06/12 06:07:16 mpech Exp $ */
+/* $OpenBSD: uucplock.c,v 1.10 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: uucplock.c,v 1.7 1997/02/11 09:24:08 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)uucplock.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: uucplock.c,v 1.9 2002/06/12 06:07:16 mpech Exp $";
+static const char rcsid[] = "$OpenBSD: uucplock.c,v 1.10 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tip/value.c b/usr.bin/tip/value.c
index 84c1bbdd4f3..ac11e8b0bba 100644
--- a/usr.bin/tip/value.c
+++ b/usr.bin/tip/value.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: value.c,v 1.9 2002/05/27 03:14:22 deraadt Exp $ */
+/* $OpenBSD: value.c,v 1.10 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: value.c,v 1.6 1997/02/11 09:24:09 mrg Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)value.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: value.c,v 1.9 2002/05/27 03:14:22 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: value.c,v 1.10 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tip/vars.c b/usr.bin/tip/vars.c
index ad2bcbf41b7..424c9e317d7 100644
--- a/usr.bin/tip/vars.c
+++ b/usr.bin/tip/vars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vars.c,v 1.3 2002/05/07 06:56:50 hugh Exp $ */
+/* $OpenBSD: vars.c,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/* $NetBSD: vars.c,v 1.3 1994/12/08 09:31:19 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vars.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: vars.c,v 1.3 2002/05/07 06:56:50 hugh Exp $";
+static const char rcsid[] = "$OpenBSD: vars.c,v 1.4 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "tip.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 89e8bef2a23..dee4742daa6 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api_bsd.c,v 1.3 1996/11/04 00:07:35 bitblt Exp $ */
+/* $OpenBSD: api_bsd.c,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api_bsd.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api_bsd.c,v 1.3 1996/11/04 00:07:35 bitblt Exp $";
+static char rcsid[] = "$OpenBSD: api_bsd.c,v 1.4 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/tn3270/api/api_exch.c b/usr.bin/tn3270/api/api_exch.c
index 54c7b2481ec..4fbb0d751ea 100644
--- a/usr.bin/tn3270/api/api_exch.c
+++ b/usr.bin/tn3270/api/api_exch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api_exch.c,v 1.4 2003/04/06 22:02:05 tedu Exp $ */
+/* $OpenBSD: api_exch.c,v 1.5 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api_exch.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api_exch.c,v 1.4 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$OpenBSD: api_exch.c,v 1.5 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/api/api_exch.h b/usr.bin/tn3270/api/api_exch.h
index c2e6f27f0d6..ad7bf9af6d5 100644
--- a/usr.bin/tn3270/api/api_exch.h
+++ b/usr.bin/tn3270/api/api_exch.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: api_exch.h,v 1.2 1996/06/26 05:41:01 deraadt Exp $*/
+/* * $OpenBSD: api_exch.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/apilib.c b/usr.bin/tn3270/api/apilib.c
index f8137eceaad..1080d1dcfa3 100644
--- a/usr.bin/tn3270/api/apilib.c
+++ b/usr.bin/tn3270/api/apilib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apilib.c,v 1.2 1996/06/26 05:41:02 deraadt Exp $ */
+/* $OpenBSD: apilib.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)apilib.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: apilib.c,v 1.2 1996/06/26 05:41:02 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: apilib.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "../ctlr/api.h"
diff --git a/usr.bin/tn3270/api/apilib.h b/usr.bin/tn3270/api/apilib.h
index a7e0d6d4f22..229caf5315c 100644
--- a/usr.bin/tn3270/api/apilib.h
+++ b/usr.bin/tn3270/api/apilib.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: apilib.h,v 1.2 1996/06/26 05:41:02 deraadt Exp $*/
+/* * $OpenBSD: apilib.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/asc_ebc.c b/usr.bin/tn3270/api/asc_ebc.c
index 3f4f4957c76..804e8a9eb31 100644
--- a/usr.bin/tn3270/api/asc_ebc.c
+++ b/usr.bin/tn3270/api/asc_ebc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_ebc.c,v 1.2 1996/06/26 05:41:03 deraadt Exp $ */
+/* $OpenBSD: asc_ebc.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)asc_ebc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: asc_ebc.c,v 1.2 1996/06/26 05:41:03 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: asc_ebc.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/asc_ebc.h b/usr.bin/tn3270/api/asc_ebc.h
index d66c1d48564..102d955a859 100644
--- a/usr.bin/tn3270/api/asc_ebc.h
+++ b/usr.bin/tn3270/api/asc_ebc.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: asc_ebc.h,v 1.2 1996/06/26 05:41:03 deraadt Exp $*/
+/* * $OpenBSD: asc_ebc.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/astosc.c b/usr.bin/tn3270/api/astosc.c
index d0e52308ff6..1019af5948f 100644
--- a/usr.bin/tn3270/api/astosc.c
+++ b/usr.bin/tn3270/api/astosc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: astosc.c,v 1.3 2001/11/19 19:02:16 mpech Exp $ */
+/* $OpenBSD: astosc.c,v 1.4 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)astosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: astosc.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: astosc.c,v 1.4 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/tn3270/api/astosc.h b/usr.bin/tn3270/api/astosc.h
index d055508b79f..4cd49e1faa4 100644
--- a/usr.bin/tn3270/api/astosc.h
+++ b/usr.bin/tn3270/api/astosc.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: astosc.h,v 1.2 1996/06/26 05:41:05 deraadt Exp $*/
+/* * $OpenBSD: astosc.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/dctype.c b/usr.bin/tn3270/api/dctype.c
index e461b9c4c96..13887f41f52 100644
--- a/usr.bin/tn3270/api/dctype.c
+++ b/usr.bin/tn3270/api/dctype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dctype.c,v 1.2 1996/06/26 05:41:05 deraadt Exp $ */
+/* $OpenBSD: dctype.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)dctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dctype.c,v 1.2 1996/06/26 05:41:05 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: dctype.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
#include "dctype.h"
diff --git a/usr.bin/tn3270/api/dctype.h b/usr.bin/tn3270/api/dctype.h
index 3188e9c62ee..face453038f 100644
--- a/usr.bin/tn3270/api/dctype.h
+++ b/usr.bin/tn3270/api/dctype.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: dctype.h,v 1.2 1996/06/26 05:41:06 deraadt Exp $*/
+/* * $OpenBSD: dctype.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/disp_asc.c b/usr.bin/tn3270/api/disp_asc.c
index fef6b944835..4e486320506 100644
--- a/usr.bin/tn3270/api/disp_asc.c
+++ b/usr.bin/tn3270/api/disp_asc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disp_asc.c,v 1.2 1996/06/26 05:41:06 deraadt Exp $ */
+/* $OpenBSD: disp_asc.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)disp_asc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: disp_asc.c,v 1.2 1996/06/26 05:41:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: disp_asc.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/disp_asc.h b/usr.bin/tn3270/api/disp_asc.h
index 9afb904db67..da553186d32 100644
--- a/usr.bin/tn3270/api/disp_asc.h
+++ b/usr.bin/tn3270/api/disp_asc.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: disp_asc.h,v 1.2 1996/06/26 05:41:07 deraadt Exp $*/
+/* * $OpenBSD: disp_asc.h,v 1.3 2003/06/03 02:56:18 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/api/ebc_disp.c b/usr.bin/tn3270/api/ebc_disp.c
index 523eed6dce1..f3626877df1 100644
--- a/usr.bin/tn3270/api/ebc_disp.c
+++ b/usr.bin/tn3270/api/ebc_disp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ebc_disp.c,v 1.2 1996/06/26 05:41:08 deraadt Exp $ */
+/* $OpenBSD: ebc_disp.c,v 1.3 2003/06/03 02:56:18 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ebc_disp.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: ebc_disp.c,v 1.2 1996/06/26 05:41:08 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ebc_disp.c,v 1.3 2003/06/03 02:56:18 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/api/ebc_disp.h b/usr.bin/tn3270/api/ebc_disp.h
index ccb3a8a354d..27f8d008baa 100644
--- a/usr.bin/tn3270/api/ebc_disp.h
+++ b/usr.bin/tn3270/api/ebc_disp.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: ebc_disp.h,v 1.2 1996/06/26 05:41:08 deraadt Exp $*/
+/* * $OpenBSD: ebc_disp.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ascii/default.map b/usr.bin/tn3270/ascii/default.map
index 8e4a9b15265..cb9d8ba7ba6 100644
--- a/usr.bin/tn3270/ascii/default.map
+++ b/usr.bin/tn3270/ascii/default.map
@@ -1,4 +1,4 @@
-/* $OpenBSD: default.map,v 1.2 1996/06/26 05:41:09 deraadt Exp $ */
+/* $OpenBSD: default.map,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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/usr.bin/tn3270/ascii/map3270.c b/usr.bin/tn3270/ascii/map3270.c
index fc225c011d4..90dabb4c9a2 100644
--- a/usr.bin/tn3270/ascii/map3270.c
+++ b/usr.bin/tn3270/ascii/map3270.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: map3270.c,v 1.6 2003/04/06 22:02:05 tedu Exp $ */
+/* $OpenBSD: map3270.c,v 1.7 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)map3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: map3270.c,v 1.6 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$OpenBSD: map3270.c,v 1.7 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/* This program reads a description file, somewhat like /etc/termcap,
diff --git a/usr.bin/tn3270/ascii/map3270.h b/usr.bin/tn3270/ascii/map3270.h
index 07501bdf3b3..08db08c76a0 100644
--- a/usr.bin/tn3270/ascii/map3270.h
+++ b/usr.bin/tn3270/ascii/map3270.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: map3270.h,v 1.2 1996/06/26 05:41:10 deraadt Exp $*/
+/* * $OpenBSD: map3270.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index e2c95c844a7..176992348dd 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mset.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $ */
+/* $OpenBSD: mset.c,v 1.5 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mset.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mset.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mset.c,v 1.5 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ascii/state.h b/usr.bin/tn3270/ascii/state.h
index e1a22d2daba..2bdf734e362 100644
--- a/usr.bin/tn3270/ascii/state.h
+++ b/usr.bin/tn3270/ascii/state.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: state.h,v 1.2 1996/06/26 05:41:12 deraadt Exp $*/
+/* * $OpenBSD: state.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ascii/termin.c b/usr.bin/tn3270/ascii/termin.c
index b9e3f8c37bd..0b71bed9008 100644
--- a/usr.bin/tn3270/ascii/termin.c
+++ b/usr.bin/tn3270/ascii/termin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termin.c,v 1.3 2001/11/19 19:02:16 mpech Exp $ */
+/* $OpenBSD: termin.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)termin.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termin.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: termin.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/* this takes characters from the keyboard, and produces 3270 keystroke
diff --git a/usr.bin/tn3270/ctlr/3180.kbd b/usr.bin/tn3270/ctlr/3180.kbd
index 996564efcbf..7e71bad59bf 100644
--- a/usr.bin/tn3270/ctlr/3180.kbd
+++ b/usr.bin/tn3270/ctlr/3180.kbd
@@ -1,4 +1,4 @@
-/* $OpenBSD: 3180.kbd,v 1.2 1996/06/26 05:41:13 deraadt Exp $ */
+/* $OpenBSD: 3180.kbd,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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/usr.bin/tn3270/ctlr/3270pc.kbd b/usr.bin/tn3270/ctlr/3270pc.kbd
index 833976df2e0..fd5a88eca2c 100644
--- a/usr.bin/tn3270/ctlr/3270pc.kbd
+++ b/usr.bin/tn3270/ctlr/3270pc.kbd
@@ -1,4 +1,4 @@
-/* $OpenBSD: 3270pc.kbd,v 1.2 1996/06/26 05:41:14 deraadt Exp $ */
+/* $OpenBSD: 3270pc.kbd,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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/usr.bin/tn3270/ctlr/api.c b/usr.bin/tn3270/ctlr/api.c
index 3d38a6339c2..10553b0dbd7 100644
--- a/usr.bin/tn3270/ctlr/api.c
+++ b/usr.bin/tn3270/ctlr/api.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: api.c,v 1.2 1996/06/26 05:41:15 deraadt Exp $ */
+/* $OpenBSD: api.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)api.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: api.c,v 1.2 1996/06/26 05:41:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: api.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/api.h b/usr.bin/tn3270/ctlr/api.h
index d03055f9ccf..8355649f973 100644
--- a/usr.bin/tn3270/ctlr/api.h
+++ b/usr.bin/tn3270/ctlr/api.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: api.h,v 1.2 1996/06/26 05:41:15 deraadt Exp $*/
+/* * $OpenBSD: api.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/declare.h b/usr.bin/tn3270/ctlr/declare.h
index a958640d1ae..0334492b65f 100644
--- a/usr.bin/tn3270/ctlr/declare.h
+++ b/usr.bin/tn3270/ctlr/declare.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: declare.h,v 1.2 1996/06/26 05:41:16 deraadt Exp $*/
+/* * $OpenBSD: declare.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/externs.h b/usr.bin/tn3270/ctlr/externs.h
index e03b12139e9..7ba0ef940f8 100644
--- a/usr.bin/tn3270/ctlr/externs.h
+++ b/usr.bin/tn3270/ctlr/externs.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: externs.h,v 1.2 1996/06/26 05:41:16 deraadt Exp $*/
+/* * $OpenBSD: externs.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/function.c b/usr.bin/tn3270/ctlr/function.c
index 46808987703..7164170136c 100644
--- a/usr.bin/tn3270/ctlr/function.c
+++ b/usr.bin/tn3270/ctlr/function.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: function.c,v 1.2 1996/06/26 05:41:17 deraadt Exp $ */
+/* $OpenBSD: function.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)function.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.2 1996/06/26 05:41:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/function.h b/usr.bin/tn3270/ctlr/function.h
index 31ddc354474..5607d4383f4 100644
--- a/usr.bin/tn3270/ctlr/function.h
+++ b/usr.bin/tn3270/ctlr/function.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: function.h,v 1.2 1996/06/26 05:41:18 deraadt Exp $*/
+/* * $OpenBSD: function.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/hostctlr.h b/usr.bin/tn3270/ctlr/hostctlr.h
index ae91c86c8e5..11739932c9c 100644
--- a/usr.bin/tn3270/ctlr/hostctlr.h
+++ b/usr.bin/tn3270/ctlr/hostctlr.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: hostctlr.h,v 1.2 1996/06/26 05:41:18 deraadt Exp $*/
+/* * $OpenBSD: hostctlr.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/inbound.c b/usr.bin/tn3270/ctlr/inbound.c
index c2c3b7c072a..512a2f9baa5 100644
--- a/usr.bin/tn3270/ctlr/inbound.c
+++ b/usr.bin/tn3270/ctlr/inbound.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inbound.c,v 1.5 2003/04/04 22:13:10 deraadt Exp $ */
+/* $OpenBSD: inbound.c,v 1.6 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)inbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: inbound.c,v 1.5 2003/04/04 22:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inbound.c,v 1.6 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/ctlr/oia.c b/usr.bin/tn3270/ctlr/oia.c
index 20128df8936..00835bb6422 100644
--- a/usr.bin/tn3270/ctlr/oia.c
+++ b/usr.bin/tn3270/ctlr/oia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oia.c,v 1.2 1996/06/26 05:41:20 deraadt Exp $ */
+/* $OpenBSD: oia.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)oia.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: oia.c,v 1.2 1996/06/26 05:41:20 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: oia.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/oia.h b/usr.bin/tn3270/ctlr/oia.h
index 2086efee7c7..d137eee8bbc 100644
--- a/usr.bin/tn3270/ctlr/oia.h
+++ b/usr.bin/tn3270/ctlr/oia.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: oia.h,v 1.2 1996/06/26 05:41:20 deraadt Exp $*/
+/* * $OpenBSD: oia.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/options.c b/usr.bin/tn3270/ctlr/options.c
index a51213e3390..1c36bb1eb31 100644
--- a/usr.bin/tn3270/ctlr/options.c
+++ b/usr.bin/tn3270/ctlr/options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options.c,v 1.3 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: options.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)options.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: options.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/ctlr/options.h b/usr.bin/tn3270/ctlr/options.h
index 3985fe4a12a..d824b82079a 100644
--- a/usr.bin/tn3270/ctlr/options.h
+++ b/usr.bin/tn3270/ctlr/options.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: options.h,v 1.2 1996/06/26 05:41:21 deraadt Exp $*/
+/* * $OpenBSD: options.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/outbound.c b/usr.bin/tn3270/ctlr/outbound.c
index a801e0adb35..6740c19e174 100644
--- a/usr.bin/tn3270/ctlr/outbound.c
+++ b/usr.bin/tn3270/ctlr/outbound.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: outbound.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $ */
+/* $OpenBSD: outbound.c,v 1.5 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)outbound.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: outbound.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: outbound.c,v 1.5 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/ctlr/screen.h b/usr.bin/tn3270/ctlr/screen.h
index cce934dff46..c8074669c5a 100644
--- a/usr.bin/tn3270/ctlr/screen.h
+++ b/usr.bin/tn3270/ctlr/screen.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: screen.h,v 1.2 1996/06/26 05:41:23 deraadt Exp $*/
+/* * $OpenBSD: screen.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/scrnctlr.h b/usr.bin/tn3270/ctlr/scrnctlr.h
index 53f043627a6..fc7fbc8185d 100644
--- a/usr.bin/tn3270/ctlr/scrnctlr.h
+++ b/usr.bin/tn3270/ctlr/scrnctlr.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: scrnctlr.h,v 1.2 1996/06/26 05:41:23 deraadt Exp $*/
+/* * $OpenBSD: scrnctlr.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/ctlr/unix.kbd b/usr.bin/tn3270/ctlr/unix.kbd
index 903c909a667..16fc7e35302 100644
--- a/usr.bin/tn3270/ctlr/unix.kbd
+++ b/usr.bin/tn3270/ctlr/unix.kbd
@@ -1,4 +1,4 @@
-/* $OpenBSD: unix.kbd,v 1.2 1996/06/26 05:41:24 deraadt Exp $ */
+/* $OpenBSD: unix.kbd,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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/usr.bin/tn3270/general/genbsubs.c b/usr.bin/tn3270/general/genbsubs.c
index 554bd6a238b..ec00f9e33f3 100644
--- a/usr.bin/tn3270/general/genbsubs.c
+++ b/usr.bin/tn3270/general/genbsubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genbsubs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: genbsubs.c,v 1.4 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)genbsubs.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: genbsubs.c,v 1.4 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/* The output of bunequal is the offset of the byte which didn't match;
diff --git a/usr.bin/tn3270/general/general.h b/usr.bin/tn3270/general/general.h
index 1fbe53c107b..9b1ae3d639e 100644
--- a/usr.bin/tn3270/general/general.h
+++ b/usr.bin/tn3270/general/general.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: general.h,v 1.6 1997/02/17 08:58:46 deraadt Exp $*/
+/* * $OpenBSD: general.h,v 1.7 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/general/globals.c b/usr.bin/tn3270/general/globals.c
index a4625fc1e1b..5c1e63e502b 100644
--- a/usr.bin/tn3270/general/globals.c
+++ b/usr.bin/tn3270/general/globals.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: globals.c,v 1.2 1996/06/26 05:41:26 deraadt Exp $ */
+/* $OpenBSD: globals.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)globals.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: globals.c,v 1.2 1996/06/26 05:41:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: globals.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/general/globals.h b/usr.bin/tn3270/general/globals.h
index d3483b762fb..9d019f2df01 100644
--- a/usr.bin/tn3270/general/globals.h
+++ b/usr.bin/tn3270/general/globals.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: globals.h,v 1.2 1996/06/26 05:41:27 deraadt Exp $*/
+/* * $OpenBSD: globals.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/general/vaxbsubs.s b/usr.bin/tn3270/general/vaxbsubs.s
index fc3055a11b5..9cf6b9a9d9a 100644
--- a/usr.bin/tn3270/general/vaxbsubs.s
+++ b/usr.bin/tn3270/general/vaxbsubs.s
@@ -1,4 +1,4 @@
-/* * $OpenBSD: vaxbsubs.s,v 1.2 1996/06/26 05:41:27 deraadt Exp $*/
+/* * $OpenBSD: vaxbsubs.s,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index 9beb006b4c9..036c774e769 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: map3270.5,v 1.8 2003/03/31 19:40:44 jmc Exp $
+.\" $OpenBSD: map3270.5,v 1.9 2003/06/03 02:56:19 millert Exp $
.\" Copyright (c) 1986 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -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/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index a81dc376667..396dca2f732 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mset.1,v 1.8 2000/07/06 04:06:57 aaron Exp $
+.\" $OpenBSD: mset.1,v 1.9 2003/06/03 02:56:19 millert Exp $
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -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/usr.bin/tn3270/sys_curses/system.c b/usr.bin/tn3270/sys_curses/system.c
index 1ed0ea8eac6..b85dcdf5fb9 100644
--- a/usr.bin/tn3270/sys_curses/system.c
+++ b/usr.bin/tn3270/sys_curses/system.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: system.c,v 1.13 2003/04/06 22:02:05 tedu Exp $ */
+/* $OpenBSD: system.c,v 1.14 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)system.c 4.5 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: system.c,v 1.13 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$OpenBSD: system.c,v 1.14 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tn3270/sys_curses/telextrn.h b/usr.bin/tn3270/sys_curses/telextrn.h
index ca9cacb13a0..32aa6f9ccb2 100644
--- a/usr.bin/tn3270/sys_curses/telextrn.h
+++ b/usr.bin/tn3270/sys_curses/telextrn.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: telextrn.h,v 1.3 2003/04/06 22:02:05 tedu Exp $*/
+/* * $OpenBSD: telextrn.h,v 1.4 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/sys_curses/terminal.h b/usr.bin/tn3270/sys_curses/terminal.h
index 6b8c967d8a9..acc6e59d13d 100644
--- a/usr.bin/tn3270/sys_curses/terminal.h
+++ b/usr.bin/tn3270/sys_curses/terminal.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: terminal.h,v 1.2 1996/06/26 05:41:32 deraadt Exp $*/
+/* * $OpenBSD: terminal.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/sys_curses/termout.c b/usr.bin/tn3270/sys_curses/termout.c
index 9f6a1735f2a..264fb276a72 100644
--- a/usr.bin/tn3270/sys_curses/termout.c
+++ b/usr.bin/tn3270/sys_curses/termout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termout.c,v 1.10 2003/04/06 22:02:05 tedu Exp $ */
+/* $OpenBSD: termout.c,v 1.11 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)termout.c 4.3 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: termout.c,v 1.10 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$OpenBSD: termout.c,v 1.11 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index acd8e0d172d..1bd6b43753f 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tn3270.1,v 1.11 2000/11/10 05:10:41 aaron Exp $
+.\" $OpenBSD: tn3270.1,v 1.12 2003/06/03 02:56:19 millert Exp $
.\"
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/tn3270/tools/mkastods/mkastods.c b/usr.bin/tn3270/tools/mkastods/mkastods.c
index 998838bbab2..53bca9e0432 100644
--- a/usr.bin/tn3270/tools/mkastods/mkastods.c
+++ b/usr.bin/tn3270/tools/mkastods/mkastods.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $ */
+/* $OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkastods.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastods.c,v 1.2 1996/06/26 05:41:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastods.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkastosc/mkastosc.c b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
index f457c3dbe81..98f203d849b 100644
--- a/usr.bin/tn3270/tools/mkastosc/mkastosc.c
+++ b/usr.bin/tn3270/tools/mkastosc/mkastosc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $ */
+/* $OpenBSD: mkastosc.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkastosc.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.2 1996/06/26 05:41:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkastosc.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.c b/usr.bin/tn3270/tools/mkdctype/ectype.c
index 86aa5abcaec..0dc02d6cda5 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.c
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $ */
+/* $OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)ectype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: ectype.c,v 1.2 1996/06/26 05:41:38 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ectype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include "ectype.h"
diff --git a/usr.bin/tn3270/tools/mkdctype/ectype.h b/usr.bin/tn3270/tools/mkdctype/ectype.h
index f3a2292029b..cd5d9f3e2ac 100644
--- a/usr.bin/tn3270/tools/mkdctype/ectype.h
+++ b/usr.bin/tn3270/tools/mkdctype/ectype.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: ectype.h,v 1.2 1996/06/26 05:41:39 deraadt Exp $*/
+/* * $OpenBSD: ectype.h,v 1.3 2003/06/03 02:56:19 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/tools/mkdctype/mkdctype.c b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
index 0054e917b38..ff798765524 100644
--- a/usr.bin/tn3270/tools/mkdctype/mkdctype.c
+++ b/usr.bin/tn3270/tools/mkdctype/mkdctype.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $ */
+/* $OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkdctype.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.2 1996/06/26 05:41:39 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdctype.c,v 1.3 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#include "../api/ebc_disp.h"
diff --git a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
index d049c1f576d..2a3009679c6 100644
--- a/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
+++ b/usr.bin/tn3270/tools/mkdstoas/mkdstoas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $ */
+/* $OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkdstoas.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.2 1996/06/26 05:41:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkdstoas.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.c b/usr.bin/tn3270/tools/mkhits/dohits.c
index 5afa59815d6..5e6ba71805e 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.c
+++ b/usr.bin/tn3270/tools/mkhits/dohits.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dohits.c,v 1.7 2003/04/25 18:56:14 avsm Exp $ */
+/* $OpenBSD: dohits.c,v 1.8 2003/06/03 02:56:20 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)dohits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: dohits.c,v 1.7 2003/04/25 18:56:14 avsm Exp $";
+static char rcsid[] = "$OpenBSD: dohits.c,v 1.8 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/tools/mkhits/dohits.h b/usr.bin/tn3270/tools/mkhits/dohits.h
index 3ef0f1973df..48e53780c7d 100644
--- a/usr.bin/tn3270/tools/mkhits/dohits.h
+++ b/usr.bin/tn3270/tools/mkhits/dohits.h
@@ -1,4 +1,4 @@
-/* * $OpenBSD: dohits.h,v 1.2 1996/06/26 05:41:42 deraadt Exp $*/
+/* * $OpenBSD: dohits.h,v 1.3 2003/06/03 02:56:20 millert Exp $*/
/*-
* Copyright (c) 1988 The Regents of the University of California.
* All rights reserved.
@@ -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/usr.bin/tn3270/tools/mkhits/mkhits.c b/usr.bin/tn3270/tools/mkhits/mkhits.c
index c5bff29d793..69b22be6679 100644
--- a/usr.bin/tn3270/tools/mkhits/mkhits.c
+++ b/usr.bin/tn3270/tools/mkhits/mkhits.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $ */
+/* $OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)mkhits.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: mkhits.c,v 1.2 1996/06/26 05:41:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: mkhits.c,v 1.3 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/tn3270/tools/mkmake.y b/usr.bin/tn3270/tools/mkmake.y
index d584d3bc73c..5002ba93ba5 100644
--- a/usr.bin/tn3270/tools/mkmake.y
+++ b/usr.bin/tn3270/tools/mkmake.y
@@ -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.
*
@@ -35,7 +31,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)mkmake.y 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$Id: mkmake.y,v 1.3 2003/04/06 22:02:05 tedu Exp $";
+static char rcsid[] = "$Id: mkmake.y,v 1.4 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
typedef struct string {
diff --git a/usr.bin/tn3270/tools/prt3270.c b/usr.bin/tn3270/tools/prt3270.c
index 37d6e4c196d..b030b2d0759 100644
--- a/usr.bin/tn3270/tools/prt3270.c
+++ b/usr.bin/tn3270/tools/prt3270.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prt3270.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $ */
+/* $OpenBSD: prt3270.c,v 1.5 2003/06/03 02:56:19 millert Exp $ */
/*-
* Copyright (c) 1988 The Regents of the University of California.
@@ -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.
*
@@ -41,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)prt3270.c 4.2 (Berkeley) 4/26/91";*/
-static char rcsid[] = "$OpenBSD: prt3270.c,v 1.4 2003/04/04 22:13:10 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: prt3270.c,v 1.5 2003/06/03 02:56:19 millert Exp $";
#endif /* not lint */
#if defined(unix)
diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1
index 6ba8d388c5a..0f8fd326fed 100644
--- a/usr.bin/touch/touch.1
+++ b/usr.bin/touch/touch.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: touch.1,v 1.7 2003/01/10 09:12:47 henning Exp $
+.\" $OpenBSD: touch.1,v 1.8 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: touch.1,v 1.8 1995/08/31 22:10:05 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index 663c886979f..67dcda028d3 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: touch.c,v 1.8 2003/01/10 11:42:00 henning Exp $ */
+/* $OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$OpenBSD: touch.c,v 1.8 2003/01/10 11:42:00 henning Exp $";
+static char rcsid[] = "$OpenBSD: touch.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index d1bddada9bc..71b0e095c1e 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tput.1,v 1.12 2001/08/03 16:03:02 mpech Exp $
+.\" $OpenBSD: tput.1,v 1.13 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tr/extern.h b/usr.bin/tr/extern.h
index 23ff5186f72..8d062ab943b 100644
--- a/usr.bin/tr/extern.h
+++ b/usr.bin/tr/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.5 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.6 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: extern.h,v 1.4 1995/11/01 00:45:22 pk Exp $ */
/*-
@@ -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/usr.bin/tr/str.c b/usr.bin/tr/str.c
index c0c228af9e2..95312fd5769 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: str.c,v 1.7 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: str.c,v 1.8 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: str.c,v 1.7 1995/08/31 22:13:47 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95";
#endif
-static char rcsid[] = "$OpenBSD: str.c,v 1.7 2002/02/16 21:27:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: str.c,v 1.8 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.1 b/usr.bin/tr/tr.1
index ba840e6226f..b2ecdaa0455 100644
--- a/usr.bin/tr/tr.1
+++ b/usr.bin/tr/tr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tr.1,v 1.7 2002/11/14 02:57:28 deraadt Exp $
+.\" $OpenBSD: tr.1,v 1.8 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: tr.1,v 1.5 1994/12/07 08:35:13 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index c15f40700f0..697e2a13445 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tr.c,v 1.8 2002/02/16 21:27:55 millert Exp $ */
+/* $OpenBSD: tr.c,v 1.9 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: tr.c,v 1.5 1995/08/31 22:13:48 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: tr.c,v 1.8 2002/02/16 21:27:55 millert Exp $";
+static char rcsid[] = "$OpenBSD: tr.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 1e3767c3475..aab4736f524 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: true.1,v 1.5 2000/03/11 21:40:05 aaron Exp $
+.\" $OpenBSD: true.1,v 1.6 2003/06/03 02:56:20 millert Exp $
.\"
.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tset/termcap.c b/usr.bin/tset/termcap.c
index a60633f09f3..eea7eeb653d 100644
--- a/usr.bin/tset/termcap.c
+++ b/usr.bin/tset/termcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: termcap.c,v 1.4 2003/04/04 22:03:55 deraadt Exp $ */
+/* $OpenBSD: termcap.c,v 1.5 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: termcap.c,v 1.7 1995/06/05 19:45:52 pk Exp $ */
/*
@@ -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.
*
@@ -35,7 +31,7 @@
*/
#ifndef lint
-static char rcsid[] = "$OpenBSD: termcap.c,v 1.4 2003/04/04 22:03:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: termcap.c,v 1.5 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#define PVECSIZ 32 /* max number of names in path */
diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1
index 59c670f996e..2b5d8456242 100644
--- a/usr.bin/tset/tset.1
+++ b/usr.bin/tset/tset.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tset.1,v 1.11 2003/01/10 09:16:41 henning Exp $
+.\" $OpenBSD: tset.1,v 1.12 2003/06/03 02:56:20 millert Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index 32c155120a2..441f0943376 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tset.c,v 1.25 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: tset.c,v 1.26 2003/06/03 02:56:20 millert Exp $ */
/****************************************************************************
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
@@ -53,11 +53,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/tsort/tsort.1 b/usr.bin/tsort/tsort.1
index f4d26c2fac2..5ade4b9db05 100644
--- a/usr.bin/tsort/tsort.1
+++ b/usr.bin/tsort/tsort.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tsort.1,v 1.12 2002/11/18 20:20:56 millert Exp $
+.\" $OpenBSD: tsort.1,v 1.13 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: tsort.1,v 1.6 1996/01/17 20:37:49 mycroft Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 5ab7c8d450b..e78dcbb96e0 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tty.1,v 1.9 2000/03/11 21:40:06 aaron Exp $
+.\" $OpenBSD: tty.1,v 1.10 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: tty.1,v 1.4 1994/12/07 00:46:55 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index ca98c05e2c2..1bda56010ed 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.3 2002/02/16 21:27:56 millert Exp $ */
+/* $OpenBSD: tty.c,v 1.4 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: tty.c,v 1.4 1994/12/07 00:46:57 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tty.c,v 1.3 2002/02/16 21:27:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: tty.c,v 1.4 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index aeb715074fa..63d44d29be9 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ul.1,v 1.9 2003/03/10 15:37:30 jmc Exp $
+.\" $OpenBSD: ul.1,v 1.10 2003/06/03 02:56:20 millert Exp $
.\" $NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 13364fe981e..e20e5692f41 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ul.c,v 1.8 2003/04/07 21:13:54 deraadt Exp $ */
+/* $OpenBSD: ul.c,v 1.9 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: ul.c,v 1.3 1994/12/07 00:28:24 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)ul.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: ul.c,v 1.8 2003/04/07 21:13:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: ul.c,v 1.9 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 95ca5cb4c1f..4ea3fa1ced1 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uname.1,v 1.9 2000/11/09 17:52:45 aaron Exp $
+.\" $OpenBSD: uname.1,v 1.10 2003/06/03 02:56:20 millert Exp $
.\"
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index a1bdc4b9119..fd0626050a1 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unexpand.c,v 1.6 2003/04/05 20:30:45 deraadt Exp $ */
+/* $OpenBSD: unexpand.c,v 1.7 2003/06/03 02:56:20 millert Exp $ */
/* $NetBSD: unexpand.c,v 1.5 1994/12/24 17:08:05 cgd Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)unexpand.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: unexpand.c,v 1.6 2003/04/05 20:30:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: unexpand.c,v 1.7 2003/06/03 02:56:20 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 13ce3508232..3540de230d5 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: unifdef.1,v 1.11 2003/01/22 18:26:15 deraadt Exp $
+.\" $OpenBSD: unifdef.1,v 1.12 2003/06/03 02:56:20 millert Exp $
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -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/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index aa0d8a05ed6..44e6589706a 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unifdef.c,v 1.9 2003/01/22 18:26:15 deraadt Exp $ */
+/* $OpenBSD: unifdef.c,v 1.10 2003/06/03 02:56:21 millert Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static char sccsid[] = "@(#)unifdef.c 8.1 (Berkeley) 6/6/93";
#endif
-static const char rcsid[] = "$OpenBSD: unifdef.c,v 1.9 2003/01/22 18:26:15 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: unifdef.c,v 1.10 2003/06/03 02:56:21 millert Exp $";
#endif
/*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index 605e007a293..0785b86ee9f 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uniq.1,v 1.7 2003/01/11 11:07:50 hugh Exp $
+.\" $OpenBSD: uniq.1,v 1.8 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: uniq.1,v 1.5 1994/12/06 07:51:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index cf87f41101f..29006d67298 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uniq.c,v 1.13 2003/04/05 16:17:26 deraadt Exp $ */
+/* $OpenBSD: uniq.c,v 1.14 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: uniq.c,v 1.7 1995/08/31 22:03:48 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95";
#endif
-static char rcsid[] = "$OpenBSD: uniq.c,v 1.13 2003/04/05 16:17:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: uniq.c,v 1.14 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <errno.h>
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index 7d17bccd508..2504a9433d1 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: unvis.1,v 1.4 1999/06/05 01:21:45 aaron Exp $
+.\" $OpenBSD: unvis.1,v 1.5 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: unvis.1,v 1.3 1994/12/06 07:36:08 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index e0532cd616b..3bf4963d04d 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unvis.c,v 1.5 2002/02/16 21:27:56 millert Exp $ */
+/* $OpenBSD: unvis.c,v 1.6 2003/06/03 02:56:21 millert Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: unvis.c,v 1.5 2002/02/16 21:27:56 millert Exp $";
+static char rcsid[] = "$OpenBSD: unvis.c,v 1.6 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 7a19341d9c5..54705462635 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: users.1,v 1.4 1999/06/05 01:21:46 aaron Exp $
+.\" $OpenBSD: users.1,v 1.5 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: users.1,v 1.4 1994/12/06 07:32:27 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index dcaac2ee449..60e350e1b84 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: users.c,v 1.6 2002/09/17 19:37:40 deraadt Exp $ */
+/* $OpenBSD: users.c,v 1.7 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)users.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: users.c,v 1.6 2002/09/17 19:37:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: users.c,v 1.7 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 041309e7904..edc194fbe36 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uudecode.c,v 1.9 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: uudecode.c,v 1.10 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: uudecode.c,v 1.6 1994/11/17 07:40:43 jtc Exp $ */
/*-
@@ -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.
*
@@ -42,7 +38,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)uudecode.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: uudecode.c,v 1.9 2001/11/19 19:02:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: uudecode.c,v 1.10 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 224c3d65a6e..27099ae667e 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uuencode.1,v 1.12 2003/01/11 11:07:51 hugh Exp $
+.\" $OpenBSD: uuencode.1,v 1.13 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uuencode/uuencode.5 b/usr.bin/uuencode/uuencode.5
index 64c3079ef37..aa7138102c6 100644
--- a/usr.bin/uuencode/uuencode.5
+++ b/usr.bin/uuencode/uuencode.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uuencode.5,v 1.8 2002/11/09 02:15:55 fgsch Exp $
+.\" $OpenBSD: uuencode.5,v 1.9 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: uuencode.format.5,v 1.3 1994/11/17 07:39:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index 9499aa8655d..7f53eb3a2c9 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uuencode.c,v 1.4 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: uuencode.c,v 1.5 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: uuencode.c,v 1.7 1994/11/17 07:41:15 jtc Exp $ */
/*-
@@ -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.
*
@@ -42,7 +38,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)uuencode.c 8.2 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: uuencode.c,v 1.4 2001/11/19 19:02:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: uuencode.c,v 1.5 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index 68cc59a3329..1ae28547428 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vacation.1,v 1.13 2000/03/14 14:58:24 aaron Exp $
+.\" $OpenBSD: vacation.1,v 1.14 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: vacation.1,v 1.5 1995/08/31 21:57:08 jtc Exp $
.\"
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index c301b89e1da..25dec9e4141 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vacation.c,v 1.18 2003/03/13 09:09:36 deraadt Exp $ */
+/* $OpenBSD: vacation.c,v 1.19 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94";
#endif
-static char rcsid[] = "$OpenBSD: vacation.c,v 1.18 2003/03/13 09:09:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vacation.c,v 1.19 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/vgrind/RETEST/retest.c b/usr.bin/vgrind/RETEST/retest.c
index db06101ad47..dc3aea46a11 100644
--- a/usr.bin/vgrind/RETEST/retest.c
+++ b/usr.bin/vgrind/RETEST/retest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: retest.c,v 1.4 2003/02/19 07:32:36 deraadt Exp $ */
+/* $OpenBSD: retest.c,v 1.5 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: retest.c,v 1.2 1994/11/17 08:28:18 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)retest.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: retest.c,v 1.4 2003/02/19 07:32:36 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: retest.c,v 1.5 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/extern.h b/usr.bin/vgrind/extern.h
index 02f589a62f3..d05e3a16034 100644
--- a/usr.bin/vgrind/extern.h
+++ b/usr.bin/vgrind/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.4 2003/02/19 07:32:36 deraadt Exp $ */
+/* $OpenBSD: extern.h,v 1.5 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: extern.h,v 1.2 1994/11/17 08:27:59 jtc Exp $ */
/*
@@ -14,11 +14,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vgrind/pathnames.h b/usr.bin/vgrind/pathnames.h
index c51d4bdc866..4c47088ed6d 100644
--- a/usr.bin/vgrind/pathnames.h
+++ b/usr.bin/vgrind/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:42:29 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/17 08:28:01 jtc Exp $ */
/*
@@ -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/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c
index b6567781561..efe0d43497b 100644
--- a/usr.bin/vgrind/regexp.c
+++ b/usr.bin/vgrind/regexp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: regexp.c,v 1.6 2003/02/19 07:38:49 deraadt Exp $ */
+/* $OpenBSD: regexp.c,v 1.7 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: regexp.c,v 1.3 1994/11/17 08:28:02 jtc Exp $ */
/*
@@ -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.
*
@@ -45,7 +41,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)regexp.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: regexp.c,v 1.6 2003/02/19 07:38:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: regexp.c,v 1.7 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <ctype.h>
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 3789fa6de88..3daec353ab4 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfontedpr.c,v 1.8 2003/02/19 07:38:49 deraadt Exp $ */
+/* $OpenBSD: vfontedpr.c,v 1.9 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: vfontedpr.c,v 1.7 1998/12/19 23:41:53 christos Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vfontedpr.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.8 2003/02/19 07:38:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vfontedpr.c,v 1.9 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 30a8d10c78f..9b21d08c2f3 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vgrind.1,v 1.8 2000/11/09 17:52:46 aaron Exp $
+.\" $OpenBSD: vgrind.1,v 1.9 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index 290193de692..4c3b9dc9e7e 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,6 +1,6 @@
#!/bin/csh -f
#
-# $OpenBSD: vgrind.sh,v 1.3 1996/10/03 19:32:20 tholo Exp $
+# $OpenBSD: vgrind.sh,v 1.4 2003/06/03 02:56:21 millert Exp $
# $NetBSD: vgrind.sh,v 1.3 1994/11/17 08:28:06 jtc Exp $
#
# Copyright (c) 1980, 1993
@@ -14,11 +14,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index e2bc2add81e..08517b109af 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vgrindefs.5,v 1.10 2003/01/23 08:58:47 jmc Exp $
+.\" $OpenBSD: vgrindefs.5,v 1.11 2003/06/03 02:56:21 millert Exp $
.\" $NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vgrind/vgrindefs.c b/usr.bin/vgrind/vgrindefs.c
index 6494b3455db..862beedf6de 100644
--- a/usr.bin/vgrind/vgrindefs.c
+++ b/usr.bin/vgrind/vgrindefs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vgrindefs.c,v 1.7 2003/04/26 03:35:15 deraadt Exp $ */
+/* $OpenBSD: vgrindefs.c,v 1.8 2003/06/03 02:56:21 millert Exp $ */
/* $NetBSD: vgrindefs.c,v 1.5 1994/12/20 12:05:29 cgd Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)vgrindefs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.7 2003/04/26 03:35:15 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: vgrindefs.c,v 1.8 2003/06/03 02:56:21 millert Exp $";
#endif /* not lint */
#define BUFSIZ 1024
diff --git a/usr.bin/vgrind/vgrindefs.src b/usr.bin/vgrind/vgrindefs.src
index 09a5c06d3de..1dc41752879 100644
--- a/usr.bin/vgrind/vgrindefs.src
+++ b/usr.bin/vgrind/vgrindefs.src
@@ -1,4 +1,4 @@
-# $OpenBSD: vgrindefs.src,v 1.2 1996/06/26 05:42:33 deraadt Exp $
+# $OpenBSD: vgrindefs.src,v 1.3 2003/06/03 02:56:21 millert Exp $
# $NetBSD: vgrindefs.src,v 1.2 1994/11/17 08:28:09 jtc Exp $
#
# Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by the University of
-# California, Berkeley and its contributors.
-# 4. Neither the name of the University nor the names of its contributors
+# 3. Neither the name of the University nor the names of its contributors
# may be used to endorse or promote products derived from this software
# without specific prior written permission.
#
diff --git a/usr.bin/vi/LICENSE b/usr.bin/vi/LICENSE
index 5c8042e751d..bb34822f403 100644
--- a/usr.bin/vi/LICENSE
+++ b/usr.bin/vi/LICENSE
@@ -16,11 +16,7 @@ Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vi/catalog/dump.c b/usr.bin/vi/catalog/dump.c
index 5c2d6131100..49ec8e4cf6b 100644
--- a/usr.bin/vi/catalog/dump.c
+++ b/usr.bin/vi/catalog/dump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dump.c,v 1.2 2001/01/29 01:58:26 niklas Exp $ */
+/* $OpenBSD: dump.c,v 1.3 2003/06/03 02:56:21 millert Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -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/usr.bin/vi/docs/USD.doc/edit/edit.vindex b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
index 378e9b201c2..1bc5bb1491a 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edit.vindex
+++ b/usr.bin/vi/docs/USD.doc/edit/edit.vindex
@@ -1,4 +1,4 @@
-.\" $OpenBSD: edit.vindex,v 1.2 2001/01/29 01:58:33 niklas Exp $
+.\" $OpenBSD: edit.vindex,v 1.3 2003/06/03 02:56:21 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/edit/edittut.ms b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
index 27cd38df753..2d33077a3a0 100644
--- a/usr.bin/vi/docs/USD.doc/edit/edittut.ms
+++ b/usr.bin/vi/docs/USD.doc/edit/edittut.ms
@@ -1,4 +1,4 @@
-.\" $OpenBSD: edittut.ms,v 1.4 2001/01/29 01:58:33 niklas Exp $
+.\" $OpenBSD: edittut.ms,v 1.5 2003/06/03 02:56:21 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/exref/ex.rm b/usr.bin/vi/docs/USD.doc/exref/ex.rm
index 01a907a53a7..dff75ebe110 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.rm
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.rm
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ex.rm,v 1.4 2001/01/29 01:58:34 niklas Exp $
+.\" $OpenBSD: ex.rm,v 1.5 2003/06/03 02:56:21 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/exref/ex.summary b/usr.bin/vi/docs/USD.doc/exref/ex.summary
index 669acd1a697..789ebd791db 100644
--- a/usr.bin/vi/docs/USD.doc/exref/ex.summary
+++ b/usr.bin/vi/docs/USD.doc/exref/ex.summary
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ex.summary,v 1.4 2001/01/29 01:58:34 niklas Exp $
+.\" $OpenBSD: ex.summary,v 1.5 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT b/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
index e3de97a55a0..1bc2b4678d2 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/COPYRIGHT
@@ -20,11 +20,7 @@ permission from Keith Bostic.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
index 58961f08c5e..e3a276d0fd6 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.apwh.ms
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vi.apwh.ms,v 1.3 2001/01/29 01:58:36 niklas Exp $
+.\" $OpenBSD: vi.apwh.ms,v 1.4 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/vitut/vi.chars b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
index 06503954c1d..ef3ff396e08 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.chars
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.chars
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vi.chars,v 1.3 2001/01/29 01:58:37 niklas Exp $
+.\" $OpenBSD: vi.chars,v 1.4 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/vitut/vi.in b/usr.bin/vi/docs/USD.doc/vitut/vi.in
index 1bab591c6a0..80fde7b9441 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.in
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.in
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vi.in,v 1.4 2001/01/29 01:58:37 niklas Exp $
+.\" $OpenBSD: vi.in,v 1.5 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/docs/USD.doc/vitut/vi.summary b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
index 43f4e764fbc..308a6ce0915 100644
--- a/usr.bin/vi/docs/USD.doc/vitut/vi.summary
+++ b/usr.bin/vi/docs/USD.doc/vitut/vi.summary
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vi.summary,v 1.4 2001/01/29 01:58:37 niklas Exp $
+.\" $OpenBSD: vi.summary,v 1.5 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/vi/include/bitstring.h b/usr.bin/vi/include/bitstring.h
index 4657c80bf85..f473245ea73 100644
--- a/usr.bin/vi/include/bitstring.h
+++ b/usr.bin/vi/include/bitstring.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bitstring.h,v 1.2 2001/01/29 01:58:46 niklas Exp $ */
+/* $OpenBSD: bitstring.h,v 1.3 2003/06/03 02:56:22 millert Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 7e8086fee07..c9a9f2e8fe0 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: foldit.c,v 1.3 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: foldit.c,v 1.4 2003/06/03 02:56:22 millert Exp $ */
/* $NetBSD: foldit.c,v 1.4 1994/12/20 16:13:02 jtc Exp $ */
/*-
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)foldit.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: foldit.c,v 1.3 2001/11/19 19:02:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: foldit.c,v 1.4 2003/06/03 02:56:22 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index d5bc28e9e12..f33d0e07873 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vis.1,v 1.7 2003/05/14 06:40:56 pjanzen Exp $
+.\" $OpenBSD: vis.1,v 1.8 2003/06/03 02:56:22 millert Exp $
.\" $NetBSD: vis.1,v 1.5 1994/11/17 07:56:00 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
@@ -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/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 5a6d6f55ba5..42ca4d594f2 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vis.c,v 1.5 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: vis.c,v 1.6 2003/06/03 02:56:22 millert Exp $ */
/* $NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $ */
/*-
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)vis.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: vis.c,v 1.5 2002/02/16 21:27:58 millert Exp $";
+static char rcsid[] = "$OpenBSD: vis.c,v 1.6 2003/06/03 02:56:22 millert Exp $";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index ca60d8c171f..8078911fcad 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmstat.8,v 1.26 2003/02/17 07:24:32 jmc Exp $
+.\" $OpenBSD: vmstat.8,v 1.27 2003/06/03 02:56:22 millert Exp $
.\" $NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 49177d542c6..0096420bb51 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
/* $NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $ */
-/* $OpenBSD: vmstat.c,v 1.76 2003/05/19 05:17:21 art Exp $ */
+/* $OpenBSD: vmstat.c,v 1.77 2003/06/03 02:56:22 millert Exp $ */
/*
* Copyright (c) 1980, 1986, 1991, 1993
@@ -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/usr.bin/w/extern.h b/usr.bin/w/extern.h
index 187117510f0..59a5452dd5d 100644
--- a/usr.bin/w/extern.h
+++ b/usr.bin/w/extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: extern.h,v 1.3 2002/02/16 21:27:58 millert Exp $ */
+/* $OpenBSD: extern.h,v 1.4 2003/06/03 02:56:22 millert Exp $ */
/*-
* Copyright (c) 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 4a0bd50db74..0f8cbf8d1e7 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pr_time.c,v 1.10 2003/03/13 15:47:12 deraadt Exp $ */
+/* $OpenBSD: pr_time.c,v 1.11 2003/06/03 02:56:22 millert Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -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.
*
@@ -37,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94";
#else
-static char *rcsid = "$OpenBSD: pr_time.c,v 1.10 2003/03/13 15:47:12 deraadt Exp $";
+static char *rcsid = "$OpenBSD: pr_time.c,v 1.11 2003/06/03 02:56:22 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 16b03a7c1a2..06c4d9ed813 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: proc_compare.c,v 1.5 2001/11/19 19:02:17 mpech Exp $ */
+/* $OpenBSD: proc_compare.c,v 1.6 2003/06/03 02:56:22 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -37,7 +33,7 @@
#if 0
static char sccsid[] = "@(#)proc_compare.c 8.2 (Berkeley) 9/23/93";
#else
-static char *rcsid = "$OpenBSD: proc_compare.c,v 1.5 2001/11/19 19:02:17 mpech Exp $";
+static char *rcsid = "$OpenBSD: proc_compare.c,v 1.6 2003/06/03 02:56:22 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 121cf2e61db..c89d58ad5cf 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uptime.1,v 1.11 2001/11/09 00:56:24 miod Exp $
+.\" $OpenBSD: uptime.1,v 1.12 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/w/w.1 b/usr.bin/w/w.1
index a29c0908c1e..51c4bdbc5ca 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: w.1,v 1.13 2001/11/09 00:56:24 miod Exp $
+.\" $OpenBSD: w.1,v 1.14 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/w/w.c b/usr.bin/w/w.c
index 8f9b4551249..1e2d7f748b3 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: w.c,v 1.38 2002/09/17 19:37:40 deraadt Exp $ */
+/* $OpenBSD: w.c,v 1.39 2003/06/03 02:56:22 millert Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -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.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94";
#else
-static char *rcsid = "$OpenBSD: w.c,v 1.38 2002/09/17 19:37:40 deraadt Exp $";
+static char *rcsid = "$OpenBSD: w.c,v 1.39 2003/06/03 02:56:22 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 64c76412cf0..7459810918c 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttymsg.c,v 1.11 2003/04/02 20:07:49 deraadt Exp $ */
+/* $OpenBSD: ttymsg.c,v 1.12 2003/06/03 02:56:22 millert Exp $ */
/* $NetBSD: ttymsg.c,v 1.3 1994/11/17 07:17:55 jtc Exp $ */
/*
@@ -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.
*
@@ -38,7 +34,7 @@
#if 0
static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93";
#endif
-static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.11 2003/04/02 20:07:49 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: ttymsg.c,v 1.12 2003/06/03 02:56:22 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 6f749944d29..67832a2dbb5 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wall.1,v 1.8 2000/11/09 17:52:47 aaron Exp $
+.\" $OpenBSD: wall.1,v 1.9 2003/06/03 02:56:22 millert Exp $
.\" $NetBSD: wall.1,v 1.3 1994/11/17 07:17:57 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 9232f2799ac..5f34c3a2557 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wall.c,v 1.17 2001/11/05 13:11:07 deraadt Exp $ */
+/* $OpenBSD: wall.c,v 1.18 2003/06/03 02:56:22 millert Exp $ */
/* $NetBSD: wall.c,v 1.6 1994/11/17 07:17:58 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
#endif
-static const char rcsid[] = "$OpenBSD: wall.c,v 1.17 2001/11/05 13:11:07 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: wall.c,v 1.18 2003/06/03 02:56:22 millert Exp $";
#endif /* not lint */
/*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 51017cef929..a4362efb4a4 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wc.1,v 1.11 2003/01/12 18:15:16 deraadt Exp $
+.\" $OpenBSD: wc.1,v 1.12 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index af35e83d58d..9904396b399 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wc.c,v 1.8 2002/09/17 19:37:40 deraadt Exp $ */
+/* $OpenBSD: wc.c,v 1.9 2003/06/03 02:56:22 millert Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-static char rcsid[] = "$OpenBSD: wc.c,v 1.8 2002/09/17 19:37:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wc.c,v 1.9 2003/06/03 02:56:22 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 294cbc2dd5c..c50a314494d 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: what.1,v 1.8 2003/05/02 21:12:48 nino Exp $
+.\" $OpenBSD: what.1,v 1.9 2003/06/03 02:56:22 millert Exp $
.\" $NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 0091beb2078..54e408ab1ad 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: what.c,v 1.8 2003/05/02 21:12:48 nino Exp $ */
+/* $OpenBSD: what.c,v 1.9 2003/06/03 02:56:22 millert Exp $ */
/* $NetBSD: what.c,v 1.4 1994/12/20 16:01:03 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: what.c,v 1.8 2003/05/02 21:12:48 nino Exp $";
+static char rcsid[] = "$OpenBSD: what.c,v 1.9 2003/06/03 02:56:22 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 3186d347ff2..2576dae0449 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whatis.1,v 1.9 2001/05/01 17:58:05 aaron Exp $
+.\" $OpenBSD: whatis.1,v 1.10 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index 79ff0e59385..dc063447787 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: whatis.c,v 1.7 2002/02/16 21:27:59 millert Exp $ */
+/* $OpenBSD: whatis.c,v 1.8 2003/06/03 02:56:22 millert Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index 63941f714fc..99237816db2 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whereis.1,v 1.7 2000/03/14 14:58:26 aaron Exp $
+.\" $OpenBSD: whereis.1,v 1.8 2003/06/03 02:56:22 millert Exp $
.\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
.\"
.\" Copyright (c) 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index ab72dd2d22d..2590a138e03 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: which.1,v 1.12 2000/03/14 14:58:26 aaron Exp $
+.\" $OpenBSD: which.1,v 1.13 2003/06/03 02:56:22 millert Exp $
.\"
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
@@ -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/usr.bin/who/who.1 b/usr.bin/who/who.1
index 05ec748b657..8d75bf91738 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: who.1,v 1.16 2002/01/24 20:33:45 mickey Exp $
+.\" $OpenBSD: who.1,v 1.17 2003/06/03 02:56:23 millert Exp $
.\" $NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 37116759072..24979c106ab 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: who.c,v 1.14 2003/04/14 03:13:07 deraadt Exp $ */
+/* $OpenBSD: who.c,v 1.15 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: who.c,v 1.4 1994/12/07 04:28:49 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: who.c,v 1.14 2003/04/14 03:13:07 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: who.c,v 1.15 2003/06/03 02:56:23 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 0ada003ca7e..2ffa5c46048 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whois.1,v 1.19 2003/01/07 17:24:08 millert Exp $
+.\" $OpenBSD: whois.1,v 1.20 2003/06/03 02:56:23 millert Exp $
.\" $NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index d8df80d9969..a46327f6930 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: whois.c,v 1.25 2003/04/15 23:30:33 millert Exp $ */
+/* $OpenBSD: whois.c,v 1.26 2003/06/03 02:56:23 millert Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -43,7 +39,7 @@ static const char copyright[] =
#if 0
static const char sccsid[] = "@(#)whois.c 8.1 (Berkeley) 6/6/93";
#else
-static const char rcsid[] = "$OpenBSD: whois.c,v 1.25 2003/04/15 23:30:33 millert Exp $";
+static const char rcsid[] = "$OpenBSD: whois.c,v 1.26 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/README b/usr.bin/window/README
index 6178f183b2d..f643ee2e18c 100644
--- a/usr.bin/window/README
+++ b/usr.bin/window/README
@@ -1,4 +1,4 @@
-/* $OpenBSD: README,v 1.3 1997/02/25 00:03:51 downsj Exp $ */
+/* $OpenBSD: README,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/alias.h b/usr.bin/window/alias.h
index 8a9c4a3fd79..5a68a1b06ba 100644
--- a/usr.bin/window/alias.h
+++ b/usr.bin/window/alias.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: alias.h,v 1.3 1997/02/25 00:03:52 downsj Exp $ */
+/* $OpenBSD: alias.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: alias.h,v 1.3 1995/09/28 10:33:59 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/char.c b/usr.bin/window/char.c
index b026c04de6b..ddb6d11d15e 100644
--- a/usr.bin/window/char.c
+++ b/usr.bin/window/char.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.c,v 1.4 1999/11/14 17:34:24 millert Exp $ */
+/* $OpenBSD: char.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: char.c,v 1.3 1995/09/28 10:34:00 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)char.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: char.c,v 1.4 1999/11/14 17:34:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: char.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/char.h b/usr.bin/window/char.h
index f078305b132..174b54df280 100644
--- a/usr.bin/window/char.h
+++ b/usr.bin/window/char.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: char.h,v 1.5 2000/04/15 05:22:14 millert Exp $ */
+/* $OpenBSD: char.h,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: char.h,v 1.3 1995/09/28 10:34:01 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/cmd.c b/usr.bin/window/cmd.c
index 83edc70a0e0..136ff62f37d 100644
--- a/usr.bin/window/cmd.c
+++ b/usr.bin/window/cmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd.c,v 1.6 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd.c,v 1.4 1996/02/08 20:44:57 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd1.c b/usr.bin/window/cmd1.c
index 1223878fa3b..9779bfc69a8 100644
--- a/usr.bin/window/cmd1.c
+++ b/usr.bin/window/cmd1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd1.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd1.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd1.c,v 1.4 1996/02/08 20:44:59 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd1.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd1.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd2.c b/usr.bin/window/cmd2.c
index 4885ad9ad66..4b4ca649156 100644
--- a/usr.bin/window/cmd2.c
+++ b/usr.bin/window/cmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd2.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd2.c,v 1.3 1995/09/28 10:34:05 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd2.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd3.c b/usr.bin/window/cmd3.c
index dcd0dd81bb8..737a292d074 100644
--- a/usr.bin/window/cmd3.c
+++ b/usr.bin/window/cmd3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd3.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd3.c,v 1.3 1995/09/28 10:34:07 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd3.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd3.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd4.c b/usr.bin/window/cmd4.c
index 06dcd0ed421..9b9d93a596f 100644
--- a/usr.bin/window/cmd4.c
+++ b/usr.bin/window/cmd4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd4.c,v 1.3 1997/02/25 00:03:58 downsj Exp $ */
+/* $OpenBSD: cmd4.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd4.c,v 1.3 1995/09/28 10:34:08 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd4.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd4.c,v 1.3 1997/02/25 00:03:58 downsj Exp $";
+static char rcsid[] = "$OpenBSD: cmd4.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd5.c b/usr.bin/window/cmd5.c
index 856a4b2a473..84cb928362e 100644
--- a/usr.bin/window/cmd5.c
+++ b/usr.bin/window/cmd5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd5.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd5.c,v 1.3 1995/09/28 10:34:09 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd5.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd5.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd6.c b/usr.bin/window/cmd6.c
index a587a16e314..8021fa9761a 100644
--- a/usr.bin/window/cmd6.c
+++ b/usr.bin/window/cmd6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd6.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd6.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd6.c,v 1.3 1995/09/28 10:34:10 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd6.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd6.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd6.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/cmd7.c b/usr.bin/window/cmd7.c
index d6af5008c05..935b24e3fdb 100644
--- a/usr.bin/window/cmd7.c
+++ b/usr.bin/window/cmd7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd7.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: cmd7.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: cmd7.c,v 1.3 1995/09/28 10:34:12 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)cmd7.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: cmd7.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: cmd7.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/compress.c b/usr.bin/window/compress.c
index ad7ec846195..49e34e3d06a 100644
--- a/usr.bin/window/compress.c
+++ b/usr.bin/window/compress.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: compress.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: compress.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: compress.c,v 1.3 1995/09/28 10:34:13 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)compress.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: compress.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: compress.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.c b/usr.bin/window/context.c
index a86468e61ca..409219677a6 100644
--- a/usr.bin/window/context.c
+++ b/usr.bin/window/context.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: context.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: context.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: context.c,v 1.3 1995/09/28 10:34:15 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)context.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: context.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: context.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/context.h b/usr.bin/window/context.h
index e184b71e3e0..74376d0255e 100644
--- a/usr.bin/window/context.h
+++ b/usr.bin/window/context.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: context.h,v 1.3 1997/02/25 00:04:03 downsj Exp $ */
+/* $OpenBSD: context.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: context.h,v 1.3 1995/09/28 10:34:17 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/defs.h b/usr.bin/window/defs.h
index 1fb9f82c073..3a48cf14676 100644
--- a/usr.bin/window/defs.h
+++ b/usr.bin/window/defs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: defs.h,v 1.5 2000/04/15 05:22:14 millert Exp $ */
+/* $OpenBSD: defs.h,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: defs.h,v 1.3 1995/09/28 10:34:19 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/error.c b/usr.bin/window/error.c
index 959a98b8141..212e6560145 100644
--- a/usr.bin/window/error.c
+++ b/usr.bin/window/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: error.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: error.c,v 1.3 1995/09/28 10:34:20 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.c b/usr.bin/window/lcmd.c
index 5913c1b7555..5dad16c492c 100644
--- a/usr.bin/window/lcmd.c
+++ b/usr.bin/window/lcmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: lcmd.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: lcmd.c,v 1.3 1995/09/28 10:34:21 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lcmd.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: lcmd.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd.h b/usr.bin/window/lcmd.h
index e82f85eb829..9c66cfe1d8b 100644
--- a/usr.bin/window/lcmd.h
+++ b/usr.bin/window/lcmd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd.h,v 1.3 1997/02/25 00:04:06 downsj Exp $ */
+/* $OpenBSD: lcmd.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: lcmd.h,v 1.3 1995/09/28 10:34:22 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/lcmd1.c b/usr.bin/window/lcmd1.c
index 4cef48ec12b..376c6d98ef4 100644
--- a/usr.bin/window/lcmd1.c
+++ b/usr.bin/window/lcmd1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd1.c,v 1.7 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: lcmd1.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: lcmd1.c,v 1.6 1996/02/08 20:45:00 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.7 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: lcmd1.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/lcmd2.c b/usr.bin/window/lcmd2.c
index ef711ea5ac1..ba3f52de454 100644
--- a/usr.bin/window/lcmd2.c
+++ b/usr.bin/window/lcmd2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lcmd2.c,v 1.7 2003/04/17 07:17:18 deraadt Exp $ */
+/* $OpenBSD: lcmd2.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: lcmd2.c,v 1.7 1995/09/29 00:44:04 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lcmd2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.7 2003/04/17 07:17:18 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lcmd2.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/local.h b/usr.bin/window/local.h
index b5dea77a0f6..6612949e07a 100644
--- a/usr.bin/window/local.h
+++ b/usr.bin/window/local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: local.h,v 1.4 1999/11/14 17:34:24 millert Exp $ */
+/* $OpenBSD: local.h,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: local.h,v 1.3 1995/09/28 10:34:26 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/main.c b/usr.bin/window/main.c
index 4479b9b6c6e..61696f9eb7e 100644
--- a/usr.bin/window/main.c
+++ b/usr.bin/window/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.7 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: main.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: main.c,v 1.6 1996/02/08 20:45:01 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 8.2 (Berkeley) 4/2/94";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/mloop.c b/usr.bin/window/mloop.c
index 0ee7373a422..4549b141ad3 100644
--- a/usr.bin/window/mloop.c
+++ b/usr.bin/window/mloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mloop.c,v 1.6 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: mloop.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: mloop.c,v 1.5 1996/02/08 20:45:03 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)mloop.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: mloop.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: mloop.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser.h b/usr.bin/window/parser.h
index f38260dc612..107705564e3 100644
--- a/usr.bin/window/parser.h
+++ b/usr.bin/window/parser.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser.h,v 1.3 1997/02/25 00:04:11 downsj Exp $ */
+/* $OpenBSD: parser.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser.h,v 1.3 1995/09/28 10:34:29 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/parser1.c b/usr.bin/window/parser1.c
index 3f83e36df51..4c993562125 100644
--- a/usr.bin/window/parser1.c
+++ b/usr.bin/window/parser1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser1.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: parser1.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser1.c,v 1.3 1995/09/28 10:34:31 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser1.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: parser1.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: parser1.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser2.c b/usr.bin/window/parser2.c
index b29f19f813b..346e474e734 100644
--- a/usr.bin/window/parser2.c
+++ b/usr.bin/window/parser2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: parser2.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser2.c,v 1.3 1995/09/28 10:34:32 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser2.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: parser2.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: parser2.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser3.c b/usr.bin/window/parser3.c
index e8fde0dc689..a85788f9755 100644
--- a/usr.bin/window/parser3.c
+++ b/usr.bin/window/parser3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: parser3.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser3.c,v 1.3 1995/09/28 10:34:33 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser3.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: parser3.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: parser3.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser4.c b/usr.bin/window/parser4.c
index 1f0cb44cb46..a684060a06e 100644
--- a/usr.bin/window/parser4.c
+++ b/usr.bin/window/parser4.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser4.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: parser4.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser4.c,v 1.5 1995/09/29 00:44:05 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser4.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: parser4.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: parser4.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/parser5.c b/usr.bin/window/parser5.c
index 52bc98f6ebd..c4251391033 100644
--- a/usr.bin/window/parser5.c
+++ b/usr.bin/window/parser5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: parser5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: parser5.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: parser5.c,v 1.3 1995/09/28 10:34:35 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser5.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: parser5.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: parser5.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/scanner.c b/usr.bin/window/scanner.c
index 1012c2f49ef..dada6b02a41 100644
--- a/usr.bin/window/scanner.c
+++ b/usr.bin/window/scanner.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scanner.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: scanner.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: scanner.c,v 1.3 1995/09/28 10:34:36 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)scanner.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: scanner.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: scanner.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/startup.c b/usr.bin/window/startup.c
index d4e752221e4..e800babfcd9 100644
--- a/usr.bin/window/startup.c
+++ b/usr.bin/window/startup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: startup.c,v 1.7 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: startup.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: startup.c,v 1.4 1996/02/08 20:45:04 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)startup.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: startup.c,v 1.7 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: startup.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/string.c b/usr.bin/window/string.c
index 46bf81a3643..bf30b4e1f0d 100644
--- a/usr.bin/window/string.c
+++ b/usr.bin/window/string.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: string.c,v 1.6 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: string.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: string.c,v 1.5 1995/09/29 00:44:06 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)string.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: string.c,v 1.6 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: string.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/string.h b/usr.bin/window/string.h
index 5e6355b1ce8..637931bd796 100644
--- a/usr.bin/window/string.h
+++ b/usr.bin/window/string.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: string.h,v 1.3 1997/02/25 00:04:18 downsj Exp $ */
+/* $OpenBSD: string.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: string.h,v 1.3 1995/09/28 10:34:40 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/token.h b/usr.bin/window/token.h
index 1b77e96062c..19dded9edeb 100644
--- a/usr.bin/window/token.h
+++ b/usr.bin/window/token.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: token.h,v 1.3 1997/02/25 00:04:19 downsj Exp $ */
+/* $OpenBSD: token.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: token.h,v 1.3 1995/09/28 10:34:41 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/tt.h b/usr.bin/window/tt.h
index 196815af4f9..b55bd59ec65 100644
--- a/usr.bin/window/tt.h
+++ b/usr.bin/window/tt.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tt.h,v 1.3 1997/02/25 00:04:20 downsj Exp $ */
+/* $OpenBSD: tt.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: tt.h,v 1.3 1995/09/28 10:34:42 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/ttf100.c b/usr.bin/window/ttf100.c
index 85bdfe46e3c..9fa23a8199c 100644
--- a/usr.bin/window/ttf100.c
+++ b/usr.bin/window/ttf100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttf100.c,v 1.3 1997/02/25 00:04:21 downsj Exp $ */
+/* $OpenBSD: ttf100.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttf100.c,v 1.3 1995/09/28 10:34:44 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttf100.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttf100.c,v 1.3 1997/02/25 00:04:21 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttf100.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttgeneric.c b/usr.bin/window/ttgeneric.c
index 32faf547a8d..9df0390dbf3 100644
--- a/usr.bin/window/ttgeneric.c
+++ b/usr.bin/window/ttgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttgeneric.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: ttgeneric.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttgeneric.c,v 1.3 1995/09/28 10:34:45 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttgeneric.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: ttgeneric.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth19.c b/usr.bin/window/tth19.c
index e94367fc3c1..d1aec093c6a 100644
--- a/usr.bin/window/tth19.c
+++ b/usr.bin/window/tth19.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tth19.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: tth19.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: tth19.c,v 1.3 1995/09/28 10:34:47 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tth19.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tth19.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tth19.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tth29.c b/usr.bin/window/tth29.c
index 5f046a8ecc1..008ed020ccd 100644
--- a/usr.bin/window/tth29.c
+++ b/usr.bin/window/tth29.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tth29.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: tth29.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: tth29.c,v 1.3 1995/09/28 10:34:48 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tth29.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tth29.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tth29.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttinit.c b/usr.bin/window/ttinit.c
index 640dbae420b..458ac299ee3 100644
--- a/usr.bin/window/ttinit.c
+++ b/usr.bin/window/ttinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttinit.c,v 1.9 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: ttinit.c,v 1.10 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttinit.c,v 1.3 1995/09/28 10:34:50 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttinit.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttinit.c,v 1.9 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: ttinit.c,v 1.10 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttoutput.c b/usr.bin/window/ttoutput.c
index 93bb66f0dcd..58db1f05ba3 100644
--- a/usr.bin/window/ttoutput.c
+++ b/usr.bin/window/ttoutput.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttoutput.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: ttoutput.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttoutput.c,v 1.3 1995/09/28 10:34:51 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttoutput.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: ttoutput.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttermcap.c b/usr.bin/window/tttermcap.c
index 956985da3ed..addf62810a1 100644
--- a/usr.bin/window/tttermcap.c
+++ b/usr.bin/window/tttermcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tttermcap.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: tttermcap.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: tttermcap.c,v 1.3 1995/09/28 10:34:52 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tttermcap.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tttermcap.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/tttvi925.c b/usr.bin/window/tttvi925.c
index 9b50d8085c1..8ddbad3a066 100644
--- a/usr.bin/window/tttvi925.c
+++ b/usr.bin/window/tttvi925.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tttvi925.c,v 1.3 1997/02/25 00:04:26 downsj Exp $ */
+/* $OpenBSD: tttvi925.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: tttvi925.c,v 1.3 1995/09/28 10:34:54 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tttvi925.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: tttvi925.c,v 1.3 1997/02/25 00:04:26 downsj Exp $";
+static char rcsid[] = "$OpenBSD: tttvi925.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse60.c b/usr.bin/window/ttwyse60.c
index e3c208c4241..b98a028778a 100644
--- a/usr.bin/window/ttwyse60.c
+++ b/usr.bin/window/ttwyse60.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttwyse60.c,v 1.3 1997/02/25 00:04:27 downsj Exp $ */
+/* $OpenBSD: ttwyse60.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttwyse60.c,v 1.3 1995/09/28 10:34:55 tls Exp $ */
/*
@@ -23,11 +23,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.
*
@@ -48,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse60.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttwyse60.c,v 1.3 1997/02/25 00:04:27 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse60.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttwyse75.c b/usr.bin/window/ttwyse75.c
index d63fb6fb04c..e06d324667b 100644
--- a/usr.bin/window/ttwyse75.c
+++ b/usr.bin/window/ttwyse75.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttwyse75.c,v 1.3 1997/02/25 00:04:28 downsj Exp $ */
+/* $OpenBSD: ttwyse75.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttwyse75.c,v 1.3 1995/09/28 10:34:56 tls Exp $ */
/*
@@ -23,11 +23,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.
*
@@ -48,7 +44,7 @@
#if 0
static char sccsid[] = "@(#)ttwyse75.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttwyse75.c,v 1.3 1997/02/25 00:04:28 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttwyse75.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzapple.c b/usr.bin/window/ttzapple.c
index 6d3da2a146e..3a77a744683 100644
--- a/usr.bin/window/ttzapple.c
+++ b/usr.bin/window/ttzapple.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttzapple.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: ttzapple.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttzapple.c,v 1.3 1995/09/28 10:34:57 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttzapple.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: ttzapple.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/ttzentec.c b/usr.bin/window/ttzentec.c
index fdfe8259cca..8162dd6c275 100644
--- a/usr.bin/window/ttzentec.c
+++ b/usr.bin/window/ttzentec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ttzentec.c,v 1.3 1997/02/25 00:04:29 downsj Exp $ */
+/* $OpenBSD: ttzentec.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ttzentec.c,v 1.3 1995/09/28 10:34:58 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)ttzentec.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: ttzentec.c,v 1.3 1997/02/25 00:04:29 downsj Exp $";
+static char rcsid[] = "$OpenBSD: ttzentec.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/value.h b/usr.bin/window/value.h
index cb6d1c71ab5..0a5bf2f9c3d 100644
--- a/usr.bin/window/value.h
+++ b/usr.bin/window/value.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: value.h,v 1.3 1997/02/25 00:04:30 downsj Exp $ */
+/* $OpenBSD: value.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: value.h,v 1.3 1995/09/28 10:35:00 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/var.c b/usr.bin/window/var.c
index b205f6bbd63..0a48614c9ee 100644
--- a/usr.bin/window/var.c
+++ b/usr.bin/window/var.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: var.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: var.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: var.c,v 1.4 1995/09/28 10:35:01 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)var.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: var.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: var.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/var.h b/usr.bin/window/var.h
index 018a3ab4375..46027b88496 100644
--- a/usr.bin/window/var.h
+++ b/usr.bin/window/var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: var.h,v 1.3 1997/02/25 00:04:32 downsj Exp $ */
+/* $OpenBSD: var.h,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: var.h,v 1.3 1995/09/28 10:35:02 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/win.c b/usr.bin/window/win.c
index ab494ccc425..defd86a030a 100644
--- a/usr.bin/window/win.c
+++ b/usr.bin/window/win.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: win.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: win.c,v 1.8 1996/02/08 21:07:57 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)win.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: win.c,v 1.6 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: win.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index ed9f30d814a..c10cab69337 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: window.1,v 1.14 2003/03/10 15:37:30 jmc Exp $
+.\" $OpenBSD: window.1,v 1.15 2003/06/03 02:56:23 millert Exp $
.\" $NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -15,11 +15,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/window/windowrc b/usr.bin/window/windowrc
index ecf83a4ed01..437584d41d9 100644
--- a/usr.bin/window/windowrc
+++ b/usr.bin/window/windowrc
@@ -1,4 +1,4 @@
-# $OpenBSD: windowrc,v 1.4 2002/05/06 23:34:33 millert Exp $
+# $OpenBSD: windowrc,v 1.5 2003/06/03 02:56:23 millert Exp $
#
# Copyright (c) 1983, 1993
# The Regents of the University of California. All rights reserved.
@@ -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/usr.bin/window/ww.h b/usr.bin/window/ww.h
index fe8c6ef4456..6cbe1137cf9 100644
--- a/usr.bin/window/ww.h
+++ b/usr.bin/window/ww.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ww.h,v 1.8 2002/06/12 06:07:17 mpech Exp $ */
+/* $OpenBSD: ww.h,v 1.9 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: ww.h,v 1.9 1996/10/12 23:46:23 christos Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/wwadd.c b/usr.bin/window/wwadd.c
index a057e9a8764..2ffb61188d7 100644
--- a/usr.bin/window/wwadd.c
+++ b/usr.bin/window/wwadd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwadd.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwadd.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwadd.c,v 1.4 1996/02/08 21:48:56 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwadd.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwadd.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwadd.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwalloc.c b/usr.bin/window/wwalloc.c
index 693d8ae3466..9a8c56c5b3e 100644
--- a/usr.bin/window/wwalloc.c
+++ b/usr.bin/window/wwalloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwalloc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwalloc.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwalloc.c,v 1.3 1995/09/28 10:35:10 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwalloc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwalloc.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwbox.c b/usr.bin/window/wwbox.c
index 83c43a9a1e7..4b2834bc5bf 100644
--- a/usr.bin/window/wwbox.c
+++ b/usr.bin/window/wwbox.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwbox.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwbox.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwbox.c,v 1.3 1995/09/28 10:35:11 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwbox.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwbox.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwbox.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwchild.c b/usr.bin/window/wwchild.c
index 68ecccce55a..90709befe1a 100644
--- a/usr.bin/window/wwchild.c
+++ b/usr.bin/window/wwchild.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwchild.c,v 1.6 2002/06/12 06:07:17 mpech Exp $ */
+/* $OpenBSD: wwchild.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwchild.c,v 1.3 1995/09/28 10:35:13 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwchild.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwchild.c,v 1.6 2002/06/12 06:07:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwchild.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclose.c b/usr.bin/window/wwclose.c
index 9f97a54c485..6221eb04c3b 100644
--- a/usr.bin/window/wwclose.c
+++ b/usr.bin/window/wwclose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwclose.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwclose.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwclose.c,v 1.3 1995/09/28 10:35:14 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclose.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwclose.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwclose.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreol.c b/usr.bin/window/wwclreol.c
index a361a5495ef..e7535ec1dc5 100644
--- a/usr.bin/window/wwclreol.c
+++ b/usr.bin/window/wwclreol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwclreol.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwclreol.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwclreol.c,v 1.4 1996/02/08 21:48:58 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclreol.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwclreol.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwclreos.c b/usr.bin/window/wwclreos.c
index 5a2007a5005..8fd711221b8 100644
--- a/usr.bin/window/wwclreos.c
+++ b/usr.bin/window/wwclreos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwclreos.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwclreos.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwclreos.c,v 1.4 1996/02/08 20:45:07 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwclreos.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwclreos.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwcursor.c b/usr.bin/window/wwcursor.c
index 8dfa9b2633c..715f8e0177c 100644
--- a/usr.bin/window/wwcursor.c
+++ b/usr.bin/window/wwcursor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwcursor.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwcursor.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwcursor.c,v 1.4 1996/02/08 20:45:08 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwcursor.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwcursor.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdata.c b/usr.bin/window/wwdata.c
index 0b180d41717..6dd25d09dac 100644
--- a/usr.bin/window/wwdata.c
+++ b/usr.bin/window/wwdata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwdata.c,v 1.3 1997/02/25 00:04:45 downsj Exp $ */
+/* $OpenBSD: wwdata.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwdata.c,v 1.3 1995/09/28 10:35:20 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,6 +37,6 @@
#if 0
static char sccsid[] = "@(#)wwdata.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwdata.c,v 1.3 1997/02/25 00:04:45 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwdata.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelchar.c b/usr.bin/window/wwdelchar.c
index 078c142a152..4309c9a66d7 100644
--- a/usr.bin/window/wwdelchar.c
+++ b/usr.bin/window/wwdelchar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwdelchar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwdelchar.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwdelchar.c,v 1.4 1996/02/08 21:49:00 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelchar.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwdelchar.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelete.c b/usr.bin/window/wwdelete.c
index 39b1cc4a708..f7499010582 100644
--- a/usr.bin/window/wwdelete.c
+++ b/usr.bin/window/wwdelete.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwdelete.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwdelete.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwdelete.c,v 1.4 1996/02/08 21:49:01 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelete.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwdelete.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdelline.c b/usr.bin/window/wwdelline.c
index d4ae9cc0cb4..e5948f5df97 100644
--- a/usr.bin/window/wwdelline.c
+++ b/usr.bin/window/wwdelline.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwdelline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwdelline.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwdelline.c,v 1.3 1995/09/28 10:35:24 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdelline.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwdelline.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwdump.c b/usr.bin/window/wwdump.c
index 02713cd8333..8a36c56de05 100644
--- a/usr.bin/window/wwdump.c
+++ b/usr.bin/window/wwdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwdump.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: wwdump.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwdump.c,v 1.5 1995/09/29 00:44:09 cgd Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwdump.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwdump.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: wwdump.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwend.c b/usr.bin/window/wwend.c
index b11917fff0e..245ea6d23a9 100644
--- a/usr.bin/window/wwend.c
+++ b/usr.bin/window/wwend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwend.c,v 1.3 1997/02/25 00:04:49 downsj Exp $ */
+/* $OpenBSD: wwend.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwend.c,v 1.3 1995/09/28 10:35:26 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwend.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwend.c,v 1.3 1997/02/25 00:04:49 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwend.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwenviron.c b/usr.bin/window/wwenviron.c
index 9a4d719373d..b510259aff8 100644
--- a/usr.bin/window/wwenviron.c
+++ b/usr.bin/window/wwenviron.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwenviron.c,v 1.7 2002/06/12 06:07:17 mpech Exp $ */
+/* $OpenBSD: wwenviron.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwenviron.c,v 1.4 1995/12/21 08:39:50 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwenviron.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.7 2002/06/12 06:07:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwenviron.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwerror.c b/usr.bin/window/wwerror.c
index 50eead803a5..7359f309ce8 100644
--- a/usr.bin/window/wwerror.c
+++ b/usr.bin/window/wwerror.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwerror.c,v 1.3 1997/02/25 00:04:51 downsj Exp $ */
+/* $OpenBSD: wwerror.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwerror.c,v 1.3 1995/09/28 10:35:29 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwerror.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwerror.c,v 1.3 1997/02/25 00:04:51 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwerror.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwflush.c b/usr.bin/window/wwflush.c
index 0091db8a6eb..cb09c6b88e0 100644
--- a/usr.bin/window/wwflush.c
+++ b/usr.bin/window/wwflush.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwflush.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwflush.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwflush.c,v 1.5 1995/12/21 10:46:08 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwflush.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwflush.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwflush.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwframe.c b/usr.bin/window/wwframe.c
index f4369e0db29..e369c954ef0 100644
--- a/usr.bin/window/wwframe.c
+++ b/usr.bin/window/wwframe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwframe.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwframe.c,v 1.4 1996/02/08 21:49:05 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwframe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwframe.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwgets.c b/usr.bin/window/wwgets.c
index 57aa628cd51..3584cc4f16d 100644
--- a/usr.bin/window/wwgets.c
+++ b/usr.bin/window/wwgets.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwgets.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwgets.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwgets.c,v 1.6 1996/02/08 20:45:08 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwgets.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwgets.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwgets.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinit.c b/usr.bin/window/wwinit.c
index 1bdd0d3f229..a35a7a9fe84 100644
--- a/usr.bin/window/wwinit.c
+++ b/usr.bin/window/wwinit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwinit.c,v 1.14 2003/04/30 14:59:19 jason Exp $ */
+/* $OpenBSD: wwinit.c,v 1.15 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwinit.c,v 1.11 1996/02/08 21:49:07 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinit.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: wwinit.c,v 1.14 2003/04/30 14:59:19 jason Exp $";
+static char rcsid[] = "$OpenBSD: wwinit.c,v 1.15 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinschar.c b/usr.bin/window/wwinschar.c
index a97a062e81b..29faeb97389 100644
--- a/usr.bin/window/wwinschar.c
+++ b/usr.bin/window/wwinschar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwinschar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwinschar.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwinschar.c,v 1.4 1996/02/08 21:49:09 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinschar.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwinschar.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwinsline.c b/usr.bin/window/wwinsline.c
index b3d9d83eef1..86356c0c735 100644
--- a/usr.bin/window/wwinsline.c
+++ b/usr.bin/window/wwinsline.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwinsline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwinsline.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwinsline.c,v 1.3 1995/09/28 10:35:36 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwinsline.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwinsline.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwiomux.c b/usr.bin/window/wwiomux.c
index 0c1b465751e..8257071028b 100644
--- a/usr.bin/window/wwiomux.c
+++ b/usr.bin/window/wwiomux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwiomux.c,v 1.7 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwiomux.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwiomux.c,v 1.5 1996/02/08 20:45:09 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwiomux.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwiomux.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwlabel.c b/usr.bin/window/wwlabel.c
index 460faec6a5a..e044a9116cf 100644
--- a/usr.bin/window/wwlabel.c
+++ b/usr.bin/window/wwlabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwlabel.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwlabel.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwlabel.c,v 1.4 1996/02/08 21:49:11 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwlabel.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwlabel.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmisc.c b/usr.bin/window/wwmisc.c
index 095fa2f21c6..2f816cfe1d8 100644
--- a/usr.bin/window/wwmisc.c
+++ b/usr.bin/window/wwmisc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwmisc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwmisc.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwmisc.c,v 1.4 1996/02/08 20:45:10 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwmisc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwmisc.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwmove.c b/usr.bin/window/wwmove.c
index 2e410362d36..1aaa9b80e3e 100644
--- a/usr.bin/window/wwmove.c
+++ b/usr.bin/window/wwmove.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwmove.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwmove.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwmove.c,v 1.4 1996/02/08 21:49:14 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwmove.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwmove.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwmove.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwopen.c b/usr.bin/window/wwopen.c
index aece7a0f859..ded2d436ebd 100644
--- a/usr.bin/window/wwopen.c
+++ b/usr.bin/window/wwopen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwopen.c,v 1.8 2002/08/12 00:42:56 aaron Exp $ */
+/* $OpenBSD: wwopen.c,v 1.9 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwopen.c,v 1.6 1996/02/08 21:08:04 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwopen.c 8.2 (Berkeley) 4/28/95";
#else
-static char rcsid[] = "$OpenBSD: wwopen.c,v 1.8 2002/08/12 00:42:56 aaron Exp $";
+static char rcsid[] = "$OpenBSD: wwopen.c,v 1.9 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwprintf.c b/usr.bin/window/wwprintf.c
index 57c73fcc0e8..88c509b8275 100644
--- a/usr.bin/window/wwprintf.c
+++ b/usr.bin/window/wwprintf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwprintf.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: wwprintf.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwprintf.c,v 1.3 1995/09/28 10:35:44 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwprintf.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.5 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: wwprintf.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwpty.c b/usr.bin/window/wwpty.c
index 8be9150aa54..0fe64177d61 100644
--- a/usr.bin/window/wwpty.c
+++ b/usr.bin/window/wwpty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwpty.c,v 1.6 2003/04/05 01:39:50 pvalchev Exp $ */
+/* $OpenBSD: wwpty.c,v 1.7 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwpty.c,v 1.3 1995/09/28 10:35:45 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwpty.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwpty.c,v 1.6 2003/04/05 01:39:50 pvalchev Exp $";
+static char rcsid[] = "$OpenBSD: wwpty.c,v 1.7 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputc.c b/usr.bin/window/wwputc.c
index 9f5d4251a6f..6ba000caab2 100644
--- a/usr.bin/window/wwputc.c
+++ b/usr.bin/window/wwputc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwputc.c,v 1.3 1997/02/25 00:05:03 downsj Exp $ */
+/* $OpenBSD: wwputc.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwputc.c,v 1.3 1995/09/28 10:35:47 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwputc.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwputc.c,v 1.3 1997/02/25 00:05:03 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwputc.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwputs.c b/usr.bin/window/wwputs.c
index 64839f3bd51..a00edb15429 100644
--- a/usr.bin/window/wwputs.c
+++ b/usr.bin/window/wwputs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwputs.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwputs.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwputs.c,v 1.3 1995/09/28 10:35:48 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwputs.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwputs.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwputs.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredraw.c b/usr.bin/window/wwredraw.c
index 16c91497293..a5536f1cdfe 100644
--- a/usr.bin/window/wwredraw.c
+++ b/usr.bin/window/wwredraw.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwredraw.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwredraw.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwredraw.c,v 1.3 1995/09/28 10:35:49 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwredraw.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwredraw.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwredrawwin.c b/usr.bin/window/wwredrawwin.c
index 8632ec4c67f..d166dcd79ec 100644
--- a/usr.bin/window/wwredrawwin.c
+++ b/usr.bin/window/wwredrawwin.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwredrawwin.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwredrawwin.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwredrawwin.c,v 1.4 1996/02/08 21:49:15 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwredrawwin.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwredrawwin.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwrint.c b/usr.bin/window/wwrint.c
index 75018672027..f63fff071d1 100644
--- a/usr.bin/window/wwrint.c
+++ b/usr.bin/window/wwrint.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwrint.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwrint.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwrint.c,v 1.4 1995/12/21 10:46:24 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwrint.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwrint.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwrint.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwscroll.c b/usr.bin/window/wwscroll.c
index 01715bf72fd..2ccda7e461b 100644
--- a/usr.bin/window/wwscroll.c
+++ b/usr.bin/window/wwscroll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwscroll.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwscroll.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwscroll.c,v 1.3 1995/09/28 10:35:53 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwscroll.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwscroll.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsize.c b/usr.bin/window/wwsize.c
index e594b439a8b..9d51ce82aba 100644
--- a/usr.bin/window/wwsize.c
+++ b/usr.bin/window/wwsize.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwsize.c,v 1.7 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwsize.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwsize.c,v 1.5 1996/02/08 20:45:11 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwsize.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwsize.c,v 1.7 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwsize.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwspawn.c b/usr.bin/window/wwspawn.c
index dea85fccc79..e0d94f338b4 100644
--- a/usr.bin/window/wwspawn.c
+++ b/usr.bin/window/wwspawn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwspawn.c,v 1.7 2002/06/12 06:07:17 mpech Exp $ */
+/* $OpenBSD: wwspawn.c,v 1.8 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwspawn.c,v 1.4 1995/12/21 08:39:57 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwspawn.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.7 2002/06/12 06:07:17 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwspawn.c,v 1.8 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwsuspend.c b/usr.bin/window/wwsuspend.c
index 409ce6cce0a..b9726c0ea3e 100644
--- a/usr.bin/window/wwsuspend.c
+++ b/usr.bin/window/wwsuspend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwsuspend.c,v 1.3 1997/02/25 00:05:09 downsj Exp $ */
+/* $OpenBSD: wwsuspend.c,v 1.4 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwsuspend.c,v 1.3 1995/09/28 10:35:56 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwsuspend.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwsuspend.c,v 1.3 1997/02/25 00:05:09 downsj Exp $";
+static char rcsid[] = "$OpenBSD: wwsuspend.c,v 1.4 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwterminfo.c b/usr.bin/window/wwterminfo.c
index 064dc2b4687..a60d58c3512 100644
--- a/usr.bin/window/wwterminfo.c
+++ b/usr.bin/window/wwterminfo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwterminfo.c,v 1.9 2001/07/09 07:04:58 deraadt Exp $ */
+/* $OpenBSD: wwterminfo.c,v 1.10 2003/06/03 02:56:23 millert Exp $ */
/*
* Copyright (c) 1982, 1993
@@ -15,11 +15,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following 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.
*
@@ -40,7 +36,7 @@
#if 0
static char sccsid[] = "@(#)wwterminfo.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwterminfo.c,v 1.9 2001/07/09 07:04:58 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: wwterminfo.c,v 1.10 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwtty.c b/usr.bin/window/wwtty.c
index a04f7d74f5d..9b64cfae592 100644
--- a/usr.bin/window/wwtty.c
+++ b/usr.bin/window/wwtty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwtty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwtty.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwtty.c,v 1.4 1995/12/21 11:06:50 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwtty.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwtty.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwtty.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwunframe.c b/usr.bin/window/wwunframe.c
index e480d7ca3da..468b54062ff 100644
--- a/usr.bin/window/wwunframe.c
+++ b/usr.bin/window/wwunframe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwunframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwunframe.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwunframe.c,v 1.4 1996/02/08 21:49:17 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwunframe.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwunframe.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwupdate.c b/usr.bin/window/wwupdate.c
index 90f3412a153..a44bfb53150 100644
--- a/usr.bin/window/wwupdate.c
+++ b/usr.bin/window/wwupdate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwupdate.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwupdate.c,v 1.5 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwupdate.c,v 1.3 1995/09/28 10:36:00 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwupdate.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwupdate.c,v 1.5 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/wwwrite.c b/usr.bin/window/wwwrite.c
index f86c629a45b..1f66d059b39 100644
--- a/usr.bin/window/wwwrite.c
+++ b/usr.bin/window/wwwrite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wwwrite.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: wwwrite.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: wwwrite.c,v 1.5 1996/02/08 21:49:19 mycroft Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)wwwrite.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: wwwrite.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.c b/usr.bin/window/xx.c
index e3feb8c9289..b6e7a85393b 100644
--- a/usr.bin/window/xx.c
+++ b/usr.bin/window/xx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xx.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: xx.c,v 1.6 2003/06/03 02:56:23 millert Exp $ */
/* $NetBSD: xx.c,v 1.3 1995/09/28 10:36:03 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)xx.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: xx.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: xx.c,v 1.6 2003/06/03 02:56:23 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/window/xx.h b/usr.bin/window/xx.h
index b7a63cce47f..de66f50d194 100644
--- a/usr.bin/window/xx.h
+++ b/usr.bin/window/xx.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xx.h,v 1.3 1997/02/25 00:05:16 downsj Exp $ */
+/* $OpenBSD: xx.h,v 1.4 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: xx.h,v 1.3 1995/09/28 10:36:04 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/window/xxflush.c b/usr.bin/window/xxflush.c
index 9ec199011b7..1cc7ab6f065 100644
--- a/usr.bin/window/xxflush.c
+++ b/usr.bin/window/xxflush.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xxflush.c,v 1.4 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: xxflush.c,v 1.5 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: xxflush.c,v 1.3 1995/09/28 10:36:05 tls Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)xxflush.c 8.1 (Berkeley) 6/6/93";
#else
-static char rcsid[] = "$OpenBSD: xxflush.c,v 1.4 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: xxflush.c,v 1.5 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 494c26e248b..34bcd4ceb19 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: write.1,v 1.8 2002/01/24 20:33:45 mickey Exp $
+.\" $OpenBSD: write.1,v 1.9 2003/06/03 02:56:24 millert Exp $
.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index d086ce6550a..8cef99ff759 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: write.c,v 1.19 2003/03/13 15:47:12 deraadt Exp $ */
+/* $OpenBSD: write.c,v 1.20 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: write.c,v 1.5 1995/08/31 21:48:32 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)write.c 8.2 (Berkeley) 4/27/95";
#endif
-static char *rcsid = "$OpenBSD: write.c,v 1.19 2003/03/13 15:47:12 deraadt Exp $";
+static char *rcsid = "$OpenBSD: write.c,v 1.20 2003/06/03 02:56:24 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/xargs/pathnames.h b/usr.bin/xargs/pathnames.h
index 9e4b007af9e..e1864f465fd 100644
--- a/usr.bin/xargs/pathnames.h
+++ b/usr.bin/xargs/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/06/26 05:44:02 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 06:51:38 jtc Exp $ */
/*-
@@ -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/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index ab806ad81bd..45e52816e76 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: xargs.1,v 1.10 2000/11/09 17:52:49 aaron Exp $
+.\" $OpenBSD: xargs.1,v 1.11 2003/06/03 02:56:24 millert Exp $
.\" $NetBSD: xargs.1,v 1.6 1994/11/14 06:51:40 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -16,11 +16,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index c51ef86ef39..01d972f9595 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xargs.c,v 1.11 2002/02/18 18:22:54 millert Exp $ */
+/* $OpenBSD: xargs.c,v 1.12 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: xargs.c,v 1.7 1994/11/14 06:51:41 jtc Exp $ */
/*-
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xargs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: xargs.c,v 1.11 2002/02/18 18:22:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: xargs.c,v 1.12 2003/06/03 02:56:24 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 4ede7f535d7..0ae652d6d73 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: install.1,v 1.17 2003/04/25 14:53:03 jmc Exp $
+.\" $OpenBSD: install.1,v 1.18 2003/06/03 02:56:24 millert Exp $
.\" $NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xinstall/pathnames.h b/usr.bin/xinstall/pathnames.h
index 4a7599900e9..3c576ac6470 100644
--- a/usr.bin/xinstall/pathnames.h
+++ b/usr.bin/xinstall/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.2 1996/06/26 05:44:05 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.3 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 04:57:18 jtc Exp $ */
/*
@@ -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/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index b84b0e42aa0..b38fb8676f1 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xinstall.c,v 1.33 2003/05/11 18:18:33 tedu Exp $ */
+/* $OpenBSD: xinstall.c,v 1.34 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#endif
-static char rcsid[] = "$OpenBSD: xinstall.c,v 1.33 2003/05/11 18:18:33 tedu Exp $";
+static char rcsid[] = "$OpenBSD: xinstall.c,v 1.34 2003/06/03 02:56:24 millert Exp $";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/xstr/pathnames.h b/usr.bin/xstr/pathnames.h
index a68f1d08d00..86d66fa187f 100644
--- a/usr.bin/xstr/pathnames.h
+++ b/usr.bin/xstr/pathnames.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pathnames.h,v 1.3 1996/09/16 02:26:20 deraadt Exp $ */
+/* $OpenBSD: pathnames.h,v 1.4 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: pathnames.h,v 1.3 1994/11/14 04:56:22 jtc Exp $ */
/*
@@ -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/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index fc341167479..422c36fae7c 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: xstr.1,v 1.10 2002/02/13 08:33:47 mpech Exp $
+.\" $OpenBSD: xstr.1,v 1.11 2003/06/03 02:56:24 millert Exp $
.\" $NetBSD: xstr.1,v 1.4 1994/11/26 09:25:22 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 896b13ae3df..0fd59e11de2 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xstr.c,v 1.10 2002/12/08 16:50:07 millert Exp $ */
+/* $OpenBSD: xstr.c,v 1.11 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: xstr.c,v 1.5 1994/12/24 16:57:59 cgd Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)xstr.c 8.1 (Berkeley) 6/9/93";
#endif
-static char rcsid[] = "$OpenBSD: xstr.c,v 1.10 2002/12/08 16:50:07 millert Exp $";
+static char rcsid[] = "$OpenBSD: xstr.c,v 1.11 2003/06/03 02:56:24 millert Exp $";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 8e9cdac645d..36a941c7064 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: closure.c,v 1.5 2001/11/19 19:02:18 mpech Exp $ */
+/* $OpenBSD: closure.c,v 1.6 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: closure.c,v 1.4 1996/03/19 03:21:29 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)closure.c 5.3 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$OpenBSD: closure.c,v 1.5 2001/11/19 19:02:18 mpech Exp $";
+static char rcsid[] = "$OpenBSD: closure.c,v 1.6 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 2c2813bb92d..8a4a4de99a5 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: defs.h,v 1.9 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: defs.h,v 1.10 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: defs.h,v 1.6 1996/03/19 03:21:30 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index d4f897ee006..409fa11e86f 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: error.c,v 1.7 2002/06/19 03:24:56 deraadt Exp $ */
+/* $OpenBSD: error.c,v 1.8 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: error.c,v 1.4 1996/03/19 03:21:32 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)error.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$OpenBSD: error.c,v 1.7 2002/06/19 03:24:56 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: error.c,v 1.8 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 9d09b78a896..28e19c06e69 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lalr.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: lalr.c,v 1.7 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: lalr.c,v 1.4 1996/03/19 03:21:33 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lalr.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$OpenBSD: lalr.c,v 1.6 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: lalr.c,v 1.7 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index b411d6630b7..cbefc5a247b 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lr0.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: lr0.c,v 1.7 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: lr0.c,v 1.4 1996/03/19 03:21:35 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)lr0.c 5.3 (Berkeley) 1/20/91";
#else
-static char rcsid[] = "$OpenBSD: lr0.c,v 1.6 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: lr0.c,v 1.7 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index e4e107355fe..fc4dd2060f6 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.16 2003/04/16 17:43:37 millert Exp $ */
+/* $OpenBSD: main.c,v 1.17 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: main.c,v 1.5 1996/03/19 03:21:38 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -47,7 +43,7 @@ char copyright[] =
#if 0
static char sccsid[] = "@(#)main.c 5.5 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$OpenBSD: main.c,v 1.16 2003/04/16 17:43:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.17 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 175ba9c8075..56a903bfbc1 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkpar.c,v 1.9 2002/06/19 03:24:56 deraadt Exp $ */
+/* $OpenBSD: mkpar.c,v 1.10 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: mkpar.c,v 1.4 1996/03/19 03:21:39 jtc Exp $ */
@@ -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/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index ce6094027e9..15ae6976756 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: output.c,v 1.9 2002/12/03 21:34:21 mickey Exp $ */
+/* $OpenBSD: output.c,v 1.10 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: output.c,v 1.4 1996/03/19 03:21:41 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)output.c 5.7 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$OpenBSD: output.c,v 1.9 2002/12/03 21:34:21 mickey Exp $";
+static char rcsid[] = "$OpenBSD: output.c,v 1.10 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 0424b1eef28..6cbd9978dc5 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: reader.c,v 1.13 2003/04/08 00:18:13 deraadt Exp $ */
+/* $OpenBSD: reader.c,v 1.14 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: reader.c,v 1.5 1996/03/19 03:21:43 jtc Exp $ */
@@ -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/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 7b0eda01d3e..83b181d3be1 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: skeleton.c,v 1.19 2002/12/03 21:34:21 mickey Exp $ */
+/* $OpenBSD: skeleton.c,v 1.20 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -67,7 +63,7 @@ char *banner[] =
"#if __GNUC__ == 2",
" __attribute__ ((unused))",
"#endif /* __GNUC__ == 2 */",
- " = \"$OpenBSD: skeleton.c,v 1.19 2002/12/03 21:34:21 mickey Exp $\";",
+ " = \"$OpenBSD: skeleton.c,v 1.20 2003/06/03 02:56:24 millert Exp $\";",
"#endif",
"#include <stdlib.h>",
"#define YYBYACC 1",
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index b17131c41a6..8d2f56f391e 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: symtab.c,v 1.7 2003/04/08 00:18:13 deraadt Exp $ */
+/* $OpenBSD: symtab.c,v 1.8 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: symtab.c,v 1.4 1996/03/19 03:21:48 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)symtab.c 5.3 (Berkeley) 6/1/90";
#else
-static char rcsid[] = "$OpenBSD: symtab.c,v 1.7 2003/04/08 00:18:13 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: symtab.c,v 1.8 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index dc265c5e096..53b024f97c0 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verbose.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: verbose.c,v 1.7 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: verbose.c,v 1.4 1996/03/19 03:21:50 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)verbose.c 5.3 (Berkeley) 1/20/91";
#else
-static char rcsid[] = "$OpenBSD: verbose.c,v 1.6 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: verbose.c,v 1.7 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index a90abb605e5..7e937da18db 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: warshall.c,v 1.6 2002/02/16 21:28:00 millert Exp $ */
+/* $OpenBSD: warshall.c,v 1.7 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: warshall.c,v 1.4 1996/03/19 03:21:51 jtc Exp $ */
/*
@@ -16,11 +16,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
@@ -41,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)warshall.c 5.4 (Berkeley) 5/24/93";
#else
-static char rcsid[] = "$OpenBSD: warshall.c,v 1.6 2002/02/16 21:28:00 millert Exp $";
+static char rcsid[] = "$OpenBSD: warshall.c,v 1.7 2003/06/03 02:56:24 millert Exp $";
#endif
#endif /* not lint */
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index c468c3e3886..239c952dcb8 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yacc.1,v 1.14 2001/05/01 17:58:05 aaron Exp $
+.\" $OpenBSD: yacc.1,v 1.15 2003/06/03 02:56:24 millert Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -14,11 +14,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index ae248978aeb..ab680e37810 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yyfix.1,v 1.2 1999/06/05 01:21:52 aaron Exp $
+.\" $OpenBSD: yyfix.1,v 1.3 2003/06/03 02:56:24 millert Exp $
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -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/usr.bin/yacc/yyfix.sh b/usr.bin/yacc/yyfix.sh
index e76bcdd8fb6..41d3174f24d 100644
--- a/usr.bin/yacc/yyfix.sh
+++ b/usr.bin/yacc/yyfix.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: yyfix.sh,v 1.1 1999/04/18 20:41:46 millert Exp $
+# $OpenBSD: yyfix.sh,v 1.2 2003/06/03 02:56:24 millert Exp $
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
#
@@ -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/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 0b5dca1aa33..545884c19a3 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yes.1,v 1.4 1999/06/05 01:21:52 aaron Exp $
+.\" $OpenBSD: yes.1,v 1.5 2003/06/03 02:56:24 millert Exp $
.\" $NetBSD: yes.1,v 1.3 1994/11/14 04:56:14 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -12,11 +12,7 @@
.\" 2. Redistributions in binary form must reproduce the above copyright
.\" notice, this list of conditions and the following disclaimer in the
.\" documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\" must display the following acknowledgement:
-.\" This product includes software developed by the University of
-.\" California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
+.\" 3. Neither the name of the University nor the names of its contributors
.\" may be used to endorse or promote products derived from this software
.\" without specific prior written permission.
.\"
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 92d880b017e..69bfc6c7380 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yes.c,v 1.5 2002/09/17 19:37:40 deraadt Exp $ */
+/* $OpenBSD: yes.c,v 1.6 2003/06/03 02:56:24 millert Exp $ */
/* $NetBSD: yes.c,v 1.3 1994/11/14 04:56:15 jtc Exp $ */
/*
@@ -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.
*
@@ -44,7 +40,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)yes.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: yes.c,v 1.5 2002/09/17 19:37:40 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: yes.c,v 1.6 2003/06/03 02:56:24 millert Exp $";
#endif /* not lint */
#include <stdio.h>