summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/colldef/Makefile2
-rw-r--r--share/colldef/de_DE.ISO8859-1.src2
-rw-r--r--share/colldef/de_DE.ISO_8859-1.src2
-rw-r--r--share/colldef/es_ES.ISO8859-1.src2
-rw-r--r--share/colldef/es_ES.ISO_8859-1.src2
-rw-r--r--share/colldef/is_IS.ISO8859-1.src2
-rw-r--r--share/colldef/is_IS.ISO_8859-1.src2
-rw-r--r--share/colldef/la_LN.ISO8859-1.src2
-rw-r--r--share/colldef/la_LN.ISO_8859-1.src2
-rw-r--r--share/colldef/lt_LN.ISO_8859-1.src2
-rw-r--r--share/colldef/ru_RU.CP866.src2
-rw-r--r--share/colldef/ru_RU.KOI8-R.src2
-rw-r--r--share/colldef/ru_SU.CP866.src2
-rw-r--r--share/colldef/ru_SU.KOI8-R.src2
-rw-r--r--share/mklocale/Makefile2
-rw-r--r--usr.bin/Makefile2
-rw-r--r--usr.bin/ar/ar.12
-rw-r--r--usr.bin/ar/ar.1aout2
-rw-r--r--usr.bin/at/Makefile2
-rw-r--r--usr.bin/at/at.c2
-rw-r--r--usr.bin/at/at.man2
-rw-r--r--usr.bin/at/panic.c2
-rw-r--r--usr.bin/at/parsetime.c2
-rw-r--r--usr.bin/at/perm.c2
-rw-r--r--usr.bin/basename/basename.12
-rw-r--r--usr.bin/biff/biff.12
-rw-r--r--usr.bin/brandelf/brandelf.c2
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.12
-rw-r--r--usr.bin/chat/Makefile2
-rw-r--r--usr.bin/chat/chat.82
-rw-r--r--usr.bin/chat/chat.c2
-rw-r--r--usr.bin/chpass/chpass.c2
-rw-r--r--usr.bin/chpass/pw_yp.c2
-rw-r--r--usr.bin/chpass/pw_yp.h2
-rw-r--r--usr.bin/cmp/cmp.12
-rw-r--r--usr.bin/colldef/Makefile2
-rw-r--r--usr.bin/colldef/data/Makefile2
-rw-r--r--usr.bin/colldef/data/de_DE.ISO_8859-1.src2
-rw-r--r--usr.bin/colldef/data/es_ES.ISO_8859-1.src2
-rw-r--r--usr.bin/colldef/data/is_IS.ISO_8859-1.src2
-rw-r--r--usr.bin/colldef/data/lt_LN.ISO_8859-1.src2
-rw-r--r--usr.bin/colldef/data/ru_SU.CP866.src2
-rw-r--r--usr.bin/colldef/data/ru_SU.KOI8-R.src2
-rw-r--r--usr.bin/colldef/parse.y2
-rw-r--r--usr.bin/colldef/scan.l2
-rw-r--r--usr.bin/compile_et/Makefile2
-rw-r--r--usr.bin/compress/zopen.h2
-rw-r--r--usr.bin/cpp/cpp.sh2
-rw-r--r--usr.bin/dig/Makefile2
-rw-r--r--usr.bin/dnsquery/Makefile2
-rw-r--r--usr.bin/du/du.12
-rw-r--r--usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg2
-rw-r--r--usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg2
-rw-r--r--usr.bin/fetch/fetch.12
-rw-r--r--usr.bin/fetch/main.c2
-rw-r--r--usr.bin/file/patchlevel.h7
-rw-r--r--usr.bin/file2c/Makefile2
-rw-r--r--usr.bin/file2c/file2c.12
-rw-r--r--usr.bin/file2c/file2c.c2
-rw-r--r--usr.bin/find/find.12
-rw-r--r--usr.bin/gencat/Makefile2
-rw-r--r--usr.bin/hexdump/hexdump.12
-rw-r--r--usr.bin/hexdump/od.12
-rw-r--r--usr.bin/host/Makefile2
-rw-r--r--usr.bin/id/groups.sh2
-rw-r--r--usr.bin/id/whoami.sh2
-rw-r--r--usr.bin/ipcrm/Makefile2
-rw-r--r--usr.bin/ipcrm/ipcrm.12
-rw-r--r--usr.bin/ipcrm/ipcrm.c2
-rw-r--r--usr.bin/ipcs/Makefile2
-rw-r--r--usr.bin/ipcs/ipcs.12
-rw-r--r--usr.bin/ipcs/ipcs.c2
-rw-r--r--usr.bin/keyinfo/keyinfo.12
-rw-r--r--usr.bin/keyinfo/keyinfo.pl2
-rw-r--r--usr.bin/killall/killall.12
-rwxr-xr-xusr.bin/killall/killall.pl2
-rw-r--r--usr.bin/ktrace/Makefile2
-rw-r--r--usr.bin/ktrace/ktrace.c2
-rw-r--r--usr.bin/ktrace/subr.c2
-rw-r--r--usr.bin/kzip/Makefile2
-rw-r--r--usr.bin/kzip/kzip.82
-rw-r--r--usr.bin/kzip/kzip.c2
-rw-r--r--usr.bin/lastcomm/lastcomm.12
-rw-r--r--usr.bin/lastcomm/lastcomm.c2
-rw-r--r--usr.bin/lex/Makefile2
-rw-r--r--usr.bin/lex/lib/Makefile2
-rw-r--r--usr.bin/limits/limits.12
-rw-r--r--usr.bin/limits/limits.c2
-rw-r--r--usr.bin/locate/Makefile2
-rw-r--r--usr.bin/locate/Makefile.inc2
-rw-r--r--usr.bin/locate/bigram/locate.bigram.c2
-rw-r--r--usr.bin/locate/code/locate.code.c2
-rw-r--r--usr.bin/locate/locate/Makefile2
-rw-r--r--usr.bin/locate/locate/concatdb.sh2
-rw-r--r--usr.bin/locate/locate/fastfind.c2
-rw-r--r--usr.bin/locate/locate/locate.12
-rw-r--r--usr.bin/locate/locate/locate.c2
-rw-r--r--usr.bin/locate/locate/locate.h2
-rw-r--r--usr.bin/locate/locate/locate.rc2
-rw-r--r--usr.bin/locate/locate/mklocatedb.sh2
-rw-r--r--usr.bin/locate/locate/updatedb.sh2
-rw-r--r--usr.bin/locate/locate/util.c2
-rw-r--r--usr.bin/lockf/Makefile2
-rw-r--r--usr.bin/lockf/lockf.12
-rw-r--r--usr.bin/lockf/lockf.c2
-rw-r--r--usr.bin/login/Makefile2
-rw-r--r--usr.bin/login/login.12
-rw-r--r--usr.bin/lsvfs/Makefile2
-rw-r--r--usr.bin/lsvfs/lsvfs.12
-rw-r--r--usr.bin/lsvfs/lsvfs.c2
-rw-r--r--usr.bin/m4/m4.12
-rw-r--r--usr.bin/mail/mail.12
-rw-r--r--usr.bin/mesg/mesg.12
-rw-r--r--usr.bin/mk_cmds/Makefile2
-rw-r--r--usr.bin/mkdep/mkdep.gcc.sh2
-rw-r--r--usr.bin/mklocale/data/Makefile2
-rw-r--r--usr.bin/modstat/Makefile2
-rw-r--r--usr.bin/modstat/modstat.82
-rw-r--r--usr.bin/modstat/modstat.c2
-rw-r--r--usr.bin/more/Makefile2
-rw-r--r--usr.bin/msgs/Makefile2
-rw-r--r--usr.bin/netstat/atalk.c2
-rw-r--r--usr.bin/netstat/if.c2
-rw-r--r--usr.bin/netstat/inet.c2
-rw-r--r--usr.bin/netstat/ipx.c2
-rw-r--r--usr.bin/netstat/route.c2
-rw-r--r--usr.bin/nfsstat/nfsstat.12
-rw-r--r--usr.bin/nfsstat/nfsstat.c2
-rw-r--r--usr.bin/nice/nice.12
-rw-r--r--usr.bin/nm/nm.12
-rw-r--r--usr.bin/nm/nm.1aout2
-rw-r--r--usr.bin/opieinfo/Makefile2
-rw-r--r--usr.bin/opiekey/Makefile2
-rw-r--r--usr.bin/opiepasswd/Makefile2
-rw-r--r--usr.bin/pagesize/pagesize.sh2
-rw-r--r--usr.bin/passwd/Makefile2
-rw-r--r--usr.bin/passwd/extern.h2
-rw-r--r--usr.bin/passwd/local_passwd.c2
-rw-r--r--usr.bin/passwd/passwd.c2
-rw-r--r--usr.bin/pr/pr.12
-rw-r--r--usr.bin/quota/quota.12
-rw-r--r--usr.bin/ranlib/ranlib.12
-rw-r--r--usr.bin/ranlib/ranlib.1aout2
-rw-r--r--usr.bin/rdist/docmd.c2
-rw-r--r--usr.bin/rdist/rshrcmd.c2
-rw-r--r--usr.bin/rpcinfo/Makefile2
-rw-r--r--usr.bin/rpcinfo/rpcinfo.82
-rw-r--r--usr.bin/rpcinfo/rpcinfo.c2
-rw-r--r--usr.bin/rsh/rsh.c2
-rw-r--r--usr.bin/rup/Makefile2
-rw-r--r--usr.bin/rup/rup.12
-rw-r--r--usr.bin/rup/rup.c2
-rw-r--r--usr.bin/ruptime/ruptime.12
-rw-r--r--usr.bin/ruptime/ruptime.c2
-rw-r--r--usr.bin/rusers/Makefile2
-rw-r--r--usr.bin/rusers/rusers.12
-rw-r--r--usr.bin/rusers/rusers.c2
-rw-r--r--usr.bin/rwall/Makefile2
-rw-r--r--usr.bin/rwall/rwall.12
-rw-r--r--usr.bin/rwall/rwall.c2
-rw-r--r--usr.bin/sasc/sasc.12
-rw-r--r--usr.bin/sasc/sasc.c2
-rw-r--r--usr.bin/sgmlfmt/Makefile2
-rwxr-xr-xusr.bin/sgmlfmt/sgmlfmt.pl2
-rw-r--r--usr.bin/sgmls/Makefile2
-rw-r--r--usr.bin/sgmls/Makefile.inc2
-rw-r--r--usr.bin/sgmls/README2
-rw-r--r--usr.bin/sgmls/instant/Makefile2
-rw-r--r--usr.bin/sgmls/libsgmls/Makefile2
-rw-r--r--usr.bin/sgmls/sgmls/Makefile2
-rw-r--r--usr.bin/sgmls/sgmls/sgmls.12
-rw-r--r--usr.bin/strip/strip.12
-rw-r--r--usr.bin/strip/strip.1aout2
-rw-r--r--usr.bin/strip/strip.c2
-rw-r--r--usr.bin/su/su.12
-rw-r--r--usr.bin/systat/netcmds.c2
-rw-r--r--usr.bin/systat/netstat.c2
-rw-r--r--usr.bin/talk/Makefile2
-rw-r--r--usr.bin/talk/get_iface.c2
-rw-r--r--usr.bin/tclsh/Makefile2
-rw-r--r--usr.bin/tconv/Makefile2
-rw-r--r--usr.bin/tconv/tconv.12
-rw-r--r--usr.bin/telnet/telnet.12
-rw-r--r--usr.bin/tsort/tsort.c2
-rw-r--r--usr.bin/tty/tty.12
-rw-r--r--usr.bin/units/Makefile2
-rw-r--r--usr.bin/units/README2
-rw-r--r--usr.bin/units/pathnames.h2
-rw-r--r--usr.bin/units/units.12
-rw-r--r--usr.bin/units/units.c2
-rw-r--r--usr.bin/units/units.lib2
-rw-r--r--usr.bin/uuencode/uuencode.12
-rw-r--r--usr.bin/vacation/Makefile2
-rw-r--r--usr.bin/vacation/vacation.12
-rw-r--r--usr.bin/vacation/vacation.c2
-rw-r--r--usr.bin/vi/Makefile2
-rw-r--r--usr.bin/w/w.12
-rw-r--r--usr.bin/wc/wc.12
-rw-r--r--usr.bin/wc/wc.c2
-rw-r--r--usr.bin/what/what.12
-rw-r--r--usr.bin/whereis/whereis.12
-rw-r--r--usr.bin/whereis/whereis.pl2
-rw-r--r--usr.bin/which/which.12
-rwxr-xr-xusr.bin/which/which.pl2
-rw-r--r--usr.bin/who/who.12
-rw-r--r--usr.bin/write/write.12
-rw-r--r--usr.bin/xinstall/install.12
-rw-r--r--usr.bin/xinstall/xinstall.c2
-rw-r--r--usr.bin/yacc/Makefile2
-rw-r--r--usr.bin/yacc/closure.c2
-rw-r--r--usr.bin/yacc/defs.h2
-rw-r--r--usr.bin/yacc/error.c2
-rw-r--r--usr.bin/yacc/lalr.c2
-rw-r--r--usr.bin/yacc/lr0.c2
-rw-r--r--usr.bin/yacc/mkpar.c2
-rw-r--r--usr.bin/yacc/output.c2
-rw-r--r--usr.bin/yacc/reader.c2
-rw-r--r--usr.bin/yacc/skeleton.c2
-rw-r--r--usr.bin/yacc/symtab.c2
-rw-r--r--usr.bin/yacc/verbose.c2
-rw-r--r--usr.bin/yacc/warshall.c2
-rw-r--r--usr.bin/yacc/yacc.12
-rw-r--r--usr.bin/ypcat/Makefile2
-rw-r--r--usr.bin/ypcat/ypcat.12
-rw-r--r--usr.bin/ypmatch/Makefile2
-rw-r--r--usr.bin/ypmatch/ypmatch.12
-rw-r--r--usr.bin/ypwhich/Makefile2
227 files changed, 231 insertions, 228 deletions
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 8830144..85b1637 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/share/colldef/de_DE.ISO8859-1.src b/share/colldef/de_DE.ISO8859-1.src
index 38dcd05..ab8a83e 100644
--- a/share/colldef/de_DE.ISO8859-1.src
+++ b/share/colldef/de_DE.ISO8859-1.src
@@ -1,6 +1,6 @@
# German/ISO 8859-1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/de_DE.ISO_8859-1.src b/share/colldef/de_DE.ISO_8859-1.src
index 38dcd05..ab8a83e 100644
--- a/share/colldef/de_DE.ISO_8859-1.src
+++ b/share/colldef/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
# German/ISO 8859-1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/es_ES.ISO8859-1.src b/share/colldef/es_ES.ISO8859-1.src
index 7c2b21f..e088e21 100644
--- a/share/colldef/es_ES.ISO8859-1.src
+++ b/share/colldef/es_ES.ISO8859-1.src
@@ -1,6 +1,6 @@
# Espan~ol (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/es_ES.ISO_8859-1.src b/share/colldef/es_ES.ISO_8859-1.src
index 7c2b21f..e088e21 100644
--- a/share/colldef/es_ES.ISO_8859-1.src
+++ b/share/colldef/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
# Espan~ol (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/is_IS.ISO8859-1.src b/share/colldef/is_IS.ISO8859-1.src
index 50cd9a9..288459c 100644
--- a/share/colldef/is_IS.ISO8859-1.src
+++ b/share/colldef/is_IS.ISO8859-1.src
@@ -1,6 +1,6 @@
# icelandic (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/is_IS.ISO_8859-1.src b/share/colldef/is_IS.ISO_8859-1.src
index 50cd9a9..288459c 100644
--- a/share/colldef/is_IS.ISO_8859-1.src
+++ b/share/colldef/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
# icelandic (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/la_LN.ISO8859-1.src b/share/colldef/la_LN.ISO8859-1.src
index 99b7d08..93a2da0 100644
--- a/share/colldef/la_LN.ISO8859-1.src
+++ b/share/colldef/la_LN.ISO8859-1.src
@@ -1,6 +1,6 @@
# latin1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/la_LN.ISO_8859-1.src b/share/colldef/la_LN.ISO_8859-1.src
index 99b7d08..93a2da0 100644
--- a/share/colldef/la_LN.ISO_8859-1.src
+++ b/share/colldef/la_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
# latin1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/lt_LN.ISO_8859-1.src b/share/colldef/lt_LN.ISO_8859-1.src
index 99b7d08..93a2da0 100644
--- a/share/colldef/lt_LN.ISO_8859-1.src
+++ b/share/colldef/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
# latin1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/share/colldef/ru_RU.CP866.src b/share/colldef/ru_RU.CP866.src
index 2fc2d20..88ca377 100644
--- a/share/colldef/ru_RU.CP866.src
+++ b/share/colldef/ru_RU.CP866.src
@@ -1,6 +1,6 @@
# CP866 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.CP866
order \
diff --git a/share/colldef/ru_RU.KOI8-R.src b/share/colldef/ru_RU.KOI8-R.src
index 3a67bc4..f6b0a18 100644
--- a/share/colldef/ru_RU.KOI8-R.src
+++ b/share/colldef/ru_RU.KOI8-R.src
@@ -1,6 +1,6 @@
# koi8-r (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.KOI8-R
order \
diff --git a/share/colldef/ru_SU.CP866.src b/share/colldef/ru_SU.CP866.src
index 2fc2d20..88ca377 100644
--- a/share/colldef/ru_SU.CP866.src
+++ b/share/colldef/ru_SU.CP866.src
@@ -1,6 +1,6 @@
# CP866 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.CP866
order \
diff --git a/share/colldef/ru_SU.KOI8-R.src b/share/colldef/ru_SU.KOI8-R.src
index 3a67bc4..f6b0a18 100644
--- a/share/colldef/ru_SU.KOI8-R.src
+++ b/share/colldef/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
# koi8-r (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.KOI8-R
order \
diff --git a/share/mklocale/Makefile b/share/mklocale/Makefile
index 05ac2d0..78a9806 100644
--- a/share/mklocale/Makefile
+++ b/share/mklocale/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index b44ef97..8657287 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
-# $FreeBSD$
+# $Id$
# XXX MISSING: deroff diction graph learn plot
# spell spline struct units xsend
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 88332ea..4edd02e 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ar.1 8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.TH AR 1 "June 29, 1993"
.AT 3
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 88332ea..4edd02e 100644
--- a/usr.bin/ar/ar.1aout
+++ b/usr.bin/ar/ar.1aout
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ar.1 8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.TH AR 1 "June 29, 1993"
.AT 3
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index 6fcc00c..6e1581c 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
.include "${.CURDIR}/Makefile.inc"
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 437ee5a..cd2d54d 100644
--- a/usr.bin/at/at.c
+++ b/usr.bin/at/at.c
@@ -92,7 +92,7 @@ enum { ATQ, ATRM, AT, BATCH, CAT }; /* what program we want to run */
/* File scope variables */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
char *no_export[] =
{
"TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index ae71875..daffd0a 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
.Dd April 12, 1995
.Dt "AT" 1
.Os "FreeBSD 2.1"
diff --git a/usr.bin/at/panic.c b/usr.bin/at/panic.c
index 7941818..cbbdcc4 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -37,7 +37,7 @@
/* File scope variables */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
/* External variables */
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index 91138bb..48b91a9 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -130,7 +130,7 @@ static size_t sc_len; /* scanner - lenght of token buffer */
static int sc_tokid; /* scanner - token id */
static int sc_tokplur; /* scanner - is token plural? */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
/* Local functions */
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 7930ee5..d52fd3d 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
/* File scope variables */
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
/* Function declarations */
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 62cc1a9..796bb6b 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)basename.1 8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 18, 1994
.Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index f648d9d..c850bf6 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)biff.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt BIFF 1
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index 97da3e3..0a91a06 100644
--- a/usr.bin/brandelf/brandelf.c
+++ b/usr.bin/brandelf/brandelf.c
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdlib.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 2bef960..a98e25a 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cap_mkdb.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd "June 6, 1993"
.Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index b0b7686..0dd5055 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= chat
SRCS= chat.c
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index 99e3236..48ed7c8 100644
--- a/usr.bin/chat/chat.8
+++ b/usr.bin/chat/chat.8
@@ -1,6 +1,6 @@
.\" -*- nroff -*-
.\" manual page [] for chat 1.8
-.\" $FreeBSD$
+.\" $Id$
.\" SH section heading
.\" SS subsection heading
.\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index 4b24961..ce7c782 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -31,7 +31,7 @@
*
*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
#include <stdio.h>
#include <time.h>
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index efb67bc..58a619a 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)chpass.c 8.4 (Berkeley) 4/2/94";
static char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index db4a69d..514bf7c 100644
--- a/usr.bin/chpass/pw_yp.c
+++ b/usr.bin/chpass/pw_yp.c
@@ -35,7 +35,7 @@
* Center for Telecommunications Research
* Columbia University, New York City
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index c524897..0a1e1c0 100644
--- a/usr.bin/chpass/pw_yp.h
+++ b/usr.bin/chpass/pw_yp.h
@@ -35,7 +35,7 @@
* Center for Telecommunications Research
* Columbia University, New York City
*
- * $FreeBSD$
+ * $Id$
*/
#ifdef YP
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 592d6bc..75339a8 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)cmp.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt CMP 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 7c16297..295fe3f 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG = colldef
LFLAGS = -8 -i
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index 8830144..85b1637 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.ISO_8859-1.src b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
index 38dcd05..ab8a83e 100644
--- a/usr.bin/colldef/data/de_DE.ISO_8859-1.src
+++ b/usr.bin/colldef/data/de_DE.ISO_8859-1.src
@@ -1,6 +1,6 @@
# German/ISO 8859-1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/usr.bin/colldef/data/es_ES.ISO_8859-1.src b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
index 7c2b21f..e088e21 100644
--- a/usr.bin/colldef/data/es_ES.ISO_8859-1.src
+++ b/usr.bin/colldef/data/es_ES.ISO_8859-1.src
@@ -1,6 +1,6 @@
# Espan~ol (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/usr.bin/colldef/data/is_IS.ISO_8859-1.src b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
index 50cd9a9..288459c 100644
--- a/usr.bin/colldef/data/is_IS.ISO_8859-1.src
+++ b/usr.bin/colldef/data/is_IS.ISO_8859-1.src
@@ -1,6 +1,6 @@
# icelandic (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
index 99b7d08..93a2da0 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-1.src
@@ -1,6 +1,6 @@
# latin1 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.ISO_8859-1
order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 2fc2d20..88ca377 100644
--- a/usr.bin/colldef/data/ru_SU.CP866.src
+++ b/usr.bin/colldef/data/ru_SU.CP866.src
@@ -1,6 +1,6 @@
# CP866 (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.CP866
order \
diff --git a/usr.bin/colldef/data/ru_SU.KOI8-R.src b/usr.bin/colldef/data/ru_SU.KOI8-R.src
index 3a67bc4..f6b0a18 100644
--- a/usr.bin/colldef/data/ru_SU.KOI8-R.src
+++ b/usr.bin/colldef/data/ru_SU.KOI8-R.src
@@ -1,6 +1,6 @@
# koi8-r (backward compatible with ASCII)
#
-# $FreeBSD$
+# $Id$
#
charmap map.KOI8-R
order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index c9e3563..5765ab3 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 212eac3..3e7dd6b 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <ctype.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index 50cc9ce..f75572a 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= compile_et
SRCS= compile_et.c error_table.y
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 6d4901d..322fd2d 100644
--- a/usr.bin/compress/zopen.h
+++ b/usr.bin/compress/zopen.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index e3e7b13..df09d6d 100644
--- a/usr.bin/cpp/cpp.sh
+++ b/usr.bin/cpp/cpp.sh
@@ -36,7 +36,7 @@
# SUCH DAMAGE.
#
# From: @(#)cpp.sh 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
#
# Transitional front end to CCCP to make it behave like (Reiser) CCP:
# specifies -traditional
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index cb54c4c..4ff062e 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 37c59aa..1be409a 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 0241aeb..0fa8226 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)du.1 8.2 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 1, 1994
.Dt DU 1
diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
index cd5b3cb..2fa3b27 100644
--- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
$
$ For ee patchlevel 3
$
-$ $FreeBSD$
+$ $Id$
$
$set 1
$quote "
diff --git a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
index cd5b3cb..2fa3b27 100644
--- a/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
$
$ For ee patchlevel 3
$
-$ $FreeBSD$
+$ $Id$
$
$set 1
$quote "
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 8223cbd..1e88453 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
.Dd July 2, 1996
.Dt FETCH 1
.Os FreeBSD 3.0
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 5a457cd..5655c33 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $Id$ */
#include <sys/types.h>
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index 4b847d7..26f42d2 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,11 +3,14 @@
/*
* Patchlevel file for Ian Darwin's MAGIC command.
- * $Id$
+ * $Id: patchlevel.h,v 1.5 1997/02/22 19:29:15 peter Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.5 1997/02/22 19:29:15 peter
+ * Revert $Id$ to $Id$
+ *
* Revision 1.4 1997/01/14 06:59:48 jkh
- * Make the long-awaited change from $Id$ to $Id$
+ * Make the long-awaited change from $Id: patchlevel.h,v 1.5 1997/02/22 19:29:15 peter Exp $ to $Id: patchlevel.h,v 1.5 1997/02/22 19:29:15 peter Exp $
*
* This will make a number of things easier in the future, as well as (finally!)
* avoiding the Id-smashing problem which has plagued developers for so long.
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index b8eb4f5..28cd21e 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= file2c
MAN1= file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 34f7785..c2dda08 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd Jan 28, 1995
.Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 258e70f..0bad904 100644
--- a/usr.bin/file2c/file2c.c
+++ b/usr.bin/file2c/file2c.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 6e4d006..dfccf38 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)find.1 8.4 (Berkeley) 4/1/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 1, 1994
.Dt FIND 1
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 9111afe..b738deb 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= gencat
SRCS= gencat.c genlib.c
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 0797a40..1fd6d07 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)hexdump.1 8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 18, 1994
.Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index 478ed7c..3fed7e3 100644
--- a/usr.bin/hexdump/od.1
+++ b/usr.bin/hexdump/od.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)od.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd %Q
.Os
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index ebe4a92..ebccefa 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
.include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index 4958275..904f200 100644
--- a/usr.bin/id/groups.sh
+++ b/usr.bin/id/groups.sh
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)groups.sh 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PATH=/bin:/usr/bin; export PATH
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 989e4bb..1c24bcc 100644
--- a/usr.bin/id/whoami.sh
+++ b/usr.bin/id/whoami.sh
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)whoami.sh 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PATH=/bin:/usr/bin; export PATH
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 6b032e2..6cc7bda 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= ipcrm
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 2c920d5..65c9c41 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -21,7 +21,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\""
.Dd August 8th, 1994
.Dt ipcrm 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index 4c99a60..717c826 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 47ba2df..5e4afcc 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= ipcs
BINGRP= kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index e5e6360..680b08b 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 18, 1994
.Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index 309ad853..b8fd2b9 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -24,7 +24,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 23cdbcb..9ddea83 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,7 +1,7 @@
.ll 6i
.pl 10.5i
.\" from: @(#)keyinfo.1 1.1 (Bellcore) 7/20/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.lt 6.0i
.TH KEYINFO 1 "26 April 1996"
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 8316c58..260a724 100644
--- a/usr.bin/keyinfo/keyinfo.pl
+++ b/usr.bin/keyinfo/keyinfo.pl
@@ -3,7 +3,7 @@
# Search /etc/skeykeys for the skey string for this user OR user specified
# in 1st parameter.
#
-# $FreeBSD$
+# $Id$
#
die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index 144f9a6..a05c529 100644
--- a/usr.bin/killall/killall.1
+++ b/usr.bin/killall/killall.1
@@ -22,7 +22,7 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 25, 1995
.Os FreeBSD 2.2
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index 0f14686..2e8dc66 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
#
# killall - kill processes by name
#
-# $FreeBSD$
+# $Id$
$ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index b0688c2..7cfae99 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 1.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= ktrace
SRCS= ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 233adc7..10db42e 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -42,7 +42,7 @@ static char copyright[] =
static char sccsid[] = "@(#)ktrace.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 68ca7ed..8af26ba 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)subr.c 8.1 (Berkeley) 6/6/93";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 073db94..7c9f8c3 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= kzip
MAN8= kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index 1b1b339..9989f1e 100644
--- a/usr.bin/kzip/kzip.8
+++ b/usr.bin/kzip/kzip.8
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd August 15, 1996
.Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index d7b7d76..819efa2 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -9,7 +9,7 @@
* Copyright (C) 1993 Hannu Savolainen
* Ported to 386bsd by Serge Vakulenko
* based on tools/build.c by Linus Torvalds
- * $FreeBSD$
+ * $Id$
*
*/
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 71b7c01..05455cf 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)lastcomm.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd September 18, 1996
.Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index d120573..246120b 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index e80f0d8..63f36e9 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
# By default, flex will be configured to generate 8-bit scanners only if the
# -8 flag is given. If you want it to always generate 8-bit scanners, add
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 286de75..046430e 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
LIB= ln
SRCS= libmain.c libyywrap.c
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index ebcc7b5..64d3cbd 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -17,7 +17,7 @@
.\" 5. Modifications may be freely made to this file providing the above
.\" conditions are met.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd January 15, 1996
.Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 302da3a..4c3cbad 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
*
* Display/change(+runprogram)/eval resource limits.
*
- * $FreeBSD$
+ * $Id$
*/
#include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 3e1ff47..45f82b9 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
SUBDIR= bigram code locate
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index e4c52f8..0f80876 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $Id$
LIBEXECDIR?= /usr/libexec
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index e277348..663428a 100644
--- a/usr.bin/locate/bigram/locate.bigram.c
+++ b/usr.bin/locate/bigram/locate.bigram.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index 3f4c3c0..2a87716 100644
--- a/usr.bin/locate/code/locate.code.c
+++ b/usr.bin/locate/code/locate.code.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 1899257..5e20b83 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= locate
SRCS= util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index e02df68..f40c7b3 100644
--- a/usr.bin/locate/locate/concatdb.sh
+++ b/usr.bin/locate/locate/concatdb.sh
@@ -30,7 +30,7 @@
#
# Sequence of databases is important.
#
-# $FreeBSD$
+# $Id$
# The directory containing locate subprograms
: ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/fastfind.c b/usr.bin/locate/locate/fastfind.c
index fdebe57..c17c6f1 100644
--- a/usr.bin/locate/locate/fastfind.c
+++ b/usr.bin/locate/locate/fastfind.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index b5ac7b4..5ae9e66 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -31,7 +31,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)locate.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index 791c3eb..ca4578b 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index d64a65f..9e997d4 100644
--- a/usr.bin/locate/locate/locate.h
+++ b/usr.bin/locate/locate/locate.h
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)locate.h 8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $Id$
*/
/* Symbolic constants shared by locate.c and code.c */
diff --git a/usr.bin/locate/locate/locate.rc b/usr.bin/locate/locate/locate.rc
index 9b9e75f..20937c0 100644
--- a/usr.bin/locate/locate/locate.rc
+++ b/usr.bin/locate/locate/locate.rc
@@ -1,7 +1,7 @@
#
# /etc/locate.rc - command script for updatedb(8)
#
-# $FreeBSD$
+# $Id$
#
# All commented values are the defaults
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index a83f492..e2b4fa7 100644
--- a/usr.bin/locate/locate/mklocatedb.sh
+++ b/usr.bin/locate/locate/mklocatedb.sh
@@ -28,7 +28,7 @@
#
# usage: mklocatedb [-presort] < filelist > database
#
-# $FreeBSD$
+# $Id$
# The directory containing locate subprograms
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index e9d273b..e2622da 100644
--- a/usr.bin/locate/locate/updatedb.sh
+++ b/usr.bin/locate/locate/updatedb.sh
@@ -26,7 +26,7 @@
#
# updatedb - update locate database for local mounted filesystems
#
-# $FreeBSD$
+# $Id$
LOCATE_CONFIG="/etc/locate.rc"
if [ -f "$LOCATE_CONFIG" -a -r "$LOCATE_CONFIG" ]; then
diff --git a/usr.bin/locate/locate/util.c b/usr.bin/locate/locate/util.c
index f5e99b6..57bd157 100644
--- a/usr.bin/locate/locate/util.c
+++ b/usr.bin/locate/locate/util.c
@@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 77d89c4..47fb6ab 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= lockf
CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index 32a7e19..eac10340 100644
--- a/usr.bin/lockf/lockf.1
+++ b/usr.bin/lockf/lockf.1
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd January 8, 1997
.Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 1858028..5c6d5cf 100644
--- a/usr.bin/lockf/lockf.c
+++ b/usr.bin/lockf/lockf.c
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/types.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 4680628..9ded00c 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $Id$
PROG= login
MAN1= login.1
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index c16d1a9..e0a4f02 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)login.1 8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 9, 1993
.Dt LOGIN 1
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index 2fbe688..3b25443 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= lsvfs
.include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index 9e693f3..82a4798 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
.\" Garrett A. Wollman, September 1994
.\" This file is in the public domain.
.\"
diff --git a/usr.bin/lsvfs/lsvfs.c b/usr.bin/lsvfs/lsvfs.c
index d16954e..124aa04 100644
--- a/usr.bin/lsvfs/lsvfs.c
+++ b/usr.bin/lsvfs/lsvfs.c
@@ -3,7 +3,7 @@
* Garrett A. Wollman, September 1994
* This file is in the public domain.
*
- * $FreeBSD$
+ * $Id$
*/
#include <sys/types.h>
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 7cd6156..ef2e658 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
.\"
-.\" @(#) $FreeBSD$
+.\" @(#) $Id$
.\"
.Dd January 26, 1993
.Dt m4 1
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 3ee4a16..45d5cdc 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mail.1 8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd December 30, 1993
.Dt MAIL 1
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 384fcb4..8f29ec8 100644
--- a/usr.bin/mesg/mesg.1
+++ b/usr.bin/mesg/mesg.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mesg.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt MESG 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 4e63e38..a240c05 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= mk_cmds
#
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index f6a4260..8ad51d0 100644
--- a/usr.bin/mkdep/mkdep.gcc.sh
+++ b/usr.bin/mkdep/mkdep.gcc.sh
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)mkdep.gcc.sh 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PATH=/bin:/usr/bin; export PATH
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 05ac2d0..78a9806 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile
index 335dd72..5e238ce 100644
--- a/usr.bin/modstat/Makefile
+++ b/usr.bin/modstat/Makefile
@@ -33,7 +33,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
+# $Id$
#
PROG= modstat
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 976b4d5..359a856 100644
--- a/usr.bin/modstat/modstat.8
+++ b/usr.bin/modstat/modstat.8
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 7, 1993
.Dt MODSTAT 8
diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c
index f51e344..2722f87 100644
--- a/usr.bin/modstat/modstat.c
+++ b/usr.bin/modstat/modstat.c
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#include <stdio.h>
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 38160c0..e63efcf 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= more
CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 6230cc5..8613f79c 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= msgs
DPADD= ${LIBTERMCAP}
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index 6d3bff5..e1fe34d 100644
--- a/usr.bin/netstat/atalk.c
+++ b/usr.bin/netstat/atalk.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)atalk.c 1.1 (Whistle) 6/6/96";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 62967db..ca12cda 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 9247c09..cc9290e 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)inet.c 8.5 (Berkeley) 5/24/95";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 3f3d72a..654d2e6 100644
--- a/usr.bin/netstat/ipx.c
+++ b/usr.bin/netstat/ipx.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)ns.c 8.1 (Berkeley) 6/6/93";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 66dfb40..710087a 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -36,7 +36,7 @@
static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 2a5d79e..227f3f0 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)nfsstat.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index 73f888d..db2fab4 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -43,7 +43,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "From: @(#)nfsstat.c 8.1 (Berkeley) 6/6/93";*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index f6887bc..fad8f6c 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nice.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index 5f3e38d..0ebeb98 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nm.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index 5f3e38d..0ebeb98 100644
--- a/usr.bin/nm/nm.1aout
+++ b/usr.bin/nm/nm.1aout
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)nm.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt NM 1
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 0e84a83..1e3f977 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index da541de..de04e8d 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index a9162c3..bb52c82 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
#
OPIE_DIST?= ${.CURDIR}/../../contrib/opie
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index f886544..4c7aeea 100644
--- a/usr.bin/pagesize/pagesize.sh
+++ b/usr.bin/pagesize/pagesize.sh
@@ -32,7 +32,7 @@
# SUCH DAMAGE.
#
# @(#)pagesize.sh 8.1 (Berkeley) 4/3/94
-# $FreeBSD$
+# $Id$
#
PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 89a3a0c..a9fc4cf 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $Id$
PROG= passwd
SRCS= local_passwd.c yppasswd_private_xdr.c yppasswd_comm.c yp_passwd.c \
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index fd70f89..7a4bd12 100644
--- a/usr.bin/passwd/extern.h
+++ b/usr.bin/passwd/extern.h
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)extern.h 8.1 (Berkeley) 4/2/94
- * $FreeBSD$
+ * $Id$
*/
int krb_passwd __P((char *, char *, char *, char *));
diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c
index 48faf02..bb9cd7c 100644
--- a/usr.bin/passwd/local_passwd.c
+++ b/usr.bin/passwd/local_passwd.c
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 0cde890..64358dd 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -43,7 +43,7 @@ static const char copyright[] =
#ifndef lint
static const char sccsid[] = "From: @(#)passwd.c 8.3 (Berkeley) 4/2/94";
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <err.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 2008d98..88eeeed 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -34,7 +34,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)pr.1 8.3 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 18, 1994
.Dt PR 1
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index be1602b..b82cced 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)quota.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt QUOTA 1
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index f75b959..bb419d6 100644
--- a/usr.bin/ranlib/ranlib.1
+++ b/usr.bin/ranlib/ranlib.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ranlib.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index f75b959..bb419d6 100644
--- a/usr.bin/ranlib/ranlib.1aout
+++ b/usr.bin/ranlib/ranlib.1aout
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ranlib.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt RANLIB 1
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index a56a163..a5dc82c 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -34,7 +34,7 @@
#ifndef lint
/*static char sccsid[] = "From: @(#)docmd.c 8.1 (Berkeley) 6/9/93";*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include "defs.h"
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index 7be1db3..6d2986b 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
#ifndef lint
static char RCSid[] =
-"$FreeBSD$";
+"$Id$";
#endif
#include "defs.h"
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 10d1d55..f9377c6 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90
-# $FreeBSD$
+# $Id$
PROG= rpcinfo
MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 8203fb4..25662e3 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,5 +1,5 @@
.\" from: @(#)rpcinfo.8c 2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd December 17, 1987
.Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 2379f8e..1cf5bf1 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -1,7 +1,7 @@
#ifndef lint
/*static char sccsid[] = "from: @(#)rpcinfo.c 1.22 87/08/12 SMI";*/
/*static char sccsid[] = "from: @(#)rpcinfo.c 2.2 88/08/11 4.0 RPCSRC";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
#endif
/*
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index 0072565..2a28fa0 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)rsh.c 8.3 (Berkeley) 4/6/94";
static char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index d86d32c..ab50a8a 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= rup
MAN1= rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index e339731..76e6c1f 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 7, 1993
.Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index 33ea352..ba9a67e 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
#endif /* not lint */
#include <stdio.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 7a8633e..3e48bce 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)ruptime.1 8.2 (Berkeley) 4/5/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 5, 1994
.Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index 2b9730e..e4103d9 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $Id$ */
#ifndef lint
static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 47689eb..a6b753f 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG = rusers
MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index c8953df..7cf6164 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rusers.1 6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 23, 1991
.Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index 74f89b3..3d7b9a5 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -32,7 +32,7 @@
*/
#ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index d583df7..e81c30a 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG = rwall
MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index ae0b06e..1531503 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" from: @(#)rwall.1 6.7 (Berkeley) 4/23/91
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 23, 1991
.Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 0b0eaf2..fe0983a 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -40,7 +40,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)wall.c 5.14 (Berkeley) 3/2/91";*/
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$Id$";
#endif /* not lint */
/*
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index 11323ad..ab2275f 100644
--- a/usr.bin/sasc/sasc.1
+++ b/usr.bin/sasc/sasc.1
@@ -28,7 +28,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.TH SASC 1 "January 6, 1995" FreeBSD "FreeBSD Reference Manual"
.SH NAME
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index 7a65f73..ee9d85d 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -29,7 +29,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
/*
- * $FreeBSD$
+ * $Id$
*/
#include <stdlib.h>
diff --git a/usr.bin/sgmlfmt/Makefile b/usr.bin/sgmlfmt/Makefile
index 793457a..12e52d5 100644
--- a/usr.bin/sgmlfmt/Makefile
+++ b/usr.bin/sgmlfmt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
MAN1= sgmlfmt.1
diff --git a/usr.bin/sgmlfmt/sgmlfmt.pl b/usr.bin/sgmlfmt/sgmlfmt.pl
index 0df4e7a..ed3b757 100755
--- a/usr.bin/sgmlfmt/sgmlfmt.pl
+++ b/usr.bin/sgmlfmt/sgmlfmt.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $FreeBSD$
+# $Id$
# Copyright (C) 1996
# John R. Fieber. All rights reserved.
diff --git a/usr.bin/sgmls/Makefile b/usr.bin/sgmls/Makefile
index 96be63d..96ce820 100644
--- a/usr.bin/sgmls/Makefile
+++ b/usr.bin/sgmls/Makefile
@@ -1,6 +1,6 @@
#
# Bmake file for sgmls
-# $FreeBSD$
+# $Id$
#
SUBDIR= libsgmls sgmls instant
diff --git a/usr.bin/sgmls/Makefile.inc b/usr.bin/sgmls/Makefile.inc
index 41a5df0..7a78864 100644
--- a/usr.bin/sgmls/Makefile.inc
+++ b/usr.bin/sgmls/Makefile.inc
@@ -1,7 +1,7 @@
#
# Bmakefile for rast
#
-# $FreeBSD$
+# $Id$
#
.if exists(${.CURDIR}/../../Makefile.inc)
diff --git a/usr.bin/sgmls/README b/usr.bin/sgmls/README
index 00fc751..e2a8204 100644
--- a/usr.bin/sgmls/README
+++ b/usr.bin/sgmls/README
@@ -1,4 +1,4 @@
-$FreeBSD$
+$Id$
This the sgmls release 1.1 SGML parser written by James Clark
jjc@jclark.com, repackaged for FreeBSD. The original source may be
diff --git a/usr.bin/sgmls/instant/Makefile b/usr.bin/sgmls/instant/Makefile
index 217e81b..c004f87 100644
--- a/usr.bin/sgmls/instant/Makefile
+++ b/usr.bin/sgmls/instant/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= instant
SRCS= browse.c info.c main.c tables.c traninit.c translate.c
diff --git a/usr.bin/sgmls/libsgmls/Makefile b/usr.bin/sgmls/libsgmls/Makefile
index 330afe2..0d058f3 100644
--- a/usr.bin/sgmls/libsgmls/Makefile
+++ b/usr.bin/sgmls/libsgmls/Makefile
@@ -1,7 +1,7 @@
#
# Bmakefile for libsgmls
#
-# $FreeBSD$
+# $Id$
#
LIB= sgmls
diff --git a/usr.bin/sgmls/sgmls/Makefile b/usr.bin/sgmls/sgmls/Makefile
index 1de604d..b46e9f6 100644
--- a/usr.bin/sgmls/sgmls/Makefile
+++ b/usr.bin/sgmls/sgmls/Makefile
@@ -1,7 +1,7 @@
#
# Bmakefile for sgmls
#
-# $FreeBSD$
+# $Id$
#
PROG= sgmls
diff --git a/usr.bin/sgmls/sgmls/sgmls.1 b/usr.bin/sgmls/sgmls/sgmls.1
index 1b070db..bd92c92 100644
--- a/usr.bin/sgmls/sgmls/sgmls.1
+++ b/usr.bin/sgmls/sgmls/sgmls.1
@@ -1,4 +1,4 @@
-'\" $FreeBSD$
+'\" $Id$
'\" t
.\" Uncomment the next line to get a man page accurate for MS-DOS
.\"nr Os 1
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index 82b43f0..d9252ac 100644
--- a/usr.bin/strip/strip.1
+++ b/usr.bin/strip/strip.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)strip.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index 82b43f0..d9252ac 100644
--- a/usr.bin/strip/strip.1aout
+++ b/usr.bin/strip/strip.1aout
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)strip.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 36f14c2..22e1306 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -39,7 +39,7 @@ static char copyright[] =
#ifndef lint
/*static char sccsid[] = "@(#)strip.c 8.1 (Berkeley) 6/6/93";*/
-static char RCSid[] = "$FreeBSD$";
+static char RCSid[] = "$Id$";
#endif /* not lint */
#include <sys/types.h>
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 22457cb..f7c6e74 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)su.1 8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.\" this is for hilit19's braindeadness: "
.Dd April 18, 1994
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 936abfa..94dc3ca 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
/*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 96263fe..b8be493 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -36,7 +36,7 @@
static char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93";
*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
/*
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index e8cdba5..921a12e 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= talk
DPADD= ${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 3f83f2f..3aef9b2 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -29,7 +29,7 @@
* From:
* Id: find_interface.c,v 1.1 1995/08/14 16:08:39 wollman Exp
*
- * $FreeBSD$
+ * $Id$
*/
#include <unistd.h>
diff --git a/usr.bin/tclsh/Makefile b/usr.bin/tclsh/Makefile
index f2adb48..db56a03 100644
--- a/usr.bin/tclsh/Makefile
+++ b/usr.bin/tclsh/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= tclsh
SRCS= tclAppInit.c
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 403397f..0a4af30 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
# Makefile for tconv
-# $FreeBSD$
+# $Id$
PROG= tconv
SRCS= tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index bd4bc78..d7e1224 100644
--- a/usr.bin/tconv/tconv.1
+++ b/usr.bin/tconv/tconv.1
@@ -1,5 +1,5 @@
.\" @(#) mytinfo tconv.1 3.2 92/02/01 public domain, By Ross Ridge
-.\" $FreeBSD$
+.\" $Id$
.\"
.TH TCONV 1 "92/02/01" "mytinfo"
.SH NAME
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index ea476cd..0db8a39 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)telnet.1 8.5 (Berkeley) 3/1/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd March 1, 1994
.Dt TELNET 1
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 3d66ce1..af63b1e 100644
--- a/usr.bin/tsort/tsort.c
+++ b/usr.bin/tsort/tsort.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index 318f851..9c47b70 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)tty.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt TTY 1
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index dad87f3..b414356 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
PROG= units
diff --git a/usr.bin/units/README b/usr.bin/units/README
index 834a42b..b7a173a 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
This is a program which I wrote as a clone of the UNIX 'units'
command. I threw it together in a couple days, but it seems to work,
diff --git a/usr.bin/units/pathnames.h b/usr.bin/units/pathnames.h
index 25166ec..f41f207 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index da8c8dc..33dd059 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $Id$
.TH UNITS 1 "14 July 1993"
.SH NAME
units - conversion program
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 8030564..8ecc077 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $Id$ */
/*
* units.c Copyright (c) 1993 by Adrian Mariano (adrian@cam.cornell.edu)
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index 39cf007..9fcacc4 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $FreeBSD$
+/ $Id$
/ primitive units
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 07cc75a..3dd1e68 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)uuencode.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt UUENCODE 1
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index 3242525..6fc4795 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $Id$
PROG= vacation
CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index f151902..8ce05e0 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)vacation.1 8.1 (Berkeley) 6/16/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 16, 1993
.Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index fe2b1e6..5be04da 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -40,7 +40,7 @@ static char copyright[] =
#ifndef lint
static char sccsid[] = "From: @(#)vacation.c 8.2 (Berkeley) 1/26/94";
static char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
/*
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index e1cd217..4d9a1ca3 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
#
-# $FreeBSD$
+# $Id$
#
# This has most of the glue needed to compile tknvi and the perl hooks,
# but not all.
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index b9696f4..b0a03f6 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)w.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt W 1
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 30f36e7..f081b6b 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)wc.1 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd April 19, 1994
.Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 11d960a..43bbe4b 100644
--- a/usr.bin/wc/wc.c
+++ b/usr.bin/wc/wc.c
@@ -42,7 +42,7 @@ static const char copyright[] =
static const char sccsid[] = "@(#)wc.c 8.1 (Berkeley) 6/6/93";
#else
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif
#endif /* not lint */
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 1a9ed0f..a387464 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)what.1 8.1 (Berkeley) 6/6/93
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt WHAT 1
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 3a05e30..6c5a4f7 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
.\"
.\" @(#)whereis.1 8.2 (Berkeley) 12/30/93
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 15, 1996
.Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index cb8ac65..12b3997 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
#
# Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
#
-# $FreeBSD$
+# $Id$
#
sub usage
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index e0b9a52..e62c91e 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -27,7 +27,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
.\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.Dd January 26, 1995
.Dt WHICH 1
.Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 5c53b0d..991e551 100755
--- a/usr.bin/which/which.pl
+++ b/usr.bin/which/which.pl
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
+# $Id$
$all = $silent = $found = 0;
@path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index b0aa2c5..27dc5cd 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)who.1 8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd December 30, 1993
.Dt WHO 1
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 7a7dd98..eda3724 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)write.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd June 6, 1993
.Dt WRITE 1
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 8287081..71cc4b8 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)install.1 8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd September 22, 1996
.Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 0148958..6b63389 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -40,7 +40,7 @@ static const char copyright[] =
#ifndef lint
/*static char sccsid[] = "From: @(#)xinstall.c 8.1 (Berkeley) 7/21/93";*/
static const char rcsid[] =
- "$FreeBSD$";
+ "$Id$";
#endif /* not lint */
/*-
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 2bcd520..4e4fec2 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
# @(#)Makefile 5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $Id$
PROG= yacc
SRCS= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 505e2d2..8275106 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 433a994..237efe2 100644
--- a/usr.bin/yacc/defs.h
+++ b/usr.bin/yacc/defs.h
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)defs.h 5.6 (Berkeley) 5/24/93
- * $FreeBSD$
+ * $Id$
*/
#include <sys/cdefs.h> /* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 4695c89..3ccfb14 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index 357f8fa..275f7d1 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 6e76054..96d87a9 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 6d1a6e2..bb59d9d 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 6f79c7c..432989b 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 465d879..4566570 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 9f191f3..cd62062 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 925698a..2f2ee2e 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index a02370b..c2cfee5 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 41b0648..680363c 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $Id$
*/
#ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index fbff1a3..2e616e5 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -33,7 +33,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)yacc.1 5.8 (Berkeley) 5/24/93
-.\" $FreeBSD$
+.\" $Id$
.\"
.TH YACC 1 "May 24, 1993"
.UC 6
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index be1ada7..d04375c 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $Id$
PROG= ypcat
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index f2afb0c..9b31994 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd December 3, 1993
.Dt YPCAT 1
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index d231e52..bdf13ed 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $Id$
PROG= ypmatch
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index ec0b8b4..4dfbebd 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -26,7 +26,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD$
+.\" $Id$
.\"
.Dd December 3, 1993
.Dt YPMATCH 1
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index e07dc7d..e70cdb7 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $Id$
PROG= ypwhich
NOMAN=
OpenPOWER on IntegriCloud