author: Peter Wemm <peter@FreeBSD.org> 1997-02-22 19:58:13 +0000
committer: Peter Wemm <peter@FreeBSD.org> 1997-02-22 19:58:13 +0000
commit: c115df18cd0d5b01a18af0c608bc8b519b62273b (patch)
tree: 3065109edecd1d0133ded059802db9c9fcc2c8c5
parent: 53faa0dadee0318c35cdacdd47ca75f8606f745d (diff)
227 files changed, 231 insertions, 228 deletions
diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 8830144eb3940..85b16372d2958 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 38dcd059a880a..ab8a83e419132 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 38dcd059a880a..ab8a83e419132 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 7c2b21fc59559..e088e21b5c467 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 7c2b21fc59559..e088e21b5c467 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 50cd9a95ca8f6..288459c0b3fd8 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 50cd9a95ca8f6..288459c0b3fd8 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 99b7d08ddb00e..93a2da01484a5 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 99b7d08ddb00e..93a2da01484a5 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 99b7d08ddb00e..93a2da01484a5 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 2fc2d20835c30..88ca377082a78 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 3a67bc4e39fb1..f6b0a1877befb 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 2fc2d20835c30..88ca377082a78 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 3a67bc4e39fb1..f6b0a1877befb 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 05ac2d0e94aa4..78a980650a487 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 b44ef97a96caa..865728720fc46 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 88332ea9a3ed4..4edd02e412648 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 88332ea9a3ed4..4edd02e412648 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 6fcc00c111c45..6e1581c83f8a3 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 437ee5a09cc8f..cd2d54dde04e4 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 ae718755c0dd3..daffd0aa185ff 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 79418185e48c1..cbbdcc4603969 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 91138bbf70b3f..48b91a9a42a6d 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 7930ee5437b5e..d52fd3db19901 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 62cc1a97f68d0..796bb6b239167 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 f648d9dc05193..c850bf6063671 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 97da3e3ff0908..0a91a061a91a7 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 2bef9608ed4f2..a98e25a4ed881 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 b0b7686d0ed29..0dd50551ab599 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 99e3236706b9b..48ed7c8ebcbe5 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 4b24961c353c5..ce7c7824778e7 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 efb67bcf34dda..58a619a18a11c 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 db4a69dbc6f3a..514bf7ce4bfff 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 c5248971ce70b..0a1e1c0573d9c 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 592d6bce1c66b..75339a8047377 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 7c16297dbaea7..295fe3f53aaf5 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 8830144eb3940..85b16372d2958 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 38dcd059a880a..ab8a83e419132 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 7c2b21fc59559..e088e21b5c467 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 50cd9a95ca8f6..288459c0b3fd8 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 99b7d08ddb00e..93a2da01484a5 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 2fc2d20835c30..88ca377082a78 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 3a67bc4e39fb1..f6b0a1877befb 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 c9e356300e710..5765ab39f8f1c 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 212eac32a1c63..3e7dd6b1af2d7 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 50cc9cea2bda4..f75572abb73b3 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 6d4901dcb370f..322fd2de9a23e 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 e3e7b136f2ce0..df09d6de30de0 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 cb54c4c4e6437..4ff062e06ade5 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 37c59aa878d4c..1be409a5e4df6 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 0241aeba27c65..0fa82262ad0c0 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 cd5b3cb2718a5..2fa3b27a53d8b 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 cd5b3cb2718a5..2fa3b27a53d8b 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 8223cbd7deda6..1e88453225080 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 5a457cd463067..5655c3387e9c3 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 4b847d77de29e..26f42d279b165 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 b8eb4f5b91945..28cd21e834379 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 34f778580bd78..c2dda08198ecd 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 258e70f2510ca..0bad9045fcb33 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 6e4d006aa4905..dfccf38fc84da 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 9111afe4ae56b..b738deb5e4a76 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 0797a40a62838..1fd6d07c14c19 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 478ed7c2bb241..3fed7e3bc6361 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 ebe4a92df49e3..ebccefa2aa19b 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 4958275b40ed5..904f200fcac57 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 989e4bbf8eeae..1c24bcc71989b 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 6b032e2766cef..6cc7bda7d56df 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 2c920d54fc41d..65c9c4101cfd1 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 4c99a60c529f7..717c82658c119 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 47ba2dfd7483e..5e4afcc5c781b 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 e5e636080d80b..680b08be121f1 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 309ad8536b384..b8fd2b98424fd 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 23cdbcbc83e20..9ddea83432e5a 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 8316c58965052..260a72479f987 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 144f9a6e7627d..a05c52997662a 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 0f146868ff0f7..2e8dc66c473a7 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 b0688c288dafd..7cfae99cd9c33 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 233adc7b2232c..10db42e79473e 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 68ca7ed4037ed..8af26bab5cfa4 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 073db94e21868..7c9f8c3b438f8 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 1b1b33956ba68..9989f1e846e60 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 d7b7d762c25a1..819efa2867cfd 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 71b7c01dec933..05455cf8e55ae 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 d1205735270d1..246120ba8de8e 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 e80f0d8f543f0..63f36e93c2121 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 286de75f9d281..046430ec884d7 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 ebcc7b53d0e05..64d3cbd0e2081 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 302da3af07af0..4c3cbadca8e1a 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 3e1ff4746aa9f..45f82b93f8f89 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 e4c52f866e185..0f80876250b23 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 e27734895dc80..663428a0526d6 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 3f4c3c08b7c38..2a877162d3f09 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 18992570b2544..5e20b836c042e 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 e02df6837ad1c..f40c7b386f7a5 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 fdebe5732e14c..c17c6f11bcbf0 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 b5ac7b4965539..5ae9e6631e04b 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 791c3eba6b701..ca4578b1e71c8 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 d64a65f24356f..9e997d4472314 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 9b9e75fae3263..20937c0ed6c64 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 a83f492782660..e2b4fa7be6839 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 e9d273b979a7b..e2622da5f4667 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 f5e99b6dae212..57bd157b87d34 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 77d89c45bbdf7..47fb6ab863e1b 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 32a7e1988c3d2..eac103404a898 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 185802861f3ca..5c6d5cfa0638a 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 4680628694e50..9ded00cd8cb5d 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 c16d1a9041da4..e0a4f02629a60 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 2fbe688c16012..3b25443ca3a2d 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 9e693f33cabab..82a4798c05ef7 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 d16954e9342ac..124aa04343153 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 7cd61569294c7..ef2e65839d3e2 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 3ee4a16ba4a77..45d5cdce53172 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 384fcb4fa5ef5..8f29ec8fd219b 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 4e63e38b70c3e..a240c05b1fa5a 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 f6a42605cd1d9..8ad51d0e31d9b 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 05ac2d0e94aa4..78a980650a487 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 335dd720fb0d8..5e238ce47d43f 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 976b4d5217d99..359a85613b3b8 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 f51e344bb7e86..2722f877df968 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 38160c032297b..e63efcf6009ee 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 6230cc5115fea..8613f79cb5eab 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 6d3bff517ed63..e1fe34daad436 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 62967db9047f4..ca12cda9042db 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 9247c09335464..cc9290e6990ad 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 3f3d72aa7a9fe..654d2e6babe2b 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 66dfb4093587f..710087a5e0db9 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 2a5d79e7b00bb..227f3f0256ab7 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 73f888d1911d2..db2fab4e79b43 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 f6887bcde6a35..fad8f6c17a955 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 5f3e38d636ab6..0ebeb987e60b7 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 5f3e38d636ab6..0ebeb987e60b7 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 0e84a83fe9ef4..1e3f9778feb3e 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 da541de3dae85..de04e8daa6e06 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 a9162c31691bb..bb52c8229bcd7 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 f886544e37096..4c7aeea75e087 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 89a3a0c1f18e4..a9fc4cf5054e7 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 fd70f89ca8c74..7a4bd127c98d6 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 48faf022f658f..bb9cd7ce066ae 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 0cde89010e09c..64358dd9d1744 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 2008d98cd3c96..88eeeed339d32 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 be1602bf90ed7..b82cced57f470 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 f75b9590034a2..bb419d6c5d9dd 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 f75b9590034a2..bb419d6c5d9dd 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 a56a1632e9a64..a5dc82ca2e25e 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 7be1db3d17f1d..6d2986b33f6c0 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 10d1d55665ad4..f9377c6dbd1b7 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 8203fb44c151d..25662e308eb25 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 2379f8eb0110b..1cf5bf1b3949c 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 0072565ac1f02..2a28fa0699da5 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 d86d32cc4d103..ab50a8a88f4cf 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 e339731f9ae56..76e6c1f59b604 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 33ea352127664..ba9a67e12b32e 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 7a8633e87483f..3e48bce413eab 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 2b9730e969d44..e4103d9e13f36 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 47689eb8b705c..a6b753ff4e5a8 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 c8953df737937..7cf616427099f 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 74f89b358ffe0..3d7b9a5d2ca6d 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 d583df78720e2..e81c30aafafed 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 ae0b06e04de80..15315035a453e 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 0b0eaf2163a1f..fe0983ac92170 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 11323ade48a83..ab2275f2f66a8 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 7a65f73449eef..ee9d85dbfa7f2 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 793457a25d0e3..12e52d5809bbd 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 0df4e7a23cf72..ed3b757b425bc 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 96be63dbbb352..96ce8200c74fd 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 41a5df021d3b3..7a788643a49b3 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 00fc751c4b05f..e2a8204349226 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 217e81b84d810..c004f87860c62 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 330afe2157751..0d058f36546ad 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 1de604dbeb130..b46e9f6f56e69 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 1b070db010923..bd92c92e28ff5 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 82b43f00b1d9d..d9252ac6e910d 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 82b43f00b1d9d..d9252ac6e910d 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 36f14c26d6c4c..22e13063d04c5 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 22457cb32d6fd..f7c6e7473f7fb 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 936abfabd34f7..94dc3ca381e55 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 96263fe812d5f..b8be4936914e0 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 e8cdba5f7204e..921a12e168ad8 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 3f83f2f246030..3aef9b20dc864 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 f2adb4817ffe7..db56a03f0f258 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 403397f67e4a9..0a4af30bbe346 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 bd4bc78a133fa..d7e1224399734 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 ea476cd599b6f..0db8a39d5a9d3 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 3d66ce18c9d9d..af63b1e8bba2b 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 318f8513e92bf..9c47b705885a8 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 dad87f3ecc955..b41435647ecfb 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 834a42b445342..b7a173a383201 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 25166ec62b443..f41f2077f1682 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 da8c8dc7010ed..33dd059e25075 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 80305640dad0b..8ecc077b2032b 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 39cf007189408..9fcacc40d1f80 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 07cc75a876345..3dd1e680b65cb 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 3242525deb7b8..6fc47954892ce 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 f1519023161fe..8ce05e04ba135 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 fe2b1e67a76b5..5be04dae64869 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 e1cd2177b9957..4d9a1ca3391db 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 b9696f4d7bb74..b0a03f6f7ae5b 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 30f36e761dab9..f081b6b97ea6b 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 11d960ad2cd53..43bbe4b2b8fed 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 1a9ed0f5c736d..a387464008e2d 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 3a05e300994c9..6c5a4f74f2a12 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 cb8ac6549eaf4..12b399763adf2 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 e0b9a5210b8a9..e62c91e2b4dc2 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 5c53b0d874c8a..991e5511ed162 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 b0aa2c5109940..27dc5cd03feef 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 7a7dd98de7d7c..eda3724bb4864 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 8287081f1f110..71cc4b8f10481 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 0148958f7e7ec..6b63389039a40 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 2bcd52056126c..4e4fec28da1c1 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 505e2d2a55c7f..82751060fbd7e 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 433a994db23c0..237efe29d2f7c 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 4695c89c7b263..3ccfb1413b865 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 357f8fa9b9648..275f7d1605f70 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 6e7605431f7cb..96d87a9714cb9 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 6d1a6e2cffd33..bb59d9d7d4558 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 6f79c7ce18112..432989b40e3f2 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 465d87941a0fd..45665703f354a 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 9f191f325534b..cd62062cbe25f 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 925698a7e8dd6..2f2ee2e136d1f 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 a02370b0fe39e..c2cfee5d8b852 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 41b06485b5986..680363c126408 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 fbff1a3dccaf8..2e616e5dea64b 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 be1ada785570e..d04375c9dd7fb 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 f2afb0c6844ea..9b31994fe16f4 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 d231e52d43bd1..bdf13edac4c94 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 ec0b8b4063b12..4dfbebdddc337 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 e07dc7dd0eb55..e70cdb7ccd64d 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=
author	Peter Wemm <peter@FreeBSD.org>	1997-02-22 19:58:13 +0000
committer	Peter Wemm <peter@FreeBSD.org>	1997-02-22 19:58:13 +0000
commit	c115df18cd0d5b01a18af0c608bc8b519b62273b (patch)
tree	3065109edecd1d0133ded059802db9c9fcc2c8c5
parent	53faa0dadee0318c35cdacdd47ca75f8606f745d (diff)