This commit was manufactured by cvs2svn to create tagrelease/3.5.0_cvs

'RELENG_3_5_0_RELEASE'.

This commit was manufactured to restore the state of the 3.5-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

751 files changed, 761 insertions, 761 deletions

diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 265bdb99f912..4dc85c79f3e0 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/7/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/Makefile,v 1.122.2.4 1999/12/13 15:08:15 peter Exp $
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 39b827ed8f8e..7b5fa264c4ce 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)apply.1	8.2 (Berkeley) 4/4/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/apply/apply.1,v 1.4.2.2 1999/12/06 04:35:05 kris Exp $
 .\"
 .Dd April 4, 1994
 .Dt APPLY 1
diff --git a/usr.bin/apply/apply.c b/usr.bin/apply/apply.c
index 978062ff1972..bc5db960c966 100644
--- a/usr.bin/apply/apply.c
+++ b/usr.bin/apply/apply.c
@@ -39,7 +39,7 @@
 static const char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/apply/apply.c,v 1.5.2.3 2000/06/08 06:15:38 kris Exp $";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index af3161251965..242a22037e79 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ar/Makefile,v 1.8.2.1 1999/08/29 15:25:20 peter Exp $
 
 PROG=	ar
 CFLAGS+=-I${.CURDIR} -Wall
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 3741299cb8ae..5764ec910319 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$
+.\" $FreeBSD: src/usr.bin/ar/ar.1,v 1.5.2.1 1999/08/29 15:25:20 peter Exp $
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.1aout b/usr.bin/ar/ar.1aout
index 3741299cb8ae..19043ee35479 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$
+.\" $FreeBSD: src/usr.bin/ar/ar.1aout,v 1.5.2.1 1999/08/29 15:25:22 peter Exp $
 .\"
 .Dd June 29, 1993
 .Dt AR 1
diff --git a/usr.bin/ar/ar.c b/usr.bin/ar/ar.c
index c53c1e44dcfa..6997eb3f78de 100644
--- a/usr.bin/ar/ar.c
+++ b/usr.bin/ar/ar.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ar/ar.c,v 1.7.2.1 1999/08/29 15:25:22 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile
index df96d573b49b..85193c541455 100644
--- a/usr.bin/at/Makefile
+++ b/usr.bin/at/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/at/Makefile,v 1.9.2.1 1999/08/29 15:25:23 peter Exp $
 
 .include "${.CURDIR}/Makefile.inc"
 
diff --git a/usr.bin/at/at.c b/usr.bin/at/at.c
index 88bde639cd22..3580659f65fd 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 const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/at/at.c,v 1.15.2.1 1999/08/29 15:25:24 peter Exp $";
 char *no_export[] =
 {
     "TERM", "TERMCAP", "DISPLAY", "_"
diff --git a/usr.bin/at/at.man b/usr.bin/at/at.man
index fc5bc90ce21a..2985754ea7f6 100644
--- a/usr.bin/at/at.man
+++ b/usr.bin/at/at.man
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/at/at.man,v 1.8.2.3 1999/08/29 15:25:25 peter Exp $
 .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 6098c9501e9e..0f7da346abcd 100644
--- a/usr.bin/at/panic.c
+++ b/usr.bin/at/panic.c
@@ -38,7 +38,7 @@
 /* File scope variables */
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/at/panic.c,v 1.8.2.1 1999/08/29 15:25:25 peter Exp $";
 
 /* External variables */
 
diff --git a/usr.bin/at/parsetime.c b/usr.bin/at/parsetime.c
index f8541edbc5e4..ba85476d84dc 100644
--- a/usr.bin/at/parsetime.c
+++ b/usr.bin/at/parsetime.c
@@ -144,7 +144,7 @@ static int sc_tokid;	/* scanner - token id */
 static int sc_tokplur;	/* scanner - is token plural? */
 
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/at/parsetime.c,v 1.16.2.2 2000/04/14 13:55:28 sheldonh Exp $";
 
 /* Local functions */
 
diff --git a/usr.bin/at/perm.c b/usr.bin/at/perm.c
index 6d2d27c70182..4bc46af7ca61 100644
--- a/usr.bin/at/perm.c
+++ b/usr.bin/at/perm.c
@@ -48,7 +48,7 @@
 
 /* File scope variables */
 
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/at/perm.c,v 1.6.2.1 1999/08/29 15:25:27 peter Exp $";
 
 /* Function declarations */
 
diff --git a/usr.bin/banner/banner.6 b/usr.bin/banner/banner.6
index 119a3e822c7b..e9b059a5a09d 100644
--- a/usr.bin/banner/banner.6
+++ b/usr.bin/banner/banner.6
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)banner.6	8.2 (Berkeley) 4/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/banner/banner.6,v 1.3.2.1 1999/08/29 15:25:29 peter Exp $
 .\"
 .Dd April 29, 1995
 .Dt BANNER 6
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index ba95e761270d..48d3fbd85e01 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$
+.\" $FreeBSD: src/usr.bin/basename/basename.1,v 1.5.2.1 1999/08/29 15:25:30 peter Exp $
 .\"
 .Dd April 18, 1994
 .Dt BASENAME 1
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 350d15324a9e..c43b0abf4d1d 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$
+.\" $FreeBSD: src/usr.bin/biff/biff.1,v 1.5.2.2 2000/03/06 11:34:08 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt BIFF 1
diff --git a/usr.bin/biff/biff.c b/usr.bin/biff/biff.c
index 606afa8a919d..7daed5b9ad39 100644
--- a/usr.bin/biff/biff.c
+++ b/usr.bin/biff/biff.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/biff/biff.c,v 1.5.2.1 1999/08/29 15:25:32 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/brandelf/brandelf.c b/usr.bin/brandelf/brandelf.c
index c09d91c625d3..c3b0b5ac7833 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$
+ * $FreeBSD: src/usr.bin/brandelf/brandelf.c,v 1.10.2.1 1999/08/29 15:25:34 peter Exp $
  */
 
 #include <elf.h>
diff --git a/usr.bin/c89/c89.1 b/usr.bin/c89/c89.1
index a683df08f43d..d6a8515e3f8a 100644
--- a/usr.bin/c89/c89.1
+++ b/usr.bin/c89/c89.1
@@ -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$
+.\" $FreeBSD: src/usr.bin/c89/c89.1,v 1.2.4.1 1999/08/29 15:25:35 peter Exp $
 .\" "
 .Dd September 17, 1997
 .Os
diff --git a/usr.bin/c89/c89.sh b/usr.bin/c89/c89.sh
index 157fbbff884a..5985c2338831 100755
--- a/usr.bin/c89/c89.sh
+++ b/usr.bin/c89/c89.sh
@@ -24,7 +24,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$
+# $FreeBSD: src/usr.bin/c89/c89.sh,v 1.3.4.1 1999/08/29 15:25:36 peter Exp $
 #
 # This is the Posix.2 mandated C compiler.  Basically, a hook to the
 # cc(1) command.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index d783c494dcbf..a3fad32991a2 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)calendar.1  8.1 (Berkeley) 6/29/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/calendar/calendar.1,v 1.13.2.1 2000/03/06 11:34:10 sheldonh Exp $
 .\"
 .Dd June 29, 1993
 .Dt CALENDAR 1
diff --git a/usr.bin/calendar/calendars/calendar.all b/usr.bin/calendar/calendars/calendar.all
index 652829ef863d..b883db3f13d8 100644
--- a/usr.bin/calendar/calendars/calendar.all
+++ b/usr.bin/calendar/calendars/calendar.all
@@ -1,7 +1,7 @@
 /*
  * International and national calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.all,v 1.5.2.1 1999/08/29 15:25:41 peter Exp $
  */
 
 #ifndef _calendar_all_
diff --git a/usr.bin/calendar/calendars/calendar.birthday b/usr.bin/calendar/calendars/calendar.birthday
index 06a30c0d5268..e7ecc2fa9afc 100644
--- a/usr.bin/calendar/calendars/calendar.birthday
+++ b/usr.bin/calendar/calendars/calendar.birthday
@@ -1,7 +1,7 @@
 /*
  * Birthday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.birthday,v 1.10.2.1 1999/08/29 15:25:42 peter Exp $
  */
 
 #ifndef _calendar_birthday_
diff --git a/usr.bin/calendar/calendars/calendar.christian b/usr.bin/calendar/calendars/calendar.christian
index d7562f74176d..20d8adaa4ebb 100644
--- a/usr.bin/calendar/calendars/calendar.christian
+++ b/usr.bin/calendar/calendars/calendar.christian
@@ -1,7 +1,7 @@
 /*
  * Christian
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.christian,v 1.7.2.1 1999/08/29 15:25:42 peter Exp $
  */
 
 #ifndef _calendar_christian_
diff --git a/usr.bin/calendar/calendars/calendar.computer b/usr.bin/calendar/calendars/calendar.computer
index 0b45111acde0..46986891cdfc 100644
--- a/usr.bin/calendar/calendars/calendar.computer
+++ b/usr.bin/calendar/calendars/calendar.computer
@@ -1,7 +1,7 @@
 /*
  * Computer
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.computer,v 1.5.2.1 1999/08/29 15:25:43 peter Exp $
  */
 
 #ifndef _calendar_computer_
diff --git a/usr.bin/calendar/calendars/calendar.croatian b/usr.bin/calendar/calendars/calendar.croatian
index af9a55854387..c05432c078c5 100644
--- a/usr.bin/calendar/calendars/calendar.croatian
+++ b/usr.bin/calendar/calendars/calendar.croatian
@@ -1,7 +1,7 @@
 /*
  * Croatian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.croatian,v 1.3.2.1 1999/08/29 15:25:43 peter Exp $
  */
 
 #ifndef _calendar_croatian_
diff --git a/usr.bin/calendar/calendars/calendar.german b/usr.bin/calendar/calendars/calendar.german
index d22207cfd500..9b97b2726991 100644
--- a/usr.bin/calendar/calendars/calendar.german
+++ b/usr.bin/calendar/calendars/calendar.german
@@ -1,7 +1,7 @@
 /*
  * German calendar file(s)
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.german,v 1.4.2.1 1999/08/29 15:25:44 peter Exp $
  */
 
 #ifndef _calendar_german_
diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history
index d1b3e66647ee..2775a03bd2f3 100644
--- a/usr.bin/calendar/calendars/calendar.history
+++ b/usr.bin/calendar/calendars/calendar.history
@@ -1,7 +1,7 @@
 /*
  * History
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.history,v 1.7.2.3 1999/12/18 01:27:24 cpiazza Exp $
  */
 
 #ifndef _calendar_history_
diff --git a/usr.bin/calendar/calendars/calendar.holiday b/usr.bin/calendar/calendars/calendar.holiday
index 0ae713c1523b..b3b7d5bc494f 100644
--- a/usr.bin/calendar/calendars/calendar.holiday
+++ b/usr.bin/calendar/calendars/calendar.holiday
@@ -1,7 +1,7 @@
 /*
  * Holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.holiday,v 1.7.2.1 1999/08/29 15:25:46 peter Exp $
  */
 
 #ifndef _calendar_holiday_
diff --git a/usr.bin/calendar/calendars/calendar.judaic b/usr.bin/calendar/calendars/calendar.judaic
index f1bc9e43e263..e29042f20644 100644
--- a/usr.bin/calendar/calendars/calendar.judaic
+++ b/usr.bin/calendar/calendars/calendar.judaic
@@ -1,7 +1,7 @@
 /*
  * Judaic
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.judaic,v 1.6.2.1 1999/08/29 15:25:47 peter Exp $
  */
 
 #ifndef _calendar_judaic_
diff --git a/usr.bin/calendar/calendars/calendar.music b/usr.bin/calendar/calendars/calendar.music
index 99629ce73c81..cb6b98c283fb 100644
--- a/usr.bin/calendar/calendars/calendar.music
+++ b/usr.bin/calendar/calendars/calendar.music
@@ -1,7 +1,7 @@
 /*
  * Music
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.7.2.1 1999/08/29 15:25:47 peter Exp $
  */
 
 #ifndef _calendar_music_
diff --git a/usr.bin/calendar/calendars/calendar.russian b/usr.bin/calendar/calendars/calendar.russian
index e308873676c1..a6d4d71d93c8 100644
--- a/usr.bin/calendar/calendars/calendar.russian
+++ b/usr.bin/calendar/calendars/calendar.russian
@@ -1,7 +1,7 @@
 /*
  * Russian calendar files
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.russian,v 1.3.2.1 1999/08/29 15:25:48 peter Exp $
  */
 
 #ifndef _calendar_russian_
diff --git a/usr.bin/calendar/calendars/calendar.usholiday b/usr.bin/calendar/calendars/calendar.usholiday
index 712a4b784599..959dfd10c585 100644
--- a/usr.bin/calendar/calendars/calendar.usholiday
+++ b/usr.bin/calendar/calendars/calendar.usholiday
@@ -1,7 +1,7 @@
 /*
  * USA holiday
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.usholiday,v 1.6.2.1 1999/08/29 15:25:48 peter Exp $
  */
 
 #ifndef _calendar_usholiday_
diff --git a/usr.bin/calendar/calendars/calendar.world b/usr.bin/calendar/calendars/calendar.world
index 7e2833b3a5fe..01cd95d2c68e 100644
--- a/usr.bin/calendar/calendars/calendar.world
+++ b/usr.bin/calendar/calendars/calendar.world
@@ -1,7 +1,7 @@
 /*
  * World wide calendar files, except national calendars
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.world,v 1.3.2.1 1999/08/29 15:25:49 peter Exp $
  */
 
 #ifndef _calendar_world_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
index 92c0e51ff73e..bfddbbae45a2 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all
@@ -1,7 +1,7 @@
 /*
  * deutscher Kalender
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.all,v 1.4.2.1 1999/08/29 15:25:51 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_all_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
index 4969fc7b7d2d..32305f5b8358 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag
@@ -1,7 +1,7 @@
 /*
  * Feiertage
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.feiertag,v 1.5.2.1 1999/08/29 15:25:52 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_feiertag_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
index 24d51f61fe57..2f913923fb60 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte
@@ -13,7 +13,7 @@
  * 
  * ISBN 3-924521-59-X
  * 
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.geschichte,v 1.5.2.1 1999/08/29 15:25:52 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_geschichte_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
index aa4ef195e74d..af6b229cbf49 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche
@@ -1,7 +1,7 @@
 /*
  * Kirche in Deutschland
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.kirche,v 1.5.2.1 1999/08/29 15:25:53 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_kirche_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
index 62acab9011a8..57c5feda295f 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur
@@ -1,7 +1,7 @@
 /*
  * Literatur
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.literatur,v 1.5.2.1 1999/08/29 15:25:54 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_literatur_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
index ad63646271f6..c99562850eca 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik
@@ -1,7 +1,7 @@
 /*
  * Musik
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.musik,v 1.5.2.1 1999/08/29 15:25:54 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_musik_
diff --git a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
index 175fe0fa4207..d039c4aae62b 100644
--- a/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
+++ b/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft
@@ -1,7 +1,7 @@
 /*
  * Wissenschaft
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/de_DE.ISO_8859-1/calendar.wissenschaft,v 1.5.2.1 1999/08/29 15:25:55 peter Exp $
  */
 
 #ifndef _de_DE_ISO_8859_1_wissenschaft_
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
index 11be34324383..6bf6d4c90748 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all
@@ -1,7 +1,7 @@
 /*
  *  hrvatski calendar
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.all,v 1.3.2.1 1999/08/29 15:25:57 peter Exp $
  */
 
 #ifndef _hr_HR_ISO_8859_2_all
diff --git a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
index b78ea99533f8..23dab4052dab 100644
--- a/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
+++ b/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici
@@ -1,7 +1,7 @@
 /*
  * hrvatski praznici
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/hr_HR.ISO_8859-2/calendar.praznici,v 1.5.2.1 1999/08/29 15:25:58 peter Exp $
  */
 
 #ifndef _hr_HR_ISO_8859_2_praznici
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
index fcdc5e7f8f5e..3d053f650a1b 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÊ ËÁÌÅÎÄÁÒØ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.all,v 1.3.2.1 1999/08/29 15:25:59 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_all
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
index 2a45b1d2650f..41eee082bcab 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common
@@ -1,7 +1,7 @@
 /*
  * òÕÓÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.common,v 1.7.2.1 1999/08/29 15:26:00 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_common_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
index 22de9d3588b7..3ea2e46d1151 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk
@@ -1,7 +1,7 @@
 /*
  * ðÅÒÅ×ÏÄ ÞÁÓÏ× ÄÌÑ ÍÏÓËÏ×ÓËÏÊ ×ÒÅÍÅÎÎÏÊ ÚÏÎÙ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.msk,v 1.4.2.1 1999/08/29 15:26:01 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_msk_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
index 0105343eae8a..ab7a09669f4a 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox
@@ -1,7 +1,7 @@
 /*
  * ðÒÁ×ÏÓÌÁ×ÎÙÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.orthodox,v 1.3.2.1 1999/08/29 15:26:02 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_orthodox_
diff --git a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
index c37c993680e9..a3f55ee44819 100644
--- a/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
+++ b/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan
@@ -1,7 +1,7 @@
 /*
  * ñÚÙÞÅÓËÉÅ ÐÒÁÚÄÎÉËÉ
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/calendars/ru_SU.KOI8-R/calendar.pagan,v 1.3.2.1 1999/08/29 15:26:02 peter Exp $
  */
 
 #ifndef _ru_SU_KOI8_R_pagan_
diff --git a/usr.bin/calendar/day.c b/usr.bin/calendar/day.c
index 508c71fdd653..2de8ec52c813 100644
--- a/usr.bin/calendar/day.c
+++ b/usr.bin/calendar/day.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/day.c,v 1.11.2.1 1999/08/29 15:25:38 peter Exp $
  */
 
 
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 846b96ed5805..036ddee2540f 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/io.c,v 1.11.2.1 1999/08/29 15:25:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 12bff9f86e92..45d7ae1c82d4 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/calendar/ostern.c,v 1.7.2.1 1999/08/29 15:25:39 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 4cd9ab2c979e..a0d4bc03163f 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$
+.\" $FreeBSD: src/usr.bin/cap_mkdb/cap_mkdb.1,v 1.5.2.1 1999/08/29 15:26:04 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt CAP_MKDB 1
diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile
index 2d25d76a12a0..97e5afd20291 100644
--- a/usr.bin/chat/Makefile
+++ b/usr.bin/chat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chat/Makefile,v 1.6.2.1 1999/08/29 15:26:05 peter Exp $
 
 PROG=	chat
 CFLAGS+=-Wall
diff --git a/usr.bin/chat/chat.8 b/usr.bin/chat/chat.8
index b5f469814c77..b0371475305b 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$
+.\" $FreeBSD: src/usr.bin/chat/chat.8,v 1.12.2.2 2000/03/06 11:34:11 sheldonh Exp $
 .\" SH section heading
 .\" SS subsection heading
 .\" LP paragraph
diff --git a/usr.bin/chat/chat.c b/usr.bin/chat/chat.c
index fd71405d17b2..712ce3bc2c5b 100644
--- a/usr.bin/chat/chat.c
+++ b/usr.bin/chat/chat.c
@@ -79,7 +79,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chat/chat.c,v 1.13.2.2 1999/12/04 02:13:11 kris Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index 4f3f708a6899..d47c76551828 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chflags/chflags.1,v 1.6.2.3 2000/04/03 22:13:40 jdp Exp $
 .\"
 .Dd May 2, 1995
 .Dt CHFLAGS 1
diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile
index c0bbd6aea174..83f78d0a5e8f 100644
--- a/usr.bin/chkey/Makefile
+++ b/usr.bin/chkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/chkey/Makefile,v 1.2.2.1 1999/08/29 15:26:10 peter Exp $
 
 PROG=	chkey
 SRCS=	chkey.c update.c generic.c
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 5ec2be1d52dc..0454cb304e1d 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)chpass.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/chpass/chpass.1,v 1.14.2.8 2000/03/27 10:07:31 sheldonh Exp $
 .\"
 .Dd December 30, 1993
 .Dt CHPASS 1
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c
index 77f9f7832f84..59ea76b90706 100644
--- a/usr.bin/chpass/chpass.c
+++ b/usr.bin/chpass/chpass.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "From: @(#)chpass.c	8.4 (Berkeley) 4/2/94";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chpass/chpass.c,v 1.15.2.1 1999/08/29 15:26:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/chpass/edit.c b/usr.bin/chpass/edit.c
index cfb951302d65..b2a6e7a8d785 100644
--- a/usr.bin/chpass/edit.c
+++ b/usr.bin/chpass/edit.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/chpass/edit.c,v 1.12.2.2 1999/08/29 15:26:14 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/chpass/pw_yp.c b/usr.bin/chpass/pw_yp.c
index d6cfaebb15a3..36b0ba2bac76 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$
+ * $FreeBSD: src/usr.bin/chpass/pw_yp.c,v 1.13.2.3 1999/10/20 15:25:43 gallatin Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/pw_yp.h b/usr.bin/chpass/pw_yp.h
index 15f63d038776..5bebe6fc8c0f 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$
+ * $FreeBSD: src/usr.bin/chpass/pw_yp.h,v 1.6.2.1 1999/08/29 15:26:15 peter Exp $
  */
 
 #ifdef YP
diff --git a/usr.bin/chpass/util.c b/usr.bin/chpass/util.c
index e7dd06b6db88..2ffcba776453 100644
--- a/usr.bin/chpass/util.c
+++ b/usr.bin/chpass/util.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)util.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/chpass/util.c,v 1.7.2.1 1999/08/29 15:26:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index 66a1d18f0c87..f212c5be46f6 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cksum.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cksum/cksum.1,v 1.7.2.2 1999/08/29 15:26:17 peter Exp $
 .\"
 .Dd April 28, 1995
 .Dt CKSUM 1
diff --git a/usr.bin/cksum/cksum.c b/usr.bin/cksum/cksum.c
index 01a7165c1d9c..8f3ea5a9045c 100644
--- a/usr.bin/cksum/cksum.c
+++ b/usr.bin/cksum/cksum.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)cksum.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/cksum/cksum.c,v 1.9.2.1 1999/08/29 15:26:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 6153e5160cb4..e92a4be829c9 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$
+.\" $FreeBSD: src/usr.bin/cmp/cmp.1,v 1.6.2.1 1999/08/29 15:26:18 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt CMP 1
diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile
index 29b5e108b553..3ff16f2fd35e 100644
--- a/usr.bin/colldef/Makefile
+++ b/usr.bin/colldef/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/Makefile,v 1.14.2.1 1999/08/29 15:26:20 peter Exp $
 
 PROG = colldef
 LFLAGS = -8 -i
diff --git a/usr.bin/colldef/colldef.1 b/usr.bin/colldef/colldef.1
index 74524f8f112e..aafedc6df2cf 100644
--- a/usr.bin/colldef/colldef.1
+++ b/usr.bin/colldef/colldef.1
@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/colldef/colldef.1,v 1.5.2.2 2000/03/06 11:34:16 sheldonh Exp $
 .\"
 .Dd January, 27 1995
 .Dt COLLDEF 1
diff --git a/usr.bin/colldef/data/Makefile b/usr.bin/colldef/data/Makefile
index b828085c3b5a..6e7cc046ee3e 100644
--- a/usr.bin/colldef/data/Makefile
+++ b/usr.bin/colldef/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/Makefile,v 1.15.2.7 1999/08/29 15:26:23 peter Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/colldef/data/de_DE.DIS_8859-15.src b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
index e79e593db17c..f2335c20cbb2 100644
--- a/usr.bin/colldef/data/de_DE.DIS_8859-15.src
+++ b/usr.bin/colldef/data/de_DE.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # German/ISO 8859-1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/de_DE.DIS_8859-15.src,v 1.3.2.3 1999/08/29 15:26:23 peter Exp $
 #
 charmap map.DIS_8859-15
 order \
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 130e8501ab14..0db5488a34ed 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$
+# $FreeBSD: src/usr.bin/colldef/data/de_DE.ISO_8859-1.src,v 1.4.2.4 1999/08/29 15:26:24 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/es_ES.DIS_8859-15.src b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
index 002b63503d5a..e87396f15be5 100644
--- a/usr.bin/colldef/data/es_ES.DIS_8859-15.src
+++ b/usr.bin/colldef/data/es_ES.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # Espan~ol (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/es_ES.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:24 peter Exp $
 #
 charmap map.DIS_8859-15
 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 7c2b21fc5955..848a4678afbb 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$
+# $FreeBSD: src/usr.bin/colldef/data/es_ES.ISO_8859-1.src,v 1.3.2.1 1999/08/29 15:26:25 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/is_IS.DIS_8859-15.src b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
index fe4dd9beae88..8f8bab290d4f 100644
--- a/usr.bin/colldef/data/is_IS.DIS_8859-15.src
+++ b/usr.bin/colldef/data/is_IS.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # icelandic (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/is_IS.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:26 peter Exp $
 #
 charmap map.DIS_8859-15
 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 50cd9a95ca8f..ef3b33de8868 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$
+# $FreeBSD: src/usr.bin/colldef/data/is_IS.ISO_8859-1.src,v 1.4.2.1 1999/08/29 15:26:26 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ASCII.src b/usr.bin/colldef/data/lt_LN.ASCII.src
index df3c34088764..dbd8784f2b10 100644
--- a/usr.bin/colldef/data/lt_LN.ASCII.src
+++ b/usr.bin/colldef/data/lt_LN.ASCII.src
@@ -1,6 +1,6 @@
 # ASCII
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ASCII.src,v 1.1.4.1 1999/08/29 15:26:27 peter Exp $
 #
 order \
 	\x00;...;\xff
diff --git a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
index 449ce85e6336..206816d26bbc 100644
--- a/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
+++ b/usr.bin/colldef/data/lt_LN.DIS_8859-15.src
@@ -1,6 +1,6 @@
 # latin1 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.DIS_8859-15.src,v 1.1.2.2 1999/08/29 15:26:27 peter Exp $
 #
 charmap map.DIS_8859-15
 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 99b7d08ddb00..eaa05e4c1cd8 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$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ISO_8859-1.src,v 1.8.2.1 1999/08/29 15:26:28 peter Exp $
 #
 charmap map.ISO_8859-1
 order \
diff --git a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
index aee3671f0966..4d0ba5c363ea 100644
--- a/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/colldef/data/lt_LN.ISO_8859-2.src
@@ -1,6 +1,6 @@
 # latin2 (backward compatible with ASCII)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/colldef/data/lt_LN.ISO_8859-2.src,v 1.1.4.1 1999/08/29 15:26:28 peter Exp $
 #
 charmap map.ISO_8859-2
 order \
diff --git a/usr.bin/colldef/data/ru_SU.CP866.src b/usr.bin/colldef/data/ru_SU.CP866.src
index 2fc2d20835c3..ab69670e9dbb 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$
+# $FreeBSD: src/usr.bin/colldef/data/ru_SU.CP866.src,v 1.7.2.1 1999/08/29 15:26:29 peter Exp $
 #
 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 3a67bc4e39fb..8f9f4164c7ec 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$
+# $FreeBSD: src/usr.bin/colldef/data/ru_SU.KOI8-R.src,v 1.7.2.1 1999/08/29 15:26:29 peter Exp $
 #
 charmap map.KOI8-R
 order \
diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index 5a6c972adb27..06d675755c4a 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$
+ * $FreeBSD: src/usr.bin/colldef/parse.y,v 1.11.2.1 1999/08/29 15:26:21 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 212eac32a1c6..1eadea54dd26 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$
+ * $FreeBSD: src/usr.bin/colldef/scan.l,v 1.7.2.1 1999/08/29 15:26:22 peter Exp $
  */
 
 #include <ctype.h>
diff --git a/usr.bin/colrm/colrm.c b/usr.bin/colrm/colrm.c
index b00182d604dd..02cb9625665c 100644
--- a/usr.bin/colrm/colrm.c
+++ b/usr.bin/colrm/colrm.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/colrm/colrm.c,v 1.6.2.1 1999/08/29 15:26:31 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 7fe49374dd85..721065b3827b 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)comm.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/comm/comm.1,v 1.3.2.1 1999/08/29 15:26:33 peter Exp $
 .\"
 .Dd June 6, 1993
 .Os
diff --git a/usr.bin/comm/comm.c b/usr.bin/comm/comm.c
index c1a23a0b58ed..2f80d55f0c66 100644
--- a/usr.bin/comm/comm.c
+++ b/usr.bin/comm/comm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/comm/comm.c,v 1.5.2.5 1999/12/10 13:28:23 ache Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile
index d8cd73854eb7..1e0df93704c5 100644
--- a/usr.bin/compile_et/Makefile
+++ b/usr.bin/compile_et/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/compile_et/Makefile,v 1.9.2.1 1999/08/29 15:26:35 peter Exp $
 
 PROG=	compile_et
 SRCS=	compile_et.c error_table.y
diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1
index 091038079535..771e3625df56 100644
--- a/usr.bin/compile_et/compile_et.1
+++ b/usr.bin/compile_et/compile_et.1
@@ -1,7 +1,7 @@
 .\" Copyright (c) 1988 Massachusetts Institute of Technology,
 .\" Student Information Processing Board.  All rights reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/compile_et/compile_et.1,v 1.2.2.1 1999/08/29 15:26:36 peter Exp $
 .\"
 .Dd	November 22, 1988
 .Os
diff --git a/usr.bin/compile_et/compile_et.c b/usr.bin/compile_et/compile_et.c
index b0a99267aa1e..3a34b2b973bb 100644
--- a/usr.bin/compile_et/compile_et.c
+++ b/usr.bin/compile_et/compile_et.c
@@ -26,7 +26,7 @@ static const char copyright[] =
     "Copyright 1987,1988 by MIT Student Information Processing Board";
 
 static const char rcsid_compile_et_c[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compile_et/compile_et.c,v 1.6.2.1 1999/08/29 15:26:36 peter Exp $";
 #endif
 
 extern char *gensym();
diff --git a/usr.bin/compile_et/error_table.y b/usr.bin/compile_et/error_table.y
index 0045df7b728f..220842e8e17b 100644
--- a/usr.bin/compile_et/error_table.y
+++ b/usr.bin/compile_et/error_table.y
@@ -74,7 +74,7 @@ description	:	QUOTED_STRING
 
 #ifndef	lint
 static char const rcsid_error_table_y[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compile_et/error_table.y,v 1.4.4.1 1999/08/29 15:26:37 peter Exp $";
 #endif
 
 void *malloc(), *realloc();
diff --git a/usr.bin/compile_et/et_lex.lex.l b/usr.bin/compile_et/et_lex.lex.l
index 57cbd04416c0..6f6aac9cade1 100644
--- a/usr.bin/compile_et/et_lex.lex.l
+++ b/usr.bin/compile_et/et_lex.lex.l
@@ -22,5 +22,5 @@ end		return END;
 .		{ return (*yytext); }
 %%
 #ifndef lint
-static char rcsid_et_lex_lex_l[] = "$FreeBSD$";
+static char rcsid_et_lex_lex_l[] = "$FreeBSD: src/usr.bin/compile_et/et_lex.lex.l,v 1.3.4.1 1999/08/29 15:26:38 peter Exp $";
 #endif
diff --git a/usr.bin/compress/doc/revision.log b/usr.bin/compress/doc/revision.log
index 5f7f066317c7..d700ea273983 100644
--- a/usr.bin/compress/doc/revision.log
+++ b/usr.bin/compress/doc/revision.log
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.1.1.1.10.1 1999/08/29 15:26:42 peter Exp $
  * $Log: revision.log,v $
  * Revision 1.1.1.1  1994/05/27 12:30:59  rgrimes
  * BSD 4.4 Lite Usr.bin Sources
@@ -116,4 +116,4 @@
  */
 
 static char rcs_ident[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/compress/doc/revision.log,v 1.1.1.1.10.1 1999/08/29 15:26:42 peter Exp $";
diff --git a/usr.bin/compress/zopen.h b/usr.bin/compress/zopen.h
index 1a22de12cab3..dec26c7acdfd 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$
+ * $FreeBSD: src/usr.bin/compress/zopen.h,v 1.3.2.1 1999/08/29 15:26:40 peter Exp $
  */
 
 #ifndef _ZOPEN_H_
diff --git a/usr.bin/cpp/cpp.sh b/usr.bin/cpp/cpp.sh
index 19dee9d4d558..ea10da9b4bab 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$
+# $FreeBSD: src/usr.bin/cpp/cpp.sh,v 1.6.2.1 1999/08/29 15:26:43 peter Exp $
 #
 # Transitional front end to CCCP to make it behave like (Reiser) CCP:
 #	specifies -traditional
diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c
index 55c637e7ddf1..795750cac702 100644
--- a/usr.bin/ctags/C.c
+++ b/usr.bin/ctags/C.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ctags/C.c,v 1.2.2.1 1999/08/29 15:26:44 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index a71e7e1ddac7..9f89f935991b 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cut.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/cut/cut.1,v 1.2.2.2 2000/03/06 11:34:17 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt CUT 1
diff --git a/usr.bin/dig/Makefile b/usr.bin/dig/Makefile
index c2c9b2269049..9d63ac383078 100644
--- a/usr.bin/dig/Makefile
+++ b/usr.bin/dig/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dig/Makefile,v 1.5.2.2 1999/12/13 15:08:16 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/dnskeygen/Makefile b/usr.bin/dnskeygen/Makefile
index 727334188f42..d67895ca1a5c 100644
--- a/usr.bin/dnskeygen/Makefile
+++ b/usr.bin/dnskeygen/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dnskeygen/Makefile,v 1.1.2.1 1999/12/13 15:08:17 peter Exp $
 
 USE_LIBBIND=	true
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/dnsquery/Makefile b/usr.bin/dnsquery/Makefile
index 915f3ea828b9..0ec541b72caa 100644
--- a/usr.bin/dnsquery/Makefile
+++ b/usr.bin/dnsquery/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/dnsquery/Makefile,v 1.5.2.2 1999/12/13 15:08:18 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/doscmd/Makefile b/usr.bin/doscmd/Makefile
index ec89cf2c9b08..3c58ac60f2af 100644
--- a/usr.bin/doscmd/Makefile
+++ b/usr.bin/doscmd/Makefile
@@ -1,6 +1,6 @@
 # from BSDI Makefile,v 2.6 1996/04/08 20:06:40 bostic Exp
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/doscmd/Makefile,v 1.13.2.4 2000/03/24 07:39:04 kris Exp $
 
 PROG=	doscmd
 SRCS=	AsyncIO.c ParseBuffer.c bios.c callback.c cpu.c dos.c cmos.c config.c \
diff --git a/usr.bin/doscmd/ParseBuffer.c b/usr.bin/doscmd/ParseBuffer.c
index 2eeaeed31647..038fb6d540c3 100644
--- a/usr.bin/doscmd/ParseBuffer.c
+++ b/usr.bin/doscmd/ParseBuffer.c
@@ -29,7 +29,7 @@
  *
  *	BSDI ParseBuffer.c,v 2.2 1996/04/08 19:32:15 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/ParseBuffer.c,v 1.1.2.1 1999/08/29 15:26:49 peter Exp $
  */
 
 #include <stdlib.h>
diff --git a/usr.bin/doscmd/bios.c b/usr.bin/doscmd/bios.c
index c6cea9204ff5..d7835d73b63a 100644
--- a/usr.bin/doscmd/bios.c
+++ b/usr.bin/doscmd/bios.c
@@ -29,7 +29,7 @@
  *
  *	BSDI bios.c,v 2.3 1996/04/08 19:32:19 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/bios.c,v 1.3.2.1 1999/08/29 15:26:50 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/callback.c b/usr.bin/doscmd/callback.c
index 890c7142d454..c72eed744c94 100644
--- a/usr.bin/doscmd/callback.c
+++ b/usr.bin/doscmd/callback.c
@@ -1,6 +1,6 @@
 /* No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/callback.c,v 1.1.2.1 1999/08/29 15:26:51 peter Exp $
 */
 
 
diff --git a/usr.bin/doscmd/callback.h b/usr.bin/doscmd/callback.h
index d3c656fd7c26..2a0332b9a5c4 100644
--- a/usr.bin/doscmd/callback.h
+++ b/usr.bin/doscmd/callback.h
@@ -1,7 +1,7 @@
 /* 
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/callback.h,v 1.1.2.1 1999/08/29 15:26:52 peter Exp $
 */
 typedef void		(*callback_t)(regcontext_t *REGS);
 
diff --git a/usr.bin/doscmd/cmos.c b/usr.bin/doscmd/cmos.c
index 1486c6fd348e..2cc25404f005 100644
--- a/usr.bin/doscmd/cmos.c
+++ b/usr.bin/doscmd/cmos.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cmos.c,v 2.3 1996/04/08 19:32:20 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cmos.c,v 1.1.2.1 1999/08/29 15:26:52 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/com.h b/usr.bin/doscmd/com.h
index 98982a958722..32d337b11b9a 100644
--- a/usr.bin/doscmd/com.h
+++ b/usr.bin/doscmd/com.h
@@ -29,7 +29,7 @@
  *
  *	BSDI com.h,v 2.2 1996/04/08 19:32:21 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/com.h,v 1.1.2.1 1999/08/29 15:26:53 peter Exp $
  */
 
 /* com.h for doscmd int14.c */
diff --git a/usr.bin/doscmd/config.c b/usr.bin/doscmd/config.c
index d20aa1579a17..c5c30c85a38d 100644
--- a/usr.bin/doscmd/config.c
+++ b/usr.bin/doscmd/config.c
@@ -29,7 +29,7 @@
  *
  *	BSDI config.c,v 2.2 1996/04/08 19:32:22 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/config.c,v 1.2.2.1 1999/08/29 15:26:54 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/cpu.c b/usr.bin/doscmd/cpu.c
index c273084547e0..6eb4c781ee9b 100644
--- a/usr.bin/doscmd/cpu.c
+++ b/usr.bin/doscmd/cpu.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright ?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/cpu.c,v 1.1.2.1 1999/08/29 15:26:54 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/crt0.c b/usr.bin/doscmd/crt0.c
index ec9c706f7f5c..6fc1733cc131 100644
--- a/usr.bin/doscmd/crt0.c
+++ b/usr.bin/doscmd/crt0.c
@@ -29,7 +29,7 @@
  *
  *	BSDI crt0.c,v 2.2 1996/04/08 19:32:24 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/crt0.c,v 1.1.2.1 1999/08/29 15:26:55 peter Exp $
  */
 
 char **environ;
diff --git a/usr.bin/doscmd/cwd.c b/usr.bin/doscmd/cwd.c
index a5d6c88c83f4..77e7fdbbd51c 100644
--- a/usr.bin/doscmd/cwd.c
+++ b/usr.bin/doscmd/cwd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.c,v 2.2 1996/04/08 19:32:25 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cwd.c,v 1.3.2.1 1999/08/29 15:26:56 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/cwd.h b/usr.bin/doscmd/cwd.h
index dfe7e4ea4486..58d8410bc283 100644
--- a/usr.bin/doscmd/cwd.h
+++ b/usr.bin/doscmd/cwd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI cwd.h,v 2.2 1996/04/08 19:32:26 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/cwd.h,v 1.1.2.1 1999/08/29 15:26:56 peter Exp $
  */
 
 static inline u_char *
diff --git a/usr.bin/doscmd/debug.c b/usr.bin/doscmd/debug.c
index dde4fcb72c00..2110c27bc6db 100644
--- a/usr.bin/doscmd/debug.c
+++ b/usr.bin/doscmd/debug.c
@@ -31,7 +31,7 @@
  *
  * from: BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/debug.c,v 1.1.2.1 1999/08/29 15:26:57 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/dispatch.h b/usr.bin/doscmd/dispatch.h
index 7506c534220a..f596689e9c22 100644
--- a/usr.bin/doscmd/dispatch.h
+++ b/usr.bin/doscmd/dispatch.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/dispatch.h,v 1.1.2.1 1999/08/29 15:26:58 peter Exp $
 */
 
 /*
diff --git a/usr.bin/doscmd/dos.c b/usr.bin/doscmd/dos.c
index 7b8fa0c9a911..79a9a91233f4 100644
--- a/usr.bin/doscmd/dos.c
+++ b/usr.bin/doscmd/dos.c
@@ -31,7 +31,7 @@
  *
  *	BSDI int21.c,v 2.2 1996/04/08 19:32:51 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/dos.c,v 1.5.2.1 1999/08/29 15:26:58 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/dos.h b/usr.bin/doscmd/dos.h
index 1ec83ac7f32c..d3220b8469d1 100644
--- a/usr.bin/doscmd/dos.h
+++ b/usr.bin/doscmd/dos.h
@@ -29,7 +29,7 @@
  *
  *	BSDI dos.h,v 2.2 1996/04/08 19:32:28 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/dos.h,v 1.1.2.1 1999/08/29 15:26:59 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/doscmd.c b/usr.bin/doscmd/doscmd.c
index 8e8da70f5191..da55ea7a93ab 100644
--- a/usr.bin/doscmd/doscmd.c
+++ b/usr.bin/doscmd/doscmd.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.c,v 2.3 1996/04/08 19:32:30 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd.c,v 1.8.2.1 1999/08/29 15:26:59 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/doscmd/doscmd.h b/usr.bin/doscmd/doscmd.h
index 1c960647d6f4..9775a9404959 100644
--- a/usr.bin/doscmd/doscmd.h
+++ b/usr.bin/doscmd/doscmd.h
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd.h,v 2.3 1996/04/08 19:32:32 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd.h,v 1.4.2.1 1999/08/29 15:27:00 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/doscmd_loader.c b/usr.bin/doscmd/doscmd_loader.c
index d219ad52b46e..134b21498acb 100644
--- a/usr.bin/doscmd/doscmd_loader.c
+++ b/usr.bin/doscmd/doscmd_loader.c
@@ -29,7 +29,7 @@
  *
  *	BSDI doscmd_loader.c,v 2.3 1996/04/08 19:32:33 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/doscmd_loader.c,v 1.1.2.1 1999/08/29 15:27:00 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/ems.c b/usr.bin/doscmd/ems.c
index 1b9b04568432..e3c33336b63c 100644
--- a/usr.bin/doscmd/ems.c
+++ b/usr.bin/doscmd/ems.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$
+ * $FreeBSD: src/usr.bin/doscmd/ems.c,v 1.1.2.1 1999/08/29 15:27:01 peter Exp $
  */
 
 /* 
diff --git a/usr.bin/doscmd/ems.h b/usr.bin/doscmd/ems.h
index 276bddc6bbde..1ba40deac397 100644
--- a/usr.bin/doscmd/ems.h
+++ b/usr.bin/doscmd/ems.h
@@ -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$
+ * $FreeBSD: src/usr.bin/doscmd/ems.h,v 1.2.2.1 1999/08/29 15:27:02 peter Exp $
  */
 
 #ifndef EMS_H
diff --git a/usr.bin/doscmd/emsdriv.S b/usr.bin/doscmd/emsdriv.S
index 40c7affd00b7..fa6a49c96b3c 100644
--- a/usr.bin/doscmd/emsdriv.S
+++ b/usr.bin/doscmd/emsdriv.S
@@ -24,7 +24,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$
+! $FreeBSD: src/usr.bin/doscmd/emsdriv.S,v 1.1.2.1 1999/08/29 15:27:02 peter Exp $
 
 
 !
diff --git a/usr.bin/doscmd/emuint.c b/usr.bin/doscmd/emuint.c
index 9c230a3c0dae..cdac799dedc1 100644
--- a/usr.bin/doscmd/emuint.c
+++ b/usr.bin/doscmd/emuint.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$
+ * $FreeBSD: src/usr.bin/doscmd/emuint.c,v 1.1.2.1 1999/08/29 15:27:03 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/doscmd/emuint.h b/usr.bin/doscmd/emuint.h
index d3797687eda3..e28cd110c4da 100644
--- a/usr.bin/doscmd/emuint.h
+++ b/usr.bin/doscmd/emuint.h
@@ -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$
+ * $FreeBSD: src/usr.bin/doscmd/emuint.h,v 1.1.2.1 1999/08/29 15:27:03 peter Exp $
  */
 
 
diff --git a/usr.bin/doscmd/exe.c b/usr.bin/doscmd/exe.c
index ce9a8f02d049..6f0e1a1b44e0 100644
--- a/usr.bin/doscmd/exe.c
+++ b/usr.bin/doscmd/exe.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	BSDI exe.c,v 2.2 1996/04/08 19:32:34 bostic Exp
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/exe.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/int.c b/usr.bin/doscmd/int.c
index 3b72e24bebaa..8ac98bfadd64 100644
--- a/usr.bin/doscmd/int.c
+++ b/usr.bin/doscmd/int.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/int.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/int10.c b/usr.bin/doscmd/int10.c
index 32bec88c1c53..8cfb98d10f5d 100644
--- a/usr.bin/doscmd/int10.c
+++ b/usr.bin/doscmd/int10.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int10.c,v 2.3 1996/04/08 19:32:40 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int10.c,v 1.1.2.1 1999/08/29 15:27:04 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int13.c b/usr.bin/doscmd/int13.c
index 84cb13f6eb0d..c4a35a2920db 100644
--- a/usr.bin/doscmd/int13.c
+++ b/usr.bin/doscmd/int13.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int13.c,v 2.3 1996/04/08 19:32:43 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int13.c,v 1.2.2.1 1999/08/29 15:27:05 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int14.c b/usr.bin/doscmd/int14.c
index 4d367eb7f4a0..ec1b0d411c15 100644
--- a/usr.bin/doscmd/int14.c
+++ b/usr.bin/doscmd/int14.c
@@ -32,7 +32,7 @@
  *
  *	BSDI int14.c,v 2.2 1996/04/08 19:32:45 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int14.c,v 1.1.2.1 1999/08/29 15:27:05 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int16.c b/usr.bin/doscmd/int16.c
index 517e1312c186..b858b24c5c70 100644
--- a/usr.bin/doscmd/int16.c
+++ b/usr.bin/doscmd/int16.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int16.c,v 2.2 1996/04/08 19:32:47 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int16.c,v 1.1.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int17.c b/usr.bin/doscmd/int17.c
index d62d6da9b321..b9a58dfdcc89 100644
--- a/usr.bin/doscmd/int17.c
+++ b/usr.bin/doscmd/int17.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int17.c,v 2.2 1996/04/08 19:32:48 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int17.c,v 1.3.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int1a.c b/usr.bin/doscmd/int1a.c
index ff7df30f8376..3eac028d81c6 100644
--- a/usr.bin/doscmd/int1a.c
+++ b/usr.bin/doscmd/int1a.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int1a.c,v 2.2 1996/04/08 19:32:49 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int1a.c,v 1.2.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/int2f.c b/usr.bin/doscmd/int2f.c
index 8bfe3d8db71e..380158001087 100644
--- a/usr.bin/doscmd/int2f.c
+++ b/usr.bin/doscmd/int2f.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int2f.c,v 2.2 1996/04/08 19:32:53 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/int2f.c,v 1.2.2.1 1999/08/29 15:27:06 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/intff.c b/usr.bin/doscmd/intff.c
index fd167af6cf4e..134b6d90171b 100644
--- a/usr.bin/doscmd/intff.c
+++ b/usr.bin/doscmd/intff.c
@@ -29,7 +29,7 @@
  *
  *	BSDI intff.c,v 2.2 1996/04/08 19:32:56 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/intff.c,v 1.5.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mem.c b/usr.bin/doscmd/mem.c
index bae413f660fc..fb38997f229b 100644
--- a/usr.bin/doscmd/mem.c
+++ b/usr.bin/doscmd/mem.c
@@ -29,7 +29,7 @@
  *
  *	BSDI mem.c,v 2.2 1996/04/08 19:32:57 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mem.c,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include <stdio.h>
diff --git a/usr.bin/doscmd/mouse.c b/usr.bin/doscmd/mouse.c
index c9a07740a0fa..524db260de9f 100644
--- a/usr.bin/doscmd/mouse.c
+++ b/usr.bin/doscmd/mouse.c
@@ -29,7 +29,7 @@
  *
  *	BSDI int33.c,v 2.2 1996/04/08 19:32:54 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mouse.c,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/mouse.h b/usr.bin/doscmd/mouse.h
index b77cba48f57d..b880e52fcc51 100644
--- a/usr.bin/doscmd/mouse.h
+++ b/usr.bin/doscmd/mouse.h
@@ -29,7 +29,7 @@
  *
  *	BSDI mouse.h,v 2.2 1996/04/08 19:32:58 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/mouse.h,v 1.1.2.1 1999/08/29 15:27:07 peter Exp $
  */
 
 typedef struct {
diff --git a/usr.bin/doscmd/net.c b/usr.bin/doscmd/net.c
index b899d96599a8..96ddeb33bd53 100644
--- a/usr.bin/doscmd/net.c
+++ b/usr.bin/doscmd/net.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/net.c,v 1.1.2.1 1999/08/29 15:27:08 peter Exp $
 **
 ** NetBIOS etc. hooks.
 */
diff --git a/usr.bin/doscmd/port.c b/usr.bin/doscmd/port.c
index eb2158f1e7d1..9bb80b15ca92 100644
--- a/usr.bin/doscmd/port.c
+++ b/usr.bin/doscmd/port.c
@@ -29,7 +29,7 @@
  *
  *	BSDI port.c,v 2.2 1996/04/08 19:33:03 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/port.c,v 1.2.2.1 1999/08/29 15:27:08 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/redir.S b/usr.bin/doscmd/redir.S
index 1f40f3cce6e8..426941d94d76 100644
--- a/usr.bin/doscmd/redir.S
+++ b/usr.bin/doscmd/redir.S
@@ -24,7 +24,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$
+! $FreeBSD: src/usr.bin/doscmd/redir.S,v 1.1.2.1 1999/08/29 15:27:09 peter Exp $
 
 
 !
diff --git a/usr.bin/doscmd/register.h b/usr.bin/doscmd/register.h
index ba0e91e03a9a..dc2957a9800b 100644
--- a/usr.bin/doscmd/register.h
+++ b/usr.bin/doscmd/register.h
@@ -23,7 +23,7 @@
 ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 ** SUCH DAMAGE.
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/register.h,v 1.1.2.1 1999/08/29 15:27:10 peter Exp $
 */
 
 /******************************************************************************
diff --git a/usr.bin/doscmd/setver.c b/usr.bin/doscmd/setver.c
index 5826567373ed..fcab0c0cbc14 100644
--- a/usr.bin/doscmd/setver.c
+++ b/usr.bin/doscmd/setver.c
@@ -29,7 +29,7 @@
  *
  *	BSDI setver.c,v 2.2 1996/04/08 19:33:04 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/setver.c,v 1.1.2.1 1999/08/29 15:27:10 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/signal.c b/usr.bin/doscmd/signal.c
index 2d91d03ce539..623e70a04da9 100644
--- a/usr.bin/doscmd/signal.c
+++ b/usr.bin/doscmd/signal.c
@@ -29,7 +29,7 @@
  *
  *	BSDI signal.c,v 2.2 1996/04/08 19:33:06 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/signal.c,v 1.2.2.1 1999/08/29 15:27:10 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/timer.c b/usr.bin/doscmd/timer.c
index 41b30199585a..c9d0d48e5391 100644
--- a/usr.bin/doscmd/timer.c
+++ b/usr.bin/doscmd/timer.c
@@ -1,7 +1,7 @@
 /*
 ** No copyright?!
 **
-** $FreeBSD$
+** $FreeBSD: src/usr.bin/doscmd/timer.c,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
 */
 #include "doscmd.h"
 
diff --git a/usr.bin/doscmd/trace.c b/usr.bin/doscmd/trace.c
index 9be758fd7ba6..de1d30a91a4f 100644
--- a/usr.bin/doscmd/trace.c
+++ b/usr.bin/doscmd/trace.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trace.c,v 2.2 1996/04/08 19:33:07 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trace.c,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.c b/usr.bin/doscmd/trap.c
index 9aecde5dc1e2..09c426812791 100644
--- a/usr.bin/doscmd/trap.c
+++ b/usr.bin/doscmd/trap.c
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.c,v 2.3 1996/04/08 19:33:08 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trap.c,v 1.2.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #include "doscmd.h"
diff --git a/usr.bin/doscmd/trap.h b/usr.bin/doscmd/trap.h
index 6cba0df95c3d..27671ee905c0 100644
--- a/usr.bin/doscmd/trap.h
+++ b/usr.bin/doscmd/trap.h
@@ -29,7 +29,7 @@
  *
  *	BSDI trap.h,v 2.2 1996/04/08 19:33:09 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/trap.h,v 1.1.2.1 1999/08/29 15:27:11 peter Exp $
  */
 
 #define	CLI	0xfa
diff --git a/usr.bin/doscmd/tty.c b/usr.bin/doscmd/tty.c
index 380585e12e6f..4cbe98267079 100644
--- a/usr.bin/doscmd/tty.c
+++ b/usr.bin/doscmd/tty.c
@@ -29,7 +29,7 @@
  *
  *	BSDI tty.c,v 2.4 1996/04/08 22:03:27 prb Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/tty.c,v 1.4.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 #ifndef NO_X
diff --git a/usr.bin/doscmd/video.h b/usr.bin/doscmd/video.h
index 7b36eb782056..3db0fed6c24f 100644
--- a/usr.bin/doscmd/video.h
+++ b/usr.bin/doscmd/video.h
@@ -29,7 +29,7 @@
  *
  *	BSDI video.h,v 2.2 1996/04/08 19:33:12 bostic Exp
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/doscmd/video.h,v 1.1.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.c b/usr.bin/doscmd/xms.c
index 9dbd4ba71f9d..1ccf906a34d0 100644
--- a/usr.bin/doscmd/xms.c
+++ b/usr.bin/doscmd/xms.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$
+ * $FreeBSD: src/usr.bin/doscmd/xms.c,v 1.4.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 /*
diff --git a/usr.bin/doscmd/xms.h b/usr.bin/doscmd/xms.h
index 51890282b24c..7aaf52195707 100644
--- a/usr.bin/doscmd/xms.h
+++ b/usr.bin/doscmd/xms.h
@@ -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$
+ * $FreeBSD: src/usr.bin/doscmd/xms.h,v 1.1.2.1 1999/08/29 15:27:12 peter Exp $
  */
 
 #ifndef XMS_H
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 917383e0e1fa..16be11007baf 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$
+.\" $FreeBSD: src/usr.bin/du/du.1,v 1.11.2.2 2000/03/06 11:34:19 sheldonh Exp $
 .\"
 .Dd April 1, 1994
 .Dt DU 1
diff --git a/usr.bin/ee/ee.1 b/usr.bin/ee/ee.1
index 3f957835d238..59b74186cd44 100644
--- a/usr.bin/ee/ee.1
+++ b/usr.bin/ee/ee.1
@@ -1,5 +1,5 @@
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.6.2.2 1999/09/20 09:49:55 phantom Exp $
 .\"
 .Dd August 30, 1995
 .Dt EE 1
diff --git a/usr.bin/ee/ee.c b/usr.bin/ee/ee.c
index c44ec0057cf4..6e2c61a4798f 100644
--- a/usr.bin/ee/ee.c
+++ b/usr.bin/ee/ee.c
@@ -52,7 +52,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ee/ee.c,v 1.12.2.1 1999/08/29 15:27:19 peter Exp $";
 #endif /* not lint */
 
 char *ee_copyright_message = 
diff --git a/usr.bin/ee/new_curse.c b/usr.bin/ee/new_curse.c
index 95d42a0b14fc..13d6b979d036 100644
--- a/usr.bin/ee/new_curse.c
+++ b/usr.bin/ee/new_curse.c
@@ -37,7 +37,7 @@
  |	Copyright (c) 1986, 1987, 1988, 1991, 1992, 1993, 1994, 1995 Hugh Mahon
  |	All are rights reserved.
  |
- | $FreeBSD$
+ | $FreeBSD: src/usr.bin/ee/new_curse.c,v 1.2.4.1 1999/08/29 15:27:20 peter Exp $
  |
  */
 
diff --git a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
index ef2ce2230d3e..0b2e5af6530c 100644
--- a/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/de_DE.ISO_8859-1/ee.msg,v 1.5.2.1 1999/08/29 15:27:22 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
index 0a383ad0cfe2..d45a488b2df0 100644
--- a/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
+++ b/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/en_US.ISO_8859-1/ee.msg,v 1.4.2.1 1999/08/29 15:27:24 peter Exp $
 $ 
 $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 e4c2c9567b35..a05d1aba68b5 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$
+$ $FreeBSD: src/usr.bin/ee/nls/fr_FR.ISO_8859-1/ee.msg,v 1.8.2.1 1999/08/29 15:27:25 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
index d5dfd4b3572e..5ca208259318 100644
--- a/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
+++ b/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg
@@ -3,7 +3,7 @@ $ ee.i18n.guide for more information
 $ 
 $ For ee patchlevel 3
 $ 
-$ $FreeBSD$
+$ $FreeBSD: src/usr.bin/ee/nls/pl_PL.ISO_8859-2/ee.msg,v 1.3.4.1 1999/08/29 15:27:26 peter Exp $
 $ 
 $set 1
 $quote "
diff --git a/usr.bin/enigma/enigma.1 b/usr.bin/enigma/enigma.1
index aa025e2028a0..26c5cb470ef3 100644
--- a/usr.bin/enigma/enigma.1
+++ b/usr.bin/enigma/enigma.1
@@ -4,7 +4,7 @@
 .\" Since enigma itself is distributed in the Public Domain, this file
 .\" is also.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/enigma/enigma.1,v 1.1.2.4 1999/08/29 15:27:28 peter Exp $
 .\" "
 .Dd October 30, 1998
 .Os
diff --git a/usr.bin/error/filter.c b/usr.bin/error/filter.c
index 84fd970572a9..a108f4755084 100644
--- a/usr.bin/error/filter.c
+++ b/usr.bin/error/filter.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)filter.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/filter.c,v 1.3.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/error/input.c b/usr.bin/error/input.c
index 602fed616ae6..b02b5ae8636f 100644
--- a/usr.bin/error/input.c
+++ b/usr.bin/error/input.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/input.c,v 1.3.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/main.c b/usr.bin/error/main.c
index 7e8b9d587f51..d254640c382e 100644
--- a/usr.bin/error/main.c
+++ b/usr.bin/error/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/main.c,v 1.4.2.1 1999/08/29 15:27:31 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/pi.c b/usr.bin/error/pi.c
index 405f548e4b08..fcf36428ba90 100644
--- a/usr.bin/error/pi.c
+++ b/usr.bin/error/pi.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pi.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/pi.c,v 1.4.2.1 1999/08/29 15:27:32 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/subr.c b/usr.bin/error/subr.c
index cd0846392cab..8bca9b1516ae 100644
--- a/usr.bin/error/subr.c
+++ b/usr.bin/error/subr.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/subr.c,v 1.3.2.1 1999/08/29 15:27:32 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/error/touch.c b/usr.bin/error/touch.c
index de6a396ebd3d..f33b6d930fb4 100644
--- a/usr.bin/error/touch.c
+++ b/usr.bin/error/touch.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/error/touch.c,v 1.6.2.1 1999/08/29 15:27:33 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/expand/expand.c b/usr.bin/expand/expand.c
index f16f64582754..44d0c1a7e9db 100644
--- a/usr.bin/expand/expand.c
+++ b/usr.bin/expand/expand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #else
 static const char rcsid[] = 
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/expand/expand.c,v 1.4.2.1 1999/08/29 15:27:34 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fetch/fetch.1 b/usr.bin/fetch/fetch.1
index 3b6094c8839f..dbf544b52070 100644
--- a/usr.bin/fetch/fetch.1
+++ b/usr.bin/fetch/fetch.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fetch/fetch.1,v 1.27.2.4 2000/03/06 11:34:21 sheldonh Exp $
 .Dd February 22, 1999
 .Dt FETCH 1
 .Os FreeBSD 3.1
diff --git a/usr.bin/fetch/fetch.h b/usr.bin/fetch/fetch.h
index e0b847d260c5..3a7d78e2473f 100644
--- a/usr.bin/fetch/fetch.h
+++ b/usr.bin/fetch/fetch.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/fetch.h,v 1.7.2.2 2000/03/20 15:45:19 cracauer Exp $
  */
 
 #ifndef fetch_h
diff --git a/usr.bin/fetch/file.c b/usr.bin/fetch/file.c
index 24dfd75ab4ca..d99491bd8dfe 100644
--- a/usr.bin/fetch/file.c
+++ b/usr.bin/fetch/file.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/file.c,v 1.4.2.2 1999/08/29 15:27:36 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c
index 7abab354fdbb..3c91a10fb819 100644
--- a/usr.bin/fetch/ftp.c
+++ b/usr.bin/fetch/ftp.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/ftp.c,v 1.11.2.4 2000/03/20 15:45:19 cracauer Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/http.c b/usr.bin/fetch/http.c
index fdb526a8ca9a..11cb5eeeb8e2 100644
--- a/usr.bin/fetch/http.c
+++ b/usr.bin/fetch/http.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/http.c,v 1.24.2.5 2000/03/20 15:45:19 cracauer Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/main.c b/usr.bin/fetch/main.c
index 5f69d97673bd..3c2c30fc34fc 100644
--- a/usr.bin/fetch/main.c
+++ b/usr.bin/fetch/main.c
@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/fetch/main.c,v 1.49.2.5 2000/03/20 15:45:19 cracauer Exp $ */
 
 #include <sys/types.h>
 
diff --git a/usr.bin/fetch/uri.c b/usr.bin/fetch/uri.c
index 3aeb0d1c74a8..2e99da2cc3c5 100644
--- a/usr.bin/fetch/uri.c
+++ b/usr.bin/fetch/uri.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/uri.c,v 1.1.4.1 1999/08/29 15:27:37 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/fetch/util.c b/usr.bin/fetch/util.c
index bac316d3a508..eee155fd10bc 100644
--- a/usr.bin/fetch/util.c
+++ b/usr.bin/fetch/util.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/fetch/util.c,v 1.6.2.1 1999/08/29 15:27:38 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/file/LEGAL.NOTICE b/usr.bin/file/LEGAL.NOTICE
index 29f21aed456b..5f498199afa2 100644
--- a/usr.bin/file/LEGAL.NOTICE
+++ b/usr.bin/file/LEGAL.NOTICE
@@ -1,6 +1,6 @@
 Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
 Software written by Ian F. Darwin and others; maintained by Christos Zoulas.
-$FreeBSD$
+$FreeBSD: src/usr.bin/file/LEGAL.NOTICE,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 This software (or derivative software) may not be made subject to any 
 license which denies anyone permission to alter it and redistribute it 
diff --git a/usr.bin/file/MAINT b/usr.bin/file/MAINT
index cb318445c60f..3fe983376e6f 100644
--- a/usr.bin/file/MAINT
+++ b/usr.bin/file/MAINT
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/usr.bin/file/MAINT,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 Maintenance notes:
 
diff --git a/usr.bin/file/Magdir/Localstuff b/usr.bin/file/Magdir/Localstuff
index a3e1e0bfce4c..69dbf3e66639 100644
--- a/usr.bin/file/Magdir/Localstuff
+++ b/usr.bin/file/Magdir/Localstuff
@@ -2,6 +2,6 @@
 #------------------------------------------------------------------------------
 # Localstuff:  file(1) magic for locally observed files
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Magdir/Localstuff,v 1.3.2.1 1999/08/29 15:27:45 peter Exp $
 # Add any locally observed files here.  Remember:
 # text if readable, executable if runnable binary, data if unreadable.
diff --git a/usr.bin/file/Magdir/softquad b/usr.bin/file/Magdir/softquad
index 0fd952a2ee43..4f7973f06604 100644
--- a/usr.bin/file/Magdir/softquad
+++ b/usr.bin/file/Magdir/softquad
@@ -2,7 +2,7 @@
 #------------------------------------------------------------------------------
 # softquad:  file(1) magic for SoftQuad Publishing Software
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Magdir/softquad,v 1.3.2.1 1999/08/29 15:27:48 peter Exp $
 # Author/Editor and RulesBuilder
 #
 # XXX - byte order?
diff --git a/usr.bin/file/Magdir/timezone b/usr.bin/file/Magdir/timezone
index 9e2791eae45c..47356a650356 100644
--- a/usr.bin/file/Magdir/timezone
+++ b/usr.bin/file/Magdir/timezone
@@ -5,7 +5,7 @@
 # from Daniel Quinlan (quinlan@yggdrasil.com)
 # this should work on Linux, SunOS, and maybe others
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/Magdir/timezone,v 1.1.1.1.6.1 2000/04/05 18:44:01 archie Exp $
 #
 0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\1\0	timezone data
 0	string	\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\2\0	timezone data
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 3834e4b0b307..c9748d77ddcd 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$FreeBSD$
+# @(#)$FreeBSD: src/usr.bin/file/Makefile,v 1.12.2.1 1999/08/29 15:27:39 peter Exp $
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
diff --git a/usr.bin/file/PORTING b/usr.bin/file/PORTING
index 7e65021d2950..8fdbf28c25d7 100644
--- a/usr.bin/file/PORTING
+++ b/usr.bin/file/PORTING
@@ -1,5 +1,5 @@
 Portability of the new file(1) command.
-@(#) $FreeBSD$
+@(#) $FreeBSD: src/usr.bin/file/PORTING,v 1.3.2.1 1999/08/29 15:27:39 peter Exp $
 
 Read this file only if the program doesn't compile on your system.
 
diff --git a/usr.bin/file/README b/usr.bin/file/README
index 9872176410be..7648147f26bb 100644
--- a/usr.bin/file/README
+++ b/usr.bin/file/README
@@ -1,5 +1,5 @@
 ** README for file(1) Command **
-@(#) $FreeBSD$
+@(#) $FreeBSD: src/usr.bin/file/README,v 1.4.2.1 1999/08/29 15:27:40 peter Exp $
 
 This is Release 3.x of Ian Darwin's (copyright but distributable)
 file(1) command. This version is the standard "file" command for Linux,
diff --git a/usr.bin/file/apprentice.c b/usr.bin/file/apprentice.c
index 9c5b94547f55..a218b1761112 100644
--- a/usr.bin/file/apprentice.c
+++ b/usr.bin/file/apprentice.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/apprentice.c,v 1.7.2.2 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/ascmagic.c b/usr.bin/file/ascmagic.c
index bf116999e3dc..0be10fa7a5d2 100644
--- a/usr.bin/file/ascmagic.c
+++ b/usr.bin/file/ascmagic.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/ascmagic.c,v 1.9.2.1 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/compress.c b/usr.bin/file/compress.c
index f1e8ae8b2510..dd530d5698bf 100644
--- a/usr.bin/file/compress.c
+++ b/usr.bin/file/compress.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/compress.c,v 1.6.2.1 1999/08/29 15:27:40 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/cvsimport.sh b/usr.bin/file/cvsimport.sh
index 0436074fc634..84f677be82db 100644
--- a/usr.bin/file/cvsimport.sh
+++ b/usr.bin/file/cvsimport.sh
@@ -3,7 +3,7 @@
 # This shell script can be used in order to handle future imports
 # of newer versions of file(1)
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file/cvsimport.sh,v 1.4.2.1 1999/08/29 15:27:41 peter Exp $
 if [ $# -ne 2 ] ; then 
 	echo "usage: $0 <major> <minor>" 1>&2
 	exit 1
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 184cab5acc81..ca9d696d2a89 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/file/file.1,v 1.12.2.3 2000/03/06 11:34:23 sheldonh Exp $
 .Dd July 30, 1997
 .Dt FILE 1 "Copyright but distributable"
 .Os
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index f420cac9f1c0..75ad4ed05953 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/file.c,v 1.9.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/file.h b/usr.bin/file/file.h
index 7d42ad88c712..f3651354413e 100644
--- a/usr.bin/file/file.h
+++ b/usr.bin/file/file.h
@@ -1,6 +1,6 @@
 /*
  * file.h - definitions for file(1) program
- * @(#)$FreeBSD$
+ * @(#)$FreeBSD: src/usr.bin/file/file.h,v 1.8.2.2 1999/08/29 15:27:42 peter Exp $
  *
  * Copyright (c) Ian F. Darwin, 1987.
  * Written by Ian F. Darwin.
diff --git a/usr.bin/file/fsmagic.c b/usr.bin/file/fsmagic.c
index 57e5ec61328a..3d7e1e0c034d 100644
--- a/usr.bin/file/fsmagic.c
+++ b/usr.bin/file/fsmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/fsmagic.c,v 1.7.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/internat.c b/usr.bin/file/internat.c
index f04208e08a01..f985b9b2b36f 100644
--- a/usr.bin/file/internat.c
+++ b/usr.bin/file/internat.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/internat.c,v 1.2.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include "file.h"
diff --git a/usr.bin/file/is_tar.c b/usr.bin/file/is_tar.c
index 362825f3e8d6..3a1bddd2f8d3 100644
--- a/usr.bin/file/is_tar.c
+++ b/usr.bin/file/is_tar.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/is_tar.c,v 1.6.2.1 1999/08/29 15:27:42 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/file/magic.5 b/usr.bin/file/magic.5
index 7d673941c9a7..ea8e34de18ff 100644
--- a/usr.bin/file/magic.5
+++ b/usr.bin/file/magic.5
@@ -1,5 +1,5 @@
 .\"
-.\" @(#)$FreeBSD$
+.\" @(#)$FreeBSD: src/usr.bin/file/magic.5,v 1.9.2.2 2000/03/06 11:34:24 sheldonh Exp $
 .\"
 .\" install as magic.4 on USG, magic.5 on V7 or Berkeley systems.
 .\"
diff --git a/usr.bin/file/names.h b/usr.bin/file/names.h
index 1273375f6a49..d52981d0704a 100644
--- a/usr.bin/file/names.h
+++ b/usr.bin/file/names.h
@@ -10,7 +10,7 @@
  *
  * See LEGAL.NOTICE
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/file/names.h,v 1.5.2.1 1999/08/29 15:27:43 peter Exp $
  */
 
 /* these types are used to index the table 'types': keep em in sync! */
diff --git a/usr.bin/file/patchlevel.h b/usr.bin/file/patchlevel.h
index 7fe74e7f1d65..6a9671f5bf0e 100644
--- a/usr.bin/file/patchlevel.h
+++ b/usr.bin/file/patchlevel.h
@@ -3,7 +3,7 @@
 
 /*
  * Patchlevel file for Ian Darwin's MAGIC command.
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/file/patchlevel.h,v 1.8.2.1 1999/08/29 15:27:43 peter Exp $
  *
  */
 
diff --git a/usr.bin/file/print.c b/usr.bin/file/print.c
index 8cd079ad8fcd..95cfe50de92f 100644
--- a/usr.bin/file/print.c
+++ b/usr.bin/file/print.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/print.c,v 1.8.2.1 1999/08/29 15:27:43 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/readelf.c b/usr.bin/file/readelf.c
index 5674402a4602..54a43b03363e 100644
--- a/usr.bin/file/readelf.c
+++ b/usr.bin/file/readelf.c
@@ -1,7 +1,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/readelf.c,v 1.5.2.1 1999/08/29 15:27:43 peter Exp $";
 #endif /* not lint */
 
 #ifdef BUILTIN_ELF
diff --git a/usr.bin/file/readelf.h b/usr.bin/file/readelf.h
index 28d44976c241..4e8da673e914 100644
--- a/usr.bin/file/readelf.h
+++ b/usr.bin/file/readelf.h
@@ -1,6 +1,6 @@
 /*
  * readelf.h 
- * @(#)$FreeBSD$
+ * @(#)$FreeBSD: src/usr.bin/file/readelf.h,v 1.2.4.1 1999/08/29 15:27:43 peter Exp $
  *
  * Provide elf data structures for non-elf machines, allowing file
  * non-elf hosts to determine if an elf binary is stripped.
diff --git a/usr.bin/file/softmagic.c b/usr.bin/file/softmagic.c
index c1e79257963c..26a72c9e9f27 100644
--- a/usr.bin/file/softmagic.c
+++ b/usr.bin/file/softmagic.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/file/softmagic.c,v 1.8.2.1 1999/08/29 15:27:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/file/tar.h b/usr.bin/file/tar.h
index 87f0d55f25ad..cb837330df65 100644
--- a/usr.bin/file/tar.h
+++ b/usr.bin/file/tar.h
@@ -5,7 +5,7 @@
  *
  * Created 25 August 1985 by John Gilmore, ihnp4!hoptoad!gnu.
  *
- * $FreeBSD$ # checkin only
+ * $FreeBSD: src/usr.bin/file/tar.h,v 1.3.2.1 1999/08/29 15:27:44 peter Exp $ # checkin only
  */
 
 /*
diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile
index 79fdc9267dce..9db7d6eca886 100644
--- a/usr.bin/file2c/Makefile
+++ b/usr.bin/file2c/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/file2c/Makefile,v 1.3.2.1 1999/08/29 15:27:49 peter Exp $
 
 PROG=	file2c
 MAN1=	file2c.1
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 0cf0d42826a7..706f5300835d 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$
+.\" $FreeBSD: src/usr.bin/file2c/file2c.1,v 1.5.2.1 1999/08/29 15:27:50 peter Exp $
 .\"
 .Dd January 28, 1995
 .Dt FILE2C 1
diff --git a/usr.bin/file2c/file2c.c b/usr.bin/file2c/file2c.c
index 258e70f2510c..f4f57f52a25d 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$
+ * $FreeBSD: src/usr.bin/file2c/file2c.c,v 1.3.2.1 1999/08/29 15:27:50 peter Exp $
  *
  */
 
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 631260788d64..6be39e4ccfe1 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)find.1	8.7 (Berkeley) 5/9/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/find/find.1,v 1.18.2.2 1999/08/29 15:27:52 peter Exp $
 .\"
 .Dd May 9, 1995
 .Dt FIND 1
diff --git a/usr.bin/find/option.c b/usr.bin/find/option.c
index c6cb12ef1297..d2d8fe1bb6a1 100644
--- a/usr.bin/find/option.c
+++ b/usr.bin/find/option.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)option.c	8.2 (Berkeley) 4/16/94";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/find/option.c,v 1.7.2.1 1999/08/29 15:27:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index 68306b8d3637..3f2e46d6be20 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)finger.1	8.3 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/finger/finger.1,v 1.7.2.2 2000/03/06 11:34:25 sheldonh Exp $
 .\"
 .Dd August 1, 1997
 .Dt FINGER 1
diff --git a/usr.bin/finger/finger.c b/usr.bin/finger/finger.c
index e15a3ad013c8..595934da0ed2 100644
--- a/usr.bin/finger/finger.c
+++ b/usr.bin/finger/finger.c
@@ -55,7 +55,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/finger.c,v 1.12.2.2 1999/08/29 15:27:54 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/finger.h b/usr.bin/finger/finger.h
index 7d4d99f6fb6f..1322cdcc43b1 100644
--- a/usr.bin/finger/finger.h
+++ b/usr.bin/finger/finger.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)finger.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/finger/finger.h,v 1.2.10.2 1999/08/29 15:27:56 peter Exp $
  */
 
 typedef struct person {
diff --git a/usr.bin/finger/lprint.c b/usr.bin/finger/lprint.c
index 3d0a4091c070..ee7b85113246 100644
--- a/usr.bin/finger/lprint.c
+++ b/usr.bin/finger/lprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/lprint.c,v 1.9.2.1 1999/08/29 15:27:56 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/net.c b/usr.bin/finger/net.c
index 2903c063806f..ac6af2535781 100644
--- a/usr.bin/finger/net.c
+++ b/usr.bin/finger/net.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/net.c,v 1.10.2.2 1999/08/29 15:27:57 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/sprint.c b/usr.bin/finger/sprint.c
index acf9dff350a3..0986846168bc 100644
--- a/usr.bin/finger/sprint.c
+++ b/usr.bin/finger/sprint.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/sprint.c,v 1.10.2.1 1999/08/29 15:27:58 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/finger/util.c b/usr.bin/finger/util.c
index 54c68f0f6f98..edafae8a196e 100644
--- a/usr.bin/finger/util.c
+++ b/usr.bin/finger/util.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/finger/util.c,v 1.5.2.3 1999/09/06 12:34:18 ru Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fmt/fmt.1 b/usr.bin/fmt/fmt.1
index e2937385aa6e..2d5e7a2414fe 100644
--- a/usr.bin/fmt/fmt.1
+++ b/usr.bin/fmt/fmt.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)fmt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fmt/fmt.1,v 1.4.2.1 2000/03/09 09:31:52 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt FMT 1
diff --git a/usr.bin/fmt/fmt.c b/usr.bin/fmt/fmt.c
index 94dd8c6de00d..85576d9ac31d 100644
--- a/usr.bin/fmt/fmt.c
+++ b/usr.bin/fmt/fmt.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)fmt.c	8.1 (Berkeley) 7/20/93";
 #else
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fmt/fmt.c,v 1.11.2.1 1999/08/29 15:28:00 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/fold/fold.c b/usr.bin/fold/fold.c
index 386caaffcea2..1288da1086ad 100644
--- a/usr.bin/fold/fold.c
+++ b/usr.bin/fold/fold.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fold.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fold/fold.c,v 1.3.2.1 1999/08/29 15:28:01 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/fpr/fpr.1 b/usr.bin/fpr/fpr.1
index 1feaa923782a..4111d5c00a0c 100644
--- a/usr.bin/fpr/fpr.1
+++ b/usr.bin/fpr/fpr.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fpr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/fpr/fpr.1,v 1.1.1.1.10.1 2000/03/03 11:43:17 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt FPR 1
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index 6ccabd13c23f..a5f65f94a60a 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)from.1	8.2 (Berkeley) 12/30/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/from/from.1,v 1.3.4.1 1999/10/30 21:49:05 green Exp $
 .\"
 .Dd December 30, 1993
 .Dt FROM 1
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 6b3320712f06..1dae8fa96a96 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/from/from.c,v 1.5.2.2 1999/10/30 21:49:05 green Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/fsplit/fsplit.c b/usr.bin/fsplit/fsplit.c
index d80837efb506..4d6491b5c1b8 100644
--- a/usr.bin/fsplit/fsplit.c
+++ b/usr.bin/fsplit/fsplit.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fsplit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fsplit/fsplit.c,v 1.4.2.1 1999/08/29 15:28:05 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile
index 8e9e277d38d0..af9ac7548610 100644
--- a/usr.bin/fstat/Makefile
+++ b/usr.bin/fstat/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/fstat/Makefile,v 1.2.2.2 1999/08/29 15:28:06 peter Exp $
 
 PROG=	fstat
 CFLAGS+=-Wall
diff --git a/usr.bin/fstat/fstat.c b/usr.bin/fstat/fstat.c
index b8e0c973a470..7155f81782ce 100644
--- a/usr.bin/fstat/fstat.c
+++ b/usr.bin/fstat/fstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)fstat.c	8.3 (Berkeley) 5/2/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/fstat/fstat.c,v 1.16.2.2 1999/08/29 15:28:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile
index bbd82e253aa6..52970d4207f7 100644
--- a/usr.bin/ftp/Makefile
+++ b/usr.bin/ftp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ftp/Makefile,v 1.8.2.2 1999/08/29 15:28:07 peter Exp $
 #	$NetBSD: Makefile,v 1.15 1997/10/18 15:31:20 lukem Exp $
 #	from: @(#)Makefile	8.2 (Berkeley) 4/3/94
 
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index acc3c6bde69c..2d5caf179d82 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/cmds.c,v 1.14.2.2 1999/08/29 15:28:08 peter Exp $	*/
 /*	$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/cmds.c,v 1.14.2.2 1999/08/29 15:28:08 peter Exp $");
 __RCSID_SOURCE("$NetBSD: cmds.c,v 1.30.2.1 1997/11/18 00:58:26 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/cmdtab.c b/usr.bin/ftp/cmdtab.c
index 542d32053d95..f1c4253f3109 100644
--- a/usr.bin/ftp/cmdtab.c
+++ b/usr.bin/ftp/cmdtab.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/cmdtab.c,v 1.6.2.1 1999/08/29 15:28:09 peter Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)cmdtab.c	8.4 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/cmdtab.c,v 1.6.2.1 1999/08/29 15:28:09 peter Exp $");
 __RCSID_SOURCE("$NetBSD: cmdtab.c,v 1.17 1997/08/18 10:20:17 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/complete.c b/usr.bin/ftp/complete.c
index ee0453f61e15..adff44189cc0 100644
--- a/usr.bin/ftp/complete.c
+++ b/usr.bin/ftp/complete.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/complete.c,v 1.4.4.1 1999/08/29 15:28:10 peter Exp $	*/
 /*	$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/complete.c,v 1.4.4.1 1999/08/29 15:28:10 peter Exp $");
 __RCSID_SOURCE("$NetBSD: complete.c,v 1.11 1997/09/13 09:05:53 lukem Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/domacro.c b/usr.bin/ftp/domacro.c
index 907af4583b9a..740a149d52bf 100644
--- a/usr.bin/ftp/domacro.c
+++ b/usr.bin/ftp/domacro.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/domacro.c,v 1.5.2.1 1999/08/29 15:28:10 peter Exp $	*/
 /*	$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)domacro.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/domacro.c,v 1.5.2.1 1999/08/29 15:28:10 peter Exp $");
 __RCSID_SOURCE("$NetBSD: domacro.c,v 1.10 1997/07/20 09:45:45 lukem Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/extern.h b/usr.bin/ftp/extern.h
index a8ac97b8c866..3fd7588c56d6 100644
--- a/usr.bin/ftp/extern.h
+++ b/usr.bin/ftp/extern.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/extern.h,v 1.7.2.1 1999/08/29 15:28:11 peter Exp $	*/
 /*	$NetBSD: extern.h,v 1.17.2.1 1997/11/18 00:59:50 mellon Exp $	*/
 
 /*-
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 1d73c0f9655e..2275cca51fbf 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/fetch.c,v 1.5.4.2 1999/08/29 15:28:12 peter Exp $");
 __RCSID_SOURCE("$NetBSD: fetch.c,v 1.16.2.1 1997/11/18 01:00:22 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index f191446221b3..2633fb6531f9 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ftp/ftp.1,v 1.8.2.6 2000/03/10 14:47:32 sheldonh Exp $
 .\" 	$NetBSD: ftp.1,v 1.21 1997/06/10 21:59:58 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index d2edd014d54b..48f3c1640e78 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ftp.c,v 1.15.2.2 1999/08/29 15:28:13 peter Exp $	*/
 /*	$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/ftp.c,v 1.15.2.2 1999/08/29 15:28:13 peter Exp $");
 __RCSID_SOURCE("$NetBSD: ftp.c,v 1.29.2.1 1997/11/18 01:01:04 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index d26d22df7f14..32496e9e2dc2 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ftp_var.h,v 1.6.2.2 1999/08/29 15:28:13 peter Exp $	*/
 /*	$NetBSD: ftp_var.h,v 1.20.2.1 1997/11/18 01:01:37 mellon Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f2cad20744c1..955fa62071f2 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/main.c,v 1.16.2.3 1999/08/29 15:28:14 peter Exp $	*/
 /*	$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 1989, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/main.c,v 1.16.2.3 1999/08/29 15:28:14 peter Exp $");
 __RCSID_SOURCE("$NetBSD: main.c,v 1.26 1997/10/14 16:31:22 christos Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/pathnames.h b/usr.bin/ftp/pathnames.h
index bf71177a33d4..b51a88ca23ff 100644
--- a/usr.bin/ftp/pathnames.h
+++ b/usr.bin/ftp/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/pathnames.h,v 1.3.2.1 1999/08/29 15:28:14 peter Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.7 1997/01/09 20:19:40 tls Exp $	*/
 
 /*
diff --git a/usr.bin/ftp/ruserpass.c b/usr.bin/ftp/ruserpass.c
index 6feff71b8fdd..9f98cf0cb94d 100644
--- a/usr.bin/ftp/ruserpass.c
+++ b/usr.bin/ftp/ruserpass.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/ruserpass.c,v 1.7.2.1 1999/08/29 15:28:15 peter Exp $	*/
 /*	$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $	*/
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)ruserpass.c	8.4 (Berkeley) 4/27/95";
 #else
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/ruserpass.c,v 1.7.2.1 1999/08/29 15:28:15 peter Exp $");
 __RCSID_SOURCE("$NetBSD: ruserpass.c,v 1.14.2.1 1997/11/18 01:02:05 mellon Exp $");
 #endif
 #endif /* not lint */
diff --git a/usr.bin/ftp/util.c b/usr.bin/ftp/util.c
index a34ca3424dbd..cb5a5ba98ea4 100644
--- a/usr.bin/ftp/util.c
+++ b/usr.bin/ftp/util.c
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/ftp/util.c,v 1.6.2.3 2000/03/27 10:22:45 sheldonh Exp $	*/
 /*	$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$FreeBSD$");
+__RCSID("$FreeBSD: src/usr.bin/ftp/util.c,v 1.6.2.3 2000/03/27 10:22:45 sheldonh Exp $");
 __RCSID_SOURCE("$NetBSD: util.c,v 1.16.2.1 1997/11/18 01:02:33 mellon Exp $");
 #endif /* not lint */
 
diff --git a/usr.bin/gcore/elfcore.c b/usr.bin/gcore/elfcore.c
index 4c0358e34b13..bc137dd17011 100644
--- a/usr.bin/gcore/elfcore.c
+++ b/usr.bin/gcore/elfcore.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gcore/elfcore.c,v 1.2.2.1 1999/08/29 15:28:17 peter Exp $
  */
 
 #include <sys/param.h>
diff --git a/usr.bin/gcore/gcore.1 b/usr.bin/gcore/gcore.1
index 7efe6ffe3bc9..e9f3c70f664e 100644
--- a/usr.bin/gcore/gcore.1
+++ b/usr.bin/gcore/gcore.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)gcore.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/gcore/gcore.1,v 1.5.2.1 2000/03/06 11:34:28 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt GCORE 1
diff --git a/usr.bin/gcore/gcore.c b/usr.bin/gcore/gcore.c
index fc8ed3a70bcc..af3336ab9bbb 100644
--- a/usr.bin/gcore/gcore.c
+++ b/usr.bin/gcore/gcore.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gcore.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gcore/gcore.c,v 1.13.2.1 1999/08/29 15:28:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/gcore/md-nop.c b/usr.bin/gcore/md-nop.c
index 331901c1841c..a985a9976434 100644
--- a/usr.bin/gcore/md-nop.c
+++ b/usr.bin/gcore/md-nop.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)md-nop.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gcore/md-nop.c,v 1.2.2.1 1999/08/29 15:28:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile
index 45af07adf895..56008d12fb11 100644
--- a/usr.bin/gencat/Makefile
+++ b/usr.bin/gencat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gencat/Makefile,v 1.4.2.1 1999/08/29 15:28:19 peter Exp $
 
 PROG=	gencat
 SRCS=	gencat.c genlib.c
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index b7936c6ef128..09aefcf9a888 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -24,7 +24,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$
+.\" $FreeBSD: src/usr.bin/gencat/gencat.1,v 1.2.2.2 1999/08/29 15:28:20 peter Exp $
 .\"
 .Dd June 11, 1997
 .Dt GENCAT 1
diff --git a/usr.bin/gensetdefs/Makefile b/usr.bin/gensetdefs/Makefile
index af403f739d14..e2b767035144 100644
--- a/usr.bin/gensetdefs/Makefile
+++ b/usr.bin/gensetdefs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/gensetdefs/Makefile,v 1.2.2.1 1999/08/29 15:28:21 peter Exp $
 
 PROG=	gensetdefs
 NOMAN=	noman
diff --git a/usr.bin/gensetdefs/gensetdefs.c b/usr.bin/gensetdefs/gensetdefs.c
index 7e36992214f7..b60cd6f48bf8 100644
--- a/usr.bin/gensetdefs/gensetdefs.c
+++ b/usr.bin/gensetdefs/gensetdefs.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/gensetdefs/gensetdefs.c,v 1.1.2.1 1999/08/29 15:28:21 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/getopt/Makefile b/usr.bin/getopt/Makefile
index 5d01b3d705c2..334e684f7b4f 100644
--- a/usr.bin/getopt/Makefile
+++ b/usr.bin/getopt/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/getopt/Makefile,v 1.1.10.1 1999/08/29 15:28:23 peter Exp $
 #
 
 PROG = getopt
diff --git a/usr.bin/getopt/getopt.1 b/usr.bin/getopt/getopt.1
index 72ae418925fd..0501735ed307 100644
--- a/usr.bin/getopt/getopt.1
+++ b/usr.bin/getopt/getopt.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/getopt/getopt.1,v 1.4.4.3 2000/03/06 11:34:30 sheldonh Exp $
 .\"
 .Dd April 3, 1999
 .Dt GETOPT 1
diff --git a/usr.bin/global/Makefile b/usr.bin/global/Makefile
index a37a2f967cda..688dc76f13d0 100644
--- a/usr.bin/global/Makefile
+++ b/usr.bin/global/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/Makefile,v 1.3.2.1 1999/08/29 15:28:24 peter Exp $
 
 SUBDIR= lib global gtags gctags btreeop htags systags
 
diff --git a/usr.bin/global/Makefile.inc b/usr.bin/global/Makefile.inc
index 0e33fa03b8fe..9d120bd8656c 100644
--- a/usr.bin/global/Makefile.inc
+++ b/usr.bin/global/Makefile.inc
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/Makefile.inc,v 1.6.2.1 1999/08/29 15:28:25 peter Exp $
 
 .if !defined(GLOBAL_MAKEFILE_INC_BEEN_HERE)
 
diff --git a/usr.bin/global/btreeop/Makefile b/usr.bin/global/btreeop/Makefile
index da762b8ccbbb..2cd6d4c68537 100644
--- a/usr.bin/global/btreeop/Makefile
+++ b/usr.bin/global/btreeop/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/btreeop/Makefile,v 1.5.2.1 1999/08/29 15:28:26 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/btreeop
diff --git a/usr.bin/global/gctags/Makefile b/usr.bin/global/gctags/Makefile
index 48ae79232d68..65e10d4cf882 100644
--- a/usr.bin/global/gctags/Makefile
+++ b/usr.bin/global/gctags/Makefile
@@ -1,5 +1,5 @@
 
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/gctags/Makefile,v 1.5.2.1 1999/08/29 15:28:28 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gctags
diff --git a/usr.bin/global/global/Makefile b/usr.bin/global/global/Makefile
index 61c4d092ab73..94d740b77ff4 100644
--- a/usr.bin/global/global/Makefile
+++ b/usr.bin/global/global/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/global/Makefile,v 1.5.2.1 1999/08/29 15:28:29 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/global
diff --git a/usr.bin/global/gtags/Makefile b/usr.bin/global/gtags/Makefile
index ab3fc7624f49..7b02593070c7 100644
--- a/usr.bin/global/gtags/Makefile
+++ b/usr.bin/global/gtags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/gtags/Makefile,v 1.6.2.1 1999/08/29 15:28:30 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/gtags
diff --git a/usr.bin/global/htags/Makefile b/usr.bin/global/htags/Makefile
index 197d5bb6ad47..e25fa112cc83 100644
--- a/usr.bin/global/htags/Makefile
+++ b/usr.bin/global/htags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/htags/Makefile,v 1.3.2.1 1999/08/29 15:28:31 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/htags
diff --git a/usr.bin/global/lib/Makefile b/usr.bin/global/lib/Makefile
index ad6b48d8ecdb..81441ae19f04 100644
--- a/usr.bin/global/lib/Makefile
+++ b/usr.bin/global/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/lib/Makefile,v 1.3.2.1 1999/08/29 15:28:33 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/lib
diff --git a/usr.bin/global/systags/Makefile b/usr.bin/global/systags/Makefile
index ed125c424c68..e1641935cdbe 100644
--- a/usr.bin/global/systags/Makefile
+++ b/usr.bin/global/systags/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/global/systags/Makefile,v 1.4.2.1 1999/08/29 15:28:34 peter Exp $
 
 GLOBAL_DIR=	${.CURDIR}/../../../contrib/global
 .PATH:		${GLOBAL_DIR}/systags
diff --git a/usr.bin/gprof/arcs.c b/usr.bin/gprof/arcs.c
index c6e77103e739..b13e74730f20 100644
--- a/usr.bin/gprof/arcs.c
+++ b/usr.bin/gprof/arcs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)arcs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/arcs.c,v 1.5.2.1 1999/08/29 15:28:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/gprof.c b/usr.bin/gprof/gprof.c
index e778bac04dca..6ee74cecb948 100644
--- a/usr.bin/gprof/gprof.c
+++ b/usr.bin/gprof/gprof.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)gprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/gprof.c,v 1.8.2.1 1999/08/29 15:28:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printgprof.c b/usr.bin/gprof/printgprof.c
index 0fb74f44ce98..606d964a4c87 100644
--- a/usr.bin/gprof/printgprof.c
+++ b/usr.bin/gprof/printgprof.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printgprof.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/printgprof.c,v 1.5.2.1 1999/08/29 15:28:37 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/gprof/printlist.c b/usr.bin/gprof/printlist.c
index c77b19fa008b..c82b18db7da3 100644
--- a/usr.bin/gprof/printlist.c
+++ b/usr.bin/gprof/printlist.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)printlist.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/gprof/printlist.c,v 1.2.2.1 1999/08/29 15:28:38 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/head/head.c b/usr.bin/head/head.c
index e93896bc3ef0..71d8b8279232 100644
--- a/usr.bin/head/head.c
+++ b/usr.bin/head/head.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)head.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/head/head.c,v 1.9.2.1 1999/08/29 15:28:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 2d3bdcbd964a..9a3708e1d3ff 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/display.c,v 1.3.2.1 1999/08/29 15:28:40 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 71a8caa9d7f2..e3f4386386f6 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$
+.\" $FreeBSD: src/usr.bin/hexdump/hexdump.1,v 1.7.2.2 1999/09/20 09:49:56 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt HEXDUMP 1
diff --git a/usr.bin/hexdump/hexdump.c b/usr.bin/hexdump/hexdump.c
index c8ce78de8c3a..2e03d54feff3 100644
--- a/usr.bin/hexdump/hexdump.c
+++ b/usr.bin/hexdump/hexdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)hexdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/hexdump.c,v 1.3.2.1 1999/08/29 15:28:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index f3bf5878dafe..d5b243e9aa57 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hexsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/hexsyntax.c,v 1.7.2.1 1999/08/29 15:28:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/od.1 b/usr.bin/hexdump/od.1
index ba11227cc57d..34251d0c5e4b 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$
+.\" $FreeBSD: src/usr.bin/hexdump/od.1,v 1.6.2.2 1999/09/20 09:49:56 phantom Exp $
 .\"
 .Dd May 27, 1994
 .Os
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 2e666c699050..bebe34078b3f 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)odsyntax.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/odsyntax.c,v 1.6.2.1 1999/08/29 15:28:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/hexdump/parse.c b/usr.bin/hexdump/parse.c
index d02cd09a0185..72a31e1537b8 100644
--- a/usr.bin/hexdump/parse.c
+++ b/usr.bin/hexdump/parse.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/hexdump/parse.c,v 1.3.2.1 1999/08/29 15:28:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile
index a81d9e7562a4..0cf480309d84 100644
--- a/usr.bin/host/Makefile
+++ b/usr.bin/host/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/host/Makefile,v 1.5.2.2 1999/12/13 15:08:19 peter Exp $
 
 USE_LIBBIND=	yes
 .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc"
diff --git a/usr.bin/id/groups.sh b/usr.bin/id/groups.sh
index b6350be8057e..790772a6f635 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$
+# $FreeBSD: src/usr.bin/id/groups.sh,v 1.5.2.1 1999/08/29 15:28:46 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 7205976faf1e..75f8665be13e 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)id.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/id/id.1,v 1.5.2.2 1999/09/04 16:06:08 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt ID 1
diff --git a/usr.bin/id/id.c b/usr.bin/id/id.c
index 21ae9ed69e24..b6461f609008 100644
--- a/usr.bin/id/id.c
+++ b/usr.bin/id/id.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)id.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/id/id.c,v 1.7.2.2 1999/09/04 16:06:09 chris Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/id/whoami.sh b/usr.bin/id/whoami.sh
index 9b18bac19953..29d5b3d203f4 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$
+# $FreeBSD: src/usr.bin/id/whoami.sh,v 1.5.2.1 1999/08/29 15:28:48 peter Exp $
 
 PATH=/bin:/usr/bin; export PATH
 
diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c
index 7a646c0fcfd9..b3382931eb9d 100644
--- a/usr.bin/indent/args.c
+++ b/usr.bin/indent/args.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)args.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/args.c,v 1.2.2.1 1999/08/29 15:28:50 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/indent/indent.c b/usr.bin/indent/indent.c
index bc014c5d3d40..e42082870d56 100644
--- a/usr.bin/indent/indent.c
+++ b/usr.bin/indent/indent.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/indent.c,v 1.3.2.1 1999/08/29 15:28:51 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/indent/io.c b/usr.bin/indent/io.c
index 1668b2fbe502..734e77213b64 100644
--- a/usr.bin/indent/io.c
+++ b/usr.bin/indent/io.c
@@ -38,7 +38,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/indent/io.c,v 1.3.2.1 1999/08/29 15:28:52 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile
index 9c0e45c0702c..79ad371bd148 100644
--- a/usr.bin/ipcrm/Makefile
+++ b/usr.bin/ipcrm/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcrm/Makefile,v 1.3.2.1 1999/08/29 15:28:53 peter Exp $
 
 PROG=	ipcrm
 
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 29a18f0cbc19..50a13955fc9e 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$
+.\" $FreeBSD: src/usr.bin/ipcrm/ipcrm.1,v 1.5.2.3 2000/05/09 14:27:11 sheldonh Exp $
 .\""
 .Dd August 8, 1994
 .Dt IPCRM 1
diff --git a/usr.bin/ipcrm/ipcrm.c b/usr.bin/ipcrm/ipcrm.c
index b52100f632bc..5d1a13fc3533 100644
--- a/usr.bin/ipcrm/ipcrm.c
+++ b/usr.bin/ipcrm/ipcrm.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ipcrm/ipcrm.c,v 1.5.2.1 1999/08/29 15:28:54 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile
index 665371074767..1c28ee80efd8 100644
--- a/usr.bin/ipcs/Makefile
+++ b/usr.bin/ipcs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ipcs/Makefile,v 1.4.2.1 1999/08/29 15:28:54 peter Exp $
 
 PROG=	ipcs
 BINGRP=	kmem
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index b52961465f65..e84d9a492a27 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$
+.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.8.2.1 1999/08/29 15:28:55 peter Exp $
 .\"
 .Dd June 18, 1994
 .Dt "IPCS" 1
diff --git a/usr.bin/ipcs/ipcs.c b/usr.bin/ipcs/ipcs.c
index bfefaedcf559..79ab0e77df6e 100644
--- a/usr.bin/ipcs/ipcs.c
+++ b/usr.bin/ipcs/ipcs.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ipcs/ipcs.c,v 1.10.2.2 2000/05/01 10:52:16 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index dc7455036d5c..2489837194b3 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)join.c	8.6 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/join/join.c,v 1.8.2.1 1999/08/29 15:28:57 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/jot/jot.1 b/usr.bin/jot/jot.1
index d8419c71b0c0..7ab344ba8d03 100644
--- a/usr.bin/jot/jot.1
+++ b/usr.bin/jot/jot.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)jot.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/jot/jot.1,v 1.3.2.2 1999/08/29 15:28:58 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt JOT 1
diff --git a/usr.bin/jot/jot.c b/usr.bin/jot/jot.c
index 12b5998cac94..55216fa6521d 100644
--- a/usr.bin/jot/jot.c
+++ b/usr.bin/jot/jot.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)jot.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/jot/jot.c,v 1.8.2.3 1999/08/29 15:28:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index b4df3ebb698b..4744b5e4a744 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kdump.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/kdump/kdump.1,v 1.4.2.1 1999/08/29 15:29:01 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt KDUMP 1
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index f0ee9f039924..98f72b28b835 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)kdump.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/kdump/kdump.c,v 1.11.2.2 1999/08/29 15:29:02 peter Exp $";
 #endif /* not lint */
 
 #define KERNEL
diff --git a/usr.bin/key/key.1 b/usr.bin/key/key.1
index a20dd419d558..d90d5770da49 100644
--- a/usr.bin/key/key.1
+++ b/usr.bin/key/key.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)key.1	1.0 (Bellcore) 12/2/91
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/key/key.1,v 1.4.2.1 1999/08/29 15:29:03 peter Exp $
 .\"
 .Dd December 2, 1991
 .Dt KEY 1
diff --git a/usr.bin/keyinfo/keyinfo.1 b/usr.bin/keyinfo/keyinfo.1
index 775043736354..227f042fd259 100644
--- a/usr.bin/keyinfo/keyinfo.1
+++ b/usr.bin/keyinfo/keyinfo.1
@@ -1,5 +1,5 @@
 .\"	from: @(#)keyinfo.1	1.1 (Bellcore) 7/20/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keyinfo/keyinfo.1,v 1.6.2.1 1999/08/29 15:29:04 peter Exp $
 .\"
 .Dd April 26, 1996
 .Dt KEYINFO 1
diff --git a/usr.bin/keyinfo/keyinfo.pl b/usr.bin/keyinfo/keyinfo.pl
index 8316c5896505..92cb61396fee 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$
+# $FreeBSD: src/usr.bin/keyinfo/keyinfo.pl,v 1.3.2.1 1999/08/29 15:29:05 peter Exp $
 #
 
 die "usage: keyinfo [user]\n" unless $#ARGV < 1;
diff --git a/usr.bin/keyinit/keyinit.1 b/usr.bin/keyinit/keyinit.1
index 13a545c54c97..8b70f7135bb3 100644
--- a/usr.bin/keyinit/keyinit.1
+++ b/usr.bin/keyinit/keyinit.1
@@ -1,5 +1,5 @@
 .\"	@(#)keyinit.1	1.0 (Bellcore) 7/20/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keyinit/keyinit.1,v 1.5.2.1 2000/03/06 11:34:32 sheldonh Exp $
 .\"
 .Dd July 20, 1993
 .Dt KEYINIT 1
diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile
index bf279eb25b22..82b66d84dacc 100644
--- a/usr.bin/keylogin/Makefile
+++ b/usr.bin/keylogin/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogin/Makefile,v 1.2.2.1 1999/08/29 15:29:06 peter Exp $
 
 PROG=	keylogin
 
diff --git a/usr.bin/keylogin/keylogin.1 b/usr.bin/keylogin/keylogin.1
index 00a35d0a63cc..5e577159e0a3 100644
--- a/usr.bin/keylogin/keylogin.1
+++ b/usr.bin/keylogin/keylogin.1
@@ -1,7 +1,7 @@
 .\" @(#)keylogin.1 1.5 91/03/11 TIRPC 1.0;
 .\" Copyright (c) 1988 Sun Microsystems, Inc. - All Rights Reserved.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/keylogin/keylogin.1,v 1.2.2.1 2000/03/06 11:34:34 sheldonh Exp $
 .\"
 .Dd September 9, 1987
 .Dt KEYLOGIN 1
diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile
index cc433e444669..15c5dc6e7286 100644
--- a/usr.bin/keylogout/Makefile
+++ b/usr.bin/keylogout/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/keylogout/Makefile,v 1.2.2.1 1999/08/29 15:29:08 peter Exp $
 
 PROG=	keylogout
 
diff --git a/usr.bin/keylogout/keylogout.c b/usr.bin/keylogout/keylogout.c
index d5276d2e168f..82b93afbff7c 100644
--- a/usr.bin/keylogout/keylogout.c
+++ b/usr.bin/keylogout/keylogout.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/keylogout/keylogout.c,v 1.2.2.1 1999/08/29 15:29:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/killall/killall.1 b/usr.bin/killall/killall.1
index c7b3c3e0feb2..f0a49efbb42f 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$
+.\" $FreeBSD: src/usr.bin/killall/killall.1,v 1.10.2.1 1999/08/29 15:29:09 peter Exp $
 .\"
 .Dd June 25, 1995
 .Os FreeBSD 2.2 
diff --git a/usr.bin/killall/killall.pl b/usr.bin/killall/killall.pl
index 6238c7b49668..822b123d1a48 100755
--- a/usr.bin/killall/killall.pl
+++ b/usr.bin/killall/killall.pl
@@ -26,7 +26,7 @@
 #
 # killall - kill processes by name
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/killall/killall.pl,v 1.11.2.1 1999/08/29 15:29:10 peter Exp $
 
 
 $ENV{'PATH'} = '/bin:/usr/bin'; # security
diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile
index c00bb7510459..f9c3599e6708 100644
--- a/usr.bin/ktrace/Makefile
+++ b/usr.bin/ktrace/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	1.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ktrace/Makefile,v 1.5.2.1 1999/08/29 15:29:11 peter Exp $
 
 PROG=	ktrace
 SRCS=	ktrace.c subr.c
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 20a461a39410..9902e51e546e 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)ktrace.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ktrace/ktrace.1,v 1.7.2.1 1999/08/29 15:29:11 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt KTRACE 1
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 1c5a98ba6796..4fabeb8a1d50 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$";
+  "$FreeBSD: src/usr.bin/ktrace/ktrace.c,v 1.11.2.1 1999/08/29 15:29:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index 4e4b3bf466a5..c8f2e5ab4f75 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$";
+  "$FreeBSD: src/usr.bin/ktrace/subr.c,v 1.5.2.1 1999/08/29 15:29:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/kzip/Makefile b/usr.bin/kzip/Makefile
index 8ff6f7f09623..e8b955863c6d 100644
--- a/usr.bin/kzip/Makefile
+++ b/usr.bin/kzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/kzip/Makefile,v 1.5.2.1 1999/08/29 15:29:14 peter Exp $
 
 PROG=	kzip
 MAN8=	kzip.8
diff --git a/usr.bin/kzip/kzip.8 b/usr.bin/kzip/kzip.8
index a966d365f314..df7d48b09036 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$
+.\" $FreeBSD: src/usr.bin/kzip/kzip.8,v 1.5.2.2 1999/08/29 15:29:14 peter Exp $
 .\"
 .Dd August 15, 1996
 .Os
diff --git a/usr.bin/kzip/kzip.c b/usr.bin/kzip/kzip.c
index 430dcc39f619..b1dc3987af5b 100644
--- a/usr.bin/kzip/kzip.c
+++ b/usr.bin/kzip/kzip.c
@@ -13,7 +13,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/kzip/kzip.c,v 1.12.2.1 1999/08/29 15:29:15 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 277081095af7..761deeb0987a 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lam.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lam/lam.c,v 1.2.2.1 1999/08/29 15:29:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index 2bdfc50c47ab..2940798f273b 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)last.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/last/last.1,v 1.3.2.1 2000/03/06 11:34:35 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt LAST 1
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 33248e24b3c7..51670589b22e 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$
+.\" $FreeBSD: src/usr.bin/lastcomm/lastcomm.1,v 1.6.2.1 1999/08/29 15:29:17 peter Exp $
 .\"
 .Dd September 18, 1996
 .Dt LASTCOMM 1
diff --git a/usr.bin/lastcomm/lastcomm.c b/usr.bin/lastcomm/lastcomm.c
index 4beed143c977..71f798c7d962 100644
--- a/usr.bin/lastcomm/lastcomm.c
+++ b/usr.bin/lastcomm/lastcomm.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)lastcomm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lastcomm/lastcomm.c,v 1.9.2.1 1999/08/29 15:29:18 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile
index d7cd01069682..a65d628a620f 100644
--- a/usr.bin/ldd/Makefile
+++ b/usr.bin/ldd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ldd/Makefile,v 1.10.2.1 1999/08/29 15:29:19 peter Exp $
 
 PROG=		ldd
 SRCS=		ldd.c
diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1
index 5b95e993ee59..2648b69b01aa 100644
--- a/usr.bin/ldd/ldd.1
+++ b/usr.bin/ldd/ldd.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ldd/ldd.1,v 1.10.2.3 2000/05/10 15:47:30 phantom Exp $
 .Dd October 22, 1993
 .Dt LDD 1
 .Os FreeBSD
diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c
index d565d607102f..9ecd1262259d 100644
--- a/usr.bin/ldd/ldd.c
+++ b/usr.bin/ldd/ldd.c
@@ -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$
+ * $FreeBSD: src/usr.bin/ldd/ldd.c,v 1.17.2.1 1999/08/29 15:29:20 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/ldd/sods.c b/usr.bin/ldd/sods.c
index a41afaa63c13..7d909bf98c76 100644
--- a/usr.bin/ldd/sods.c
+++ b/usr.bin/ldd/sods.c
@@ -22,7 +22,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/ldd/sods.c,v 1.8.2.1 1999/08/29 15:29:21 peter Exp $
  */
 
 #include <assert.h>
diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile
index eacf6f1e021d..fd59f657beae 100644
--- a/usr.bin/leave/Makefile
+++ b/usr.bin/leave/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/leave/Makefile,v 1.2.2.1 1999/08/29 15:29:22 peter Exp $
 
 PROG=	leave
 CFLAGS+=-Wall
diff --git a/usr.bin/leave/leave.c b/usr.bin/leave/leave.c
index d76465531fa4..dd0f550876d4 100644
--- a/usr.bin/leave/leave.c
+++ b/usr.bin/leave/leave.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)leave.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/leave/leave.c,v 1.4.2.1 1999/08/29 15:29:23 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/lex/FlexLexer.h b/usr.bin/lex/FlexLexer.h
index 52c656f4706d..f478dbb31f0e 100644
--- a/usr.bin/lex/FlexLexer.h
+++ b/usr.bin/lex/FlexLexer.h
@@ -1,4 +1,4 @@
-// $FreeBSD$
+// $FreeBSD: src/usr.bin/lex/FlexLexer.h,v 1.1.1.2.4.1 1999/08/29 15:29:24 peter Exp $
 
 // FlexLexer.h -- define interfaces for lexical analyzer classes generated
 //		  by flex
diff --git a/usr.bin/lex/Makefile b/usr.bin/lex/Makefile
index 855da64da498..5cebe4b64d17 100644
--- a/usr.bin/lex/Makefile
+++ b/usr.bin/lex/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/Makefile,v 1.12.2.1 1999/08/29 15:29:25 peter Exp $
 #
 # 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/ccl.c b/usr.bin/lex/ccl.c
index 243e739fa651..c7ccb8288986 100644
--- a/usr.bin/lex/ccl.c
+++ b/usr.bin/lex/ccl.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/ccl.c,v 1.3.4.1 1999/08/29 15:29:25 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/config.h b/usr.bin/lex/config.h
index 2e0b5b43747b..475dbd332876 100644
--- a/usr.bin/lex/config.h
+++ b/usr.bin/lex/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated automatically by configure.  */
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/config.h,v 1.2.4.1 1999/08/29 15:29:26 peter Exp $ */
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
diff --git a/usr.bin/lex/dfa.c b/usr.bin/lex/dfa.c
index 8b023cbba50b..3c583ae6f34d 100644
--- a/usr.bin/lex/dfa.c
+++ b/usr.bin/lex/dfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/dfa.c,v 1.3.4.1 1999/08/29 15:29:26 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/ecs.c b/usr.bin/lex/ecs.c
index fa7206a2adfa..c25e4e3df559 100644
--- a/usr.bin/lex/ecs.c
+++ b/usr.bin/lex/ecs.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/ecs.c,v 1.3.4.1 1999/08/29 15:29:27 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/flex.skl b/usr.bin/lex/flex.skl
index 589b1b2b60ba..a7863b49cc05 100644
--- a/usr.bin/lex/flex.skl
+++ b/usr.bin/lex/flex.skl
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/flex.skl,v 1.2.2.1 1999/08/29 15:29:27 peter Exp $
  */
 
 #define FLEX_SCANNER
diff --git a/usr.bin/lex/flexdef.h b/usr.bin/lex/flexdef.h
index 62ccf3c09232..61a5e1df1e86 100644
--- a/usr.bin/lex/flexdef.h
+++ b/usr.bin/lex/flexdef.h
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* @(#) $FreeBSD$ (LBL) */
+/* @(#) $FreeBSD: src/usr.bin/lex/flexdef.h,v 1.3.4.1 1999/08/29 15:29:28 peter Exp $ (LBL) */
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/usr.bin/lex/gen.c b/usr.bin/lex/gen.c
index c0efadf29d8d..27fb4032441e 100644
--- a/usr.bin/lex/gen.c
+++ b/usr.bin/lex/gen.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/gen.c,v 1.3.4.1 1999/08/29 15:29:29 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/initscan.c b/usr.bin/lex/initscan.c
index 6ccb56e7a343..4b63e5f9fa05 100644
--- a/usr.bin/lex/initscan.c
+++ b/usr.bin/lex/initscan.c
@@ -2,7 +2,7 @@
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/lex/initscan.c,v 1.4.2.1 1999/08/29 15:29:30 peter Exp $
  */
 
 #define FLEX_SCANNER
@@ -1270,7 +1270,7 @@ char *yytext;
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/initscan.c,v 1.4.2.1 1999/08/29 15:29:30 peter Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile
index 0091cc2747bc..c6d4b46b275c 100644
--- a/usr.bin/lex/lib/Makefile
+++ b/usr.bin/lex/lib/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lex/lib/Makefile,v 1.6.2.1 1999/08/29 15:29:37 peter Exp $
 
 LIB=    ln
 SRCS=   libmain.c libyywrap.c
diff --git a/usr.bin/lex/lib/libmain.c b/usr.bin/lex/lib/libmain.c
index 0bcdbfc73929..2574d04b1fc9 100644
--- a/usr.bin/lex/lib/libmain.c
+++ b/usr.bin/lex/lib/libmain.c
@@ -1,6 +1,6 @@
 /* libmain - flex run-time support library "main" function */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/lib/libmain.c,v 1.1.1.2.4.1 1999/08/29 15:29:39 peter Exp $ */
 
 extern int yylex();
 
diff --git a/usr.bin/lex/lib/libyywrap.c b/usr.bin/lex/lib/libyywrap.c
index 3618f8d08ee2..300e3b0d22bf 100644
--- a/usr.bin/lex/lib/libyywrap.c
+++ b/usr.bin/lex/lib/libyywrap.c
@@ -1,6 +1,6 @@
 /* libyywrap - flex run-time support library "yywrap" function */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/lib/libyywrap.c,v 1.2.4.1 1999/08/29 15:29:39 peter Exp $ */
 
 int yywrap()
 	{
diff --git a/usr.bin/lex/main.c b/usr.bin/lex/main.c
index 2c7836d5b009..530ff73a6c95 100644
--- a/usr.bin/lex/main.c
+++ b/usr.bin/lex/main.c
@@ -32,7 +32,7 @@ char copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/main.c,v 1.5.2.1 1999/08/29 15:29:31 peter Exp $ */
 
 
 #include "flexdef.h"
diff --git a/usr.bin/lex/misc.c b/usr.bin/lex/misc.c
index 54ca3a4bb2e8..f79e089cd61f 100644
--- a/usr.bin/lex/misc.c
+++ b/usr.bin/lex/misc.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/misc.c,v 1.3.4.1 1999/08/29 15:29:31 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/nfa.c b/usr.bin/lex/nfa.c
index c0cb5426f737..aac666da561f 100644
--- a/usr.bin/lex/nfa.c
+++ b/usr.bin/lex/nfa.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/nfa.c,v 1.3.4.1 1999/08/29 15:29:32 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/parse.y b/usr.bin/lex/parse.y
index d98d0324720a..66a3a26fae6a 100644
--- a/usr.bin/lex/parse.y
+++ b/usr.bin/lex/parse.y
@@ -33,7 +33,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/parse.y,v 1.1.1.2.4.1 1999/08/29 15:29:32 peter Exp $ */
 
 
 /* Some versions of bison are broken in that they use alloca() but don't
diff --git a/usr.bin/lex/scan.l b/usr.bin/lex/scan.l
index c13c6f7d3052..89c348622f0e 100644
--- a/usr.bin/lex/scan.l
+++ b/usr.bin/lex/scan.l
@@ -27,7 +27,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/scan.l,v 1.3.2.1 1999/08/29 15:29:33 peter Exp $ */
 
 #include "flexdef.h"
 #include "parse.h"
diff --git a/usr.bin/lex/skel.c b/usr.bin/lex/skel.c
index a6e874c52742..0a80e4594df1 100644
--- a/usr.bin/lex/skel.c
+++ b/usr.bin/lex/skel.c
@@ -6,7 +6,7 @@ const char *skel[] = {
   "/* A lexical scanner generated by flex */",
   "",
   "/* Scanner skeleton version:",
-  " * $FreeBSD$",
+  " * $FreeBSD: src/usr.bin/lex/skel.c,v 1.2.2.3 2000/02/09 09:51:26 obrien Exp $",
   " */",
   "",
   "#define FLEX_SCANNER",
diff --git a/usr.bin/lex/sym.c b/usr.bin/lex/sym.c
index f287e906974a..f5a68a90e479 100644
--- a/usr.bin/lex/sym.c
+++ b/usr.bin/lex/sym.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/sym.c,v 1.3.4.1 1999/08/29 15:29:34 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/tblcmp.c b/usr.bin/lex/tblcmp.c
index 8668a75a3631..95275c3b4af0 100644
--- a/usr.bin/lex/tblcmp.c
+++ b/usr.bin/lex/tblcmp.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/tblcmp.c,v 1.3.4.1 1999/08/29 15:29:35 peter Exp $ */
 
 #include "flexdef.h"
 
diff --git a/usr.bin/lex/yylex.c b/usr.bin/lex/yylex.c
index 03fbf568f85d..5e8d40f6342e 100644
--- a/usr.bin/lex/yylex.c
+++ b/usr.bin/lex/yylex.c
@@ -26,7 +26,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/lex/yylex.c,v 1.3.4.1 1999/08/29 15:29:36 peter Exp $ */
 
 #include <ctype.h>
 #include "flexdef.h"
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 258dc55b3708..3da0adfe3ffe 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$
+.\" $FreeBSD: src/usr.bin/limits/limits.1,v 1.8.2.3 1999/08/29 15:29:41 peter Exp $
 .\"
 .Dd January 15, 1996
 .Dt LIMITS 1
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index b9de9a4c9cd7..a145c557ef9f 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -20,7 +20,7 @@
  *
  * Display/change(+runprogram)/eval resource limits.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/limits/limits.c,v 1.5.2.1 1999/08/29 15:29:41 peter Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile
index 1d495e420ece..c999f3b06326 100644
--- a/usr.bin/locate/Makefile
+++ b/usr.bin/locate/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile,v 1.4.2.2 1999/08/29 15:29:42 peter Exp $
 
 MAINTAINER= wosch
 
diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc
index 48174083d848..da38980e8311 100644
--- a/usr.bin/locate/Makefile.inc
+++ b/usr.bin/locate/Makefile.inc
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/Makefile.inc,v 1.3.2.1 1999/08/29 15:29:43 peter Exp $
 
 LIBEXECDIR?=	/usr/libexec
diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile
index e0018d89b7fd..e8b76c6a9420 100644
--- a/usr.bin/locate/bigram/Makefile
+++ b/usr.bin/locate/bigram/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/bigram/Makefile,v 1.3.2.1 1999/08/29 15:29:45 peter Exp $
 
 PROG=	locate.bigram
 NOMAN=	noman
diff --git a/usr.bin/locate/bigram/locate.bigram.c b/usr.bin/locate/bigram/locate.bigram.c
index 137b590697ae..a2603491b983 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$
+ * $FreeBSD: src/usr.bin/locate/bigram/locate.bigram.c,v 1.10.2.1 1999/08/29 15:29:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile
index fb1fb510e59a..cdab928bc241 100644
--- a/usr.bin/locate/code/Makefile
+++ b/usr.bin/locate/code/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/locate/code/Makefile,v 1.3.2.1 1999/08/29 15:29:46 peter Exp $
 
 PROG=	locate.code
 CFLAGS+=-I${.CURDIR}/../locate 
diff --git a/usr.bin/locate/code/locate.code.c b/usr.bin/locate/code/locate.code.c
index c7cb09715fb4..80640d44b4dd 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$
+ * $FreeBSD: src/usr.bin/locate/code/locate.code.c,v 1.10.2.1 1999/08/29 15:29:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 064cf08a52be..eff5fda30553 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$
+# $FreeBSD: src/usr.bin/locate/locate/Makefile,v 1.10.2.1 1999/08/29 15:29:48 peter Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
index 156f21a725d2..16a41dcd0d30 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$
+# $FreeBSD: src/usr.bin/locate/locate/concatdb.sh,v 1.8.2.2 2000/06/08 06:20:44 kris Exp $
 
 # 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 68f8a86d2b2b..4a05d0e07426 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$
+ * $FreeBSD: src/usr.bin/locate/locate/fastfind.c,v 1.11.2.1 1999/08/29 15:29:49 peter Exp $
  */
 
 
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index 7ea0526c80af..6f7c0b907172 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$
+.\" $FreeBSD: src/usr.bin/locate/locate/locate.1,v 1.11.2.3 2000/03/06 11:34:39 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt LOCATE 1
diff --git a/usr.bin/locate/locate/locate.c b/usr.bin/locate/locate/locate.c
index a0ffe0dbdcc0..59722183ac09 100644
--- a/usr.bin/locate/locate/locate.c
+++ b/usr.bin/locate/locate/locate.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)locate.c    8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/locate/locate/locate.c,v 1.11.2.1 1999/08/29 15:29:51 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/locate/locate/locate.h b/usr.bin/locate/locate/locate.h
index 24df8d4002be..bff87074810b 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$
+ * $FreeBSD: src/usr.bin/locate/locate/locate.h,v 1.6.2.1 1999/08/29 15:29:51 peter Exp $
  */
 
 /* 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 57835b363a3c..0c847ac305a4 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$
+# $FreeBSD: src/usr.bin/locate/locate/locate.rc,v 1.7.2.1 1999/08/29 15:29:52 peter Exp $
 
 #
 # All commented values are the defaults
diff --git a/usr.bin/locate/locate/mklocatedb.sh b/usr.bin/locate/locate/mklocatedb.sh
index f0a54341e6eb..cd23bc0c3d4e 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$
+# $FreeBSD: src/usr.bin/locate/locate/mklocatedb.sh,v 1.8.2.2 2000/06/08 06:20:44 kris Exp $
 
 # The directory containing locate subprograms
 : ${LIBEXECDIR:=/usr/libexec}; export LIBEXECDIR
diff --git a/usr.bin/locate/locate/updatedb.sh b/usr.bin/locate/locate/updatedb.sh
index 361e72d6de38..3b52f2cf619c 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$
+# $FreeBSD: src/usr.bin/locate/locate/updatedb.sh,v 1.12.2.4 2000/06/08 06:20:44 kris Exp $
 
 : ${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 38fe284a80f8..0ea00210c889 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$
+ * $FreeBSD: src/usr.bin/locate/locate/util.c,v 1.5.2.1 1999/08/29 15:29:53 peter Exp $
  */
 
 
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c
index d5b60ae10da1..772d24037499 100644
--- a/usr.bin/lock/lock.c
+++ b/usr.bin/lock/lock.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)lock.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/lock/lock.c,v 1.5.2.1 1999/08/29 15:29:56 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile
index 77d89c45bbdf..3d1c27afbfda 100644
--- a/usr.bin/lockf/Makefile
+++ b/usr.bin/lockf/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lockf/Makefile,v 1.3.2.1 1999/08/29 15:29:57 peter Exp $
 
 PROG=	lockf
 CFLAGS+=-Wall
diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1
index e4fc80eb93dc..8ac1d361c082 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$
+.\" $FreeBSD: src/usr.bin/lockf/lockf.1,v 1.6.2.1 1999/08/29 15:29:57 peter Exp $
 .\"
 .Dd July 7, 1998
 .Os FreeBSD
diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c
index 0a91048cafc4..5721a8436182 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$
+ * $FreeBSD: src/usr.bin/lockf/lockf.c,v 1.7.2.1 1999/08/29 15:29:58 peter Exp $
  */
 
 #include <sys/types.h>
diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c
index e7be77125506..992d1c1afa61 100644
--- a/usr.bin/logger/logger.c
+++ b/usr.bin/logger/logger.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)logger.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/logger/logger.c,v 1.4.2.1 1999/08/29 15:29:59 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile
index 2813ccbdfe30..1e0b3f89646a 100644
--- a/usr.bin/login/Makefile
+++ b/usr.bin/login/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/login/Makefile,v 1.27.2.2 1999/08/29 15:30:00 peter Exp $
 
 PROG=	login
 MAN1=	login.1
diff --git a/usr.bin/login/README b/usr.bin/login/README
index 16322c98f7db..0cbe2de86c39 100644
--- a/usr.bin/login/README
+++ b/usr.bin/login/README
@@ -9,4 +9,4 @@ The following defines can be used:
 
 -Guido
 
-$FreeBSD$
+$FreeBSD: src/usr.bin/login/README,v 1.2.8.1 2000/06/13 09:00:05 ru Exp $
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 492b9832da9c..2a137cd656dd 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)login.1	8.2 (Berkeley) 5/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.1,v 1.13.2.3 2000/01/14 11:15:25 sheldonh Exp $
 .\"
 .Dd May 5, 1994
 .Dt LOGIN 1
diff --git a/usr.bin/login/login.access.5 b/usr.bin/login/login.access.5
index 8eb8c6fa82a1..8abcdee67ef4 100644
--- a/usr.bin/login/login.access.5
+++ b/usr.bin/login/login.access.5
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/login/login.access.5,v 1.5.2.1 2000/03/06 11:34:40 sheldonh Exp $
 .\" this is comment
 .Dd April 30, 1994
 .Dt LOGIN.ACCESS 5
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 230842505ce4..081941593fcf 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/login/login.c,v 1.45.2.1 1999/08/29 15:30:01 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index e75afcb925ec..c11578fbe6a3 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logname.1	8.1 (Berkeley) 6/9/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/logname/logname.1,v 1.4.2.1 1999/08/29 15:30:03 peter Exp $
 .\"
 .Dd June 9, 1993
 .Dt LOGNAME 1
diff --git a/usr.bin/look/look.c b/usr.bin/look/look.c
index ad2f35c4f3bf..2df7313b9273 100644
--- a/usr.bin/look/look.c
+++ b/usr.bin/look/look.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)look.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/look/look.c,v 1.10.2.1 1999/08/29 15:30:04 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile
index b2b06113e666..83fbf37c709b 100644
--- a/usr.bin/lsvfs/Makefile
+++ b/usr.bin/lsvfs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/lsvfs/Makefile,v 1.3.2.1 1999/08/29 15:30:06 peter Exp $
 PROG=	lsvfs
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lsvfs/lsvfs.1 b/usr.bin/lsvfs/lsvfs.1
index bd075c85db55..66c513416589 100644
--- a/usr.bin/lsvfs/lsvfs.1
+++ b/usr.bin/lsvfs/lsvfs.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/lsvfs/lsvfs.1,v 1.6.2.1 1999/08/29 15:30:06 peter Exp $
 .\" 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 cb6a032e634b..08794e357dfc 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$
+ * $FreeBSD: src/usr.bin/lsvfs/lsvfs.c,v 1.11.2.2 1999/08/29 15:30:07 peter Exp $
  */
 
 #define _NEW_VFSCONF
diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index e863a13cbdff..effff55c509f 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)eval.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/eval.c,v 1.9.2.1 1999/08/29 15:30:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/m4.1 b/usr.bin/m4/m4.1
index 681befcd7dc9..379182858a24 100644
--- a/usr.bin/m4/m4.1
+++ b/usr.bin/m4/m4.1
@@ -1,5 +1,5 @@
 .\"
-.\"	@(#) $FreeBSD$
+.\"	@(#) $FreeBSD: src/usr.bin/m4/m4.1,v 1.7.2.3 2000/06/08 06:11:23 kris Exp $
 .\"
 .Dd January 26, 1993
 .Dt M4 1
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index 41b7b1385fe9..c7ea153cbbff 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/main.c,v 1.5.2.1 1999/08/29 15:30:09 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index 452f849cf4d2..10fc2480175c 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/m4/misc.c,v 1.4.2.1 1999/08/29 15:30:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 57684560200b..a1d8aeb342a5 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$
+.\" $FreeBSD: src/usr.bin/mail/mail.1,v 1.15.2.3 2000/03/06 11:34:42 sheldonh Exp $
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index c28d42574df3..f41bd78aea59 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -36,7 +36,7 @@ static char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-        "$FreeBSD$";
+        "$FreeBSD: src/usr.bin/mail/main.c,v 1.5.2.1 1999/11/19 00:47:19 jmz Exp $";
 #endif /* not lint */
 
 #ifndef lint
diff --git a/usr.bin/mail/temp.c b/usr.bin/mail/temp.c
index fd14c58e971b..75e136ca692a 100644
--- a/usr.bin/mail/temp.c
+++ b/usr.bin/mail/temp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)temp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mail/temp.c,v 1.5.2.1 1999/08/29 15:30:13 peter Exp $";
 #endif /* not lint */
 
 #include "rcv.h"
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index da2c13dbe108..d02d13334056 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/Makefile,v 1.10.2.1 1999/08/29 15:30:15 peter Exp $
 
 PROG=	make
 CFLAGS+= -I${.CURDIR}
diff --git a/usr.bin/make/PSD.doc/Makefile b/usr.bin/make/PSD.doc/Makefile
index d9f5acd3a47a..8c99a1469cae 100644
--- a/usr.bin/make/PSD.doc/Makefile
+++ b/usr.bin/make/PSD.doc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/make/PSD.doc/Makefile,v 1.4.2.1 1999/08/29 15:30:34 peter Exp $
 
 DIR=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/usr.bin/make/PSD.doc/tutorial.ms b/usr.bin/make/PSD.doc/tutorial.ms
index d4269ca06488..ae8684acb555 100644
--- a/usr.bin/make/PSD.doc/tutorial.ms
+++ b/usr.bin/make/PSD.doc/tutorial.ms
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tutorial.ms	8.1 (Berkeley) 8/18/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/PSD.doc/tutorial.ms,v 1.7.2.1 1999/08/29 15:30:35 peter Exp $
 .\"
 .EH 'PSD:12-%''PMake \*- A Tutorial'
 .OH 'PMake \*- A Tutorial''PSD:12-%'
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index cff79490ef09..5138b6d997ba 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/arch.c,v 1.10.2.3 1999/10/10 20:44:00 julian Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index ad186c15b410..9962f28d05ab 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.c,v 1.8.2.1 1999/08/29 15:30:17 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index 454cb435b18d..b6a96a4c7893 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/buf.h,v 1.7.2.1 1999/08/29 15:30:17 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 3e7608198eef..21e2dc71d119 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/compat.c,v 1.12.2.3 2000/05/20 20:12:19 will Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 202e7c0f1a6d..c08be3860d51 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/cond.c,v 1.7.2.2 1999/08/29 15:30:18 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 9d97eb5e4b60..8e508743a499 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/config.h,v 1.7.2.2 1999/09/16 00:28:40 julian Exp $
  */
 
 #define	DEFSHELL	1			/* Bourne shell */
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 18d0a8c39dbd..f3e1702d2006 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.c,v 1.7.2.1 1999/08/29 15:30:19 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 487957222eee..528d479bfa11 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/dir.h,v 1.6.2.1 1999/08/29 15:30:20 peter Exp $
  */
 
 /* dir.h --
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 9318b7e8a875..454652b37c95 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/for.c,v 1.7.2.1 1999/08/29 15:30:21 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 26947a8cd426..7ce516f12708 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.c,v 1.6.2.1 1999/08/29 15:30:22 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6a1dcbd12f44..ff4e31511a59 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/hash.h,v 1.7.2.1 1999/08/29 15:30:22 peter Exp $
  */
 
 /* hash.h --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 3ad15dd14e51..c274a2e2ef05 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.c,v 1.11.2.4 2000/05/20 20:12:19 will Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index fec55f728ddb..494bb839fcb2 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/job.h,v 1.8.2.3 2000/01/17 06:45:01 kris Exp $
  */
 
 /*-
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index e053f1a6d6f0..ad994d15e690 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/list.h,v 1.7.2.1 1999/08/29 15:30:25 peter Exp $
  */
 
 /*
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 57e73d83a180..cfad346fcb8e 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.h,v 1.7.2.1 1999/08/29 15:30:26 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index a6d3a7bbd143..61dba7aa300d 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAppend.c,v 1.5.2.1 1999/08/29 15:30:37 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index 9d22bef9ba05..0842eac2cec0 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtEnd.c,v 1.5.2.1 1999/08/29 15:30:38 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 57a895062890..fb9a4c709f1a 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstAtFront.c,v 1.5.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index d0a8e9f6600a..8fc030e58f63 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstClose.c,v 1.5.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index fd98a308bf86..375732346a2f 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstConcat.c,v 1.6.2.1 1999/08/29 15:30:39 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index afb84b46fec6..1f02cf0773c4 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDatum.c,v 1.4.2.1 1999/08/29 15:30:40 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index a10becbc0be9..c3ea332c9106 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDeQueue.c,v 1.5.2.1 1999/08/29 15:30:40 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 2a84d638c0c0..2c88c6303b22 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDestroy.c,v 1.6.2.1 1999/08/29 15:30:41 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index a29fa2febecc..0a4c7bf97ea2 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstDupl.c,v 1.6.2.1 1999/08/29 15:30:42 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index cafc4a699473..0bb7609d60a7 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstEnQueue.c,v 1.5.2.1 1999/08/29 15:30:43 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index a74d6b9b6bf2..344e2e56368c 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFind.c,v 1.5.2.1 1999/08/29 15:30:43 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 96ce3b079cf4..6b048229a2ea 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFindFrom.c,v 1.6.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index b9f2ae55286a..a5d63013a641 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstFirst.c,v 1.4.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 95ee44abbc27..4d3bd117e3d9 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEach.c,v 1.5.2.1 1999/08/29 15:30:44 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index aff154f70e0c..256a9c686f9c 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstForEachFrom.c,v 1.6.2.1 1999/08/29 15:30:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 7b3c2b089312..b401097a56da 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInit.c,v 1.5.2.1 1999/08/29 15:30:45 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 3c3861e11803..4fa64b2552d1 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInsert.c,v 1.5.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 7d9b62fe0c0f..f7c08fa11b5f 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstInt.h,v 1.5.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 50a4de019319..9fb615bd38f9 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsAtEnd.c,v 1.4.2.1 1999/08/29 15:30:46 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 79a27431e4dd..ec88579cda30 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstIsEmpty.c,v 1.4.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index 1affe2e0c383..6af0c9a807db 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstLast.c,v 1.4.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 7e3c2ceb9f72..6843424b32b7 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstMember.c,v 1.5.2.1 1999/08/29 15:30:47 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index 6008d0a485b5..b1f91994abd7 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstNext.c,v 1.5.2.1 1999/08/29 15:30:48 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index 9af9c7cd163d..a5ace2013e76 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstOpen.c,v 1.4.2.1 1999/08/29 15:30:48 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index be8b375e4b7d..8574fffb06ed 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstRemove.c,v 1.5.2.1 1999/08/29 15:30:49 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 967da863f6a4..fa5725aa149f 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstReplace.c,v 1.4.2.1 1999/08/29 15:30:50 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 6412f3e52d8a..439ba5e52b3b 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/lst.lib/lstSucc.c,v 1.4.2.1 1999/08/29 15:30:50 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 861ab13027b3..eb0e8e361574 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/make/main.c,v 1.29.2.4 2000/05/20 20:12:19 will Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index e33f995a1f13..d769c25d1520 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/make/make.1,v 1.16.2.8 2000/05/20 20:18:49 will Exp $
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 98f390200048..6f53036ea70c 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.c,v 1.8.2.1 1999/08/29 15:30:27 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index fd28480faf7f..be20e8fa8a22 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/make.h,v 1.8.2.3 2000/05/20 20:12:19 will Exp $
  */
 
 /*-
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 23cfe7323ca4..02edd5a9fc9e 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/nonints.h,v 1.6.2.1 1999/08/29 15:30:28 peter Exp $
  */
 
 /* arch.c */
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index d1b3bb4eb3d3..ef3ebfd85ebf 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/make/parse.c,v 1.20.2.1 1999/08/29 15:30:28 peter Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index b4ec874fc9a7..876288177c23 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/pathnames.h,v 1.7.2.1 1999/08/29 15:30:29 peter Exp $
  */
 
 #define	_PATH_OBJDIR		"obj"
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 42e077bed068..6383b8a174e8 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/sprite.h,v 1.7.2.1 1999/08/29 15:30:29 peter Exp $
  */
 
 /*
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index b4361fb10576..c1d9729fc156 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/str.c,v 1.9.2.1 1999/08/29 15:30:30 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index f895ad6e3fb1..e019e6a3ecd1 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/suff.c,v 1.9.2.1 1999/08/29 15:30:30 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 7e4673b1611b..319997fac40f 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/targ.c,v 1.7.2.1 1999/08/29 15:30:31 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 174954eb445a..ec61c4c1c21e 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -3,7 +3,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.bin/make/util.c,v 1.4.2.1 1999/08/29 15:30:31 peter Exp $";
 #endif
 
 #include <stdio.h>
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 2aa5a6df5e54..3758a7f844cc 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/make/var.c,v 1.11.2.2 1999/08/29 15:30:32 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/mesg/mesg.1 b/usr.bin/mesg/mesg.1
index 7bdf0fd17246..873eee96a907 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$
+.\" $FreeBSD: src/usr.bin/mesg/mesg.1,v 1.6.2.1 1999/08/29 15:30:53 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt MESG 1
diff --git a/usr.bin/mesg/mesg.c b/usr.bin/mesg/mesg.c
index 4e5878b2a1ae..3a08cab70b15 100644
--- a/usr.bin/mesg/mesg.c
+++ b/usr.bin/mesg/mesg.c
@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mesg.c	8.2 (Berkeley) 1/21/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mesg/mesg.c,v 1.3.2.1 1999/08/29 15:30:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile
index edc5d85e81c7..2dffe2bc1f03 100644
--- a/usr.bin/minigzip/Makefile
+++ b/usr.bin/minigzip/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/minigzip/Makefile,v 1.2.4.1 1999/08/29 15:30:56 peter Exp $
 
 PROG=	minigzip
 LDADD+=	-lz
diff --git a/usr.bin/minigzip/minigzip.1 b/usr.bin/minigzip/minigzip.1
index 48a60ea11324..6a2f9f7f50b5 100644
--- a/usr.bin/minigzip/minigzip.1
+++ b/usr.bin/minigzip/minigzip.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/minigzip/minigzip.1,v 1.2.4.1 1999/08/29 15:30:56 peter Exp $
 .\"
 .Dd December 13, 1997
 .Dt MINIGZIP 1
diff --git a/usr.bin/mk_cmds/Makefile b/usr.bin/mk_cmds/Makefile
index 4cbbbb95fcb9..7928e3e9342e 100644
--- a/usr.bin/mk_cmds/Makefile
+++ b/usr.bin/mk_cmds/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mk_cmds/Makefile,v 1.7.2.2 1999/12/12 03:04:10 chris Exp $
 
 PROG=	mk_cmds
 SRCS=	mk_cmds.c options.c utils.c ct.y cmd_tbl.l y.tab.h
diff --git a/usr.bin/mk_cmds/mk_cmds.1 b/usr.bin/mk_cmds/mk_cmds.1
index 4cc0814471e6..f700ed5aa01b 100644
--- a/usr.bin/mk_cmds/mk_cmds.1
+++ b/usr.bin/mk_cmds/mk_cmds.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mk_cmds/mk_cmds.1,v 1.1.2.2 1999/12/20 09:41:41 asmodai Exp $
 .Dd November 14, 1999
 .Dt MK_CMDS 1
 .Os FreeBSD
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index fb19a20ccda1..b146c89233c7 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkdep.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkdep/mkdep.1,v 1.4.2.1 1999/09/25 21:48:33 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKDEP 1
diff --git a/usr.bin/mkdep/mkdep.gcc.sh b/usr.bin/mkdep/mkdep.gcc.sh
index ec00dcfbdf92..36095cab2f14 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$
+# $FreeBSD: src/usr.bin/mkdep/mkdep.gcc.sh,v 1.17.2.1 1999/08/29 15:31:00 peter Exp $
 
 D=.depend			# default dependency file is .depend
 append=0
diff --git a/usr.bin/mkfifo/mkfifo.1 b/usr.bin/mkfifo/mkfifo.1
index c19a7c38f883..7206708d8394 100644
--- a/usr.bin/mkfifo/mkfifo.1
+++ b/usr.bin/mkfifo/mkfifo.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkfifo.1	8.2 (Berkeley) 1/5/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkfifo/mkfifo.1,v 1.4.2.1 1999/08/29 15:31:01 peter Exp $
 .\"
 .Dd January 5, 1994
 .Dt MKFIFO 1
diff --git a/usr.bin/mkfifo/mkfifo.c b/usr.bin/mkfifo/mkfifo.c
index 92d7fb1dcf93..e24c1279a2cf 100644
--- a/usr.bin/mkfifo/mkfifo.c
+++ b/usr.bin/mkfifo/mkfifo.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkfifo.c	8.2 (Berkeley) 1/5/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mkfifo/mkfifo.c,v 1.3.2.1 1999/08/29 15:31:02 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/mklocale/Makefile b/usr.bin/mklocale/Makefile
index 955c8c2fe961..c8a575e37e98 100644
--- a/usr.bin/mklocale/Makefile
+++ b/usr.bin/mklocale/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/7/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/Makefile,v 1.19.2.1 1999/08/29 15:31:03 peter Exp $
 
 PROG=	mklocale
 SRCS=	yacc.y lex.l y.tab.h
diff --git a/usr.bin/mklocale/data/Makefile b/usr.bin/mklocale/data/Makefile
index 1c446a9ca13b..d45b5ed54ea2 100644
--- a/usr.bin/mklocale/data/Makefile
+++ b/usr.bin/mklocale/data/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mklocale/data/Makefile,v 1.17.2.3 1999/08/29 15:31:04 peter Exp $
 
 NOMAN=YES
 CLEANFILES+= ${LOCALES:S/$/.out/g}
diff --git a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
index a9fa03fc89e5..0ac2a7a3228e 100644
--- a/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
+++ b/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src
@@ -1,7 +1,7 @@
 /*
  * LOCALE_CTYPE for the iso_8859_2 Locale
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/data/lt_LN.ISO_8859-2.src,v 1.1.4.1 1999/08/29 15:31:05 peter Exp $
  */
 
 ENCODING	"NONE"
diff --git a/usr.bin/mklocale/data/zh_CN.EUC.src b/usr.bin/mklocale/data/zh_CN.EUC.src
index b298ef5de562..bb85275b436d 100644
--- a/usr.bin/mklocale/data/zh_CN.EUC.src
+++ b/usr.bin/mklocale/data/zh_CN.EUC.src
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/mklocale/data/zh_CN.EUC.src,v 1.2.2.1 1999/08/29 15:31:06 peter Exp $
  */
 
 ENCODING	"EUC"
diff --git a/usr.bin/mklocale/lex.l b/usr.bin/mklocale/lex.l
index 3b81ea5f6202..b9e9edbcf090 100644
--- a/usr.bin/mklocale/lex.l
+++ b/usr.bin/mklocale/lex.l
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)lex.l	8.1 (Berkeley) 6/6/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.bin/mklocale/lex.l,v 1.3.4.2 2000/06/13 15:36:25 asmodai Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/mklocale/mklocale.1 b/usr.bin/mklocale/mklocale.1
index 58f337fdcd34..41af6da2b91a 100644
--- a/usr.bin/mklocale/mklocale.1
+++ b/usr.bin/mklocale/mklocale.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mklocale.1	8.2 (Berkeley) 4/18/94
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.3.2.2 1999/12/17 14:38:53 phantom Exp $
 .\"
 .Dd April 18, 1994
 .Dt MKLOCALE 1
diff --git a/usr.bin/mklocale/yacc.y b/usr.bin/mklocale/yacc.y
index dcdef343d477..a8cbd2007798 100644
--- a/usr.bin/mklocale/yacc.y
+++ b/usr.bin/mklocale/yacc.y
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static char sccsid[] = "@(#)yacc.y	8.1 (Berkeley) 6/6/93";
-static char rcsid[] = "$FreeBSD$";
+static char rcsid[] = "$FreeBSD: src/usr.bin/mklocale/yacc.y,v 1.5.2.1 2000/06/13 15:36:26 asmodai Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index c13fd49c7d77..c91cedc71e86 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mkstr/mkstr.1,v 1.4.2.1 2000/03/06 11:34:46 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt MKSTR 1
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index a0db88949595..38cee78baff3 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mkstr/mkstr.c,v 1.3.2.1 1999/08/29 15:31:08 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile
index 76ebee6f360b..8e5be6867bbd 100644
--- a/usr.bin/mktemp/Makefile
+++ b/usr.bin/mktemp/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mktemp/Makefile,v 1.1 1998/04/14 07:39:56 peter Exp $
 
 PROG=	mktemp
 
diff --git a/usr.bin/mktemp/mktemp.1 b/usr.bin/mktemp/mktemp.1
index 60ada8aa3c44..afd84adfea6c 100644
--- a/usr.bin/mktemp/mktemp.1
+++ b/usr.bin/mktemp/mktemp.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mktemp/mktemp.1,v 1.3.2.2 2000/03/06 11:34:48 sheldonh Exp $
 .\" From: $OpenBSD: mktemp.1,v 1.8 1998/03/19 06:13:37 millert Exp $
 .\"
 .\" Copyright (c) 1989, 1991, 1993
diff --git a/usr.bin/mktemp/mktemp.c b/usr.bin/mktemp/mktemp.c
index 381872d45ee4..9a9a68441651 100644
--- a/usr.bin/mktemp/mktemp.c
+++ b/usr.bin/mktemp/mktemp.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$FreeBSD$";
+	"$FreeBSD: src/usr.bin/mktemp/mktemp.c,v 1.2 1998/05/05 06:13:47 charnier Exp $";
 #endif /* not lint */
 
 static void usage __P((void));
diff --git a/usr.bin/modstat/Makefile b/usr.bin/modstat/Makefile
index 27f63e84fc83..031836f55a95 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$
+# $FreeBSD: src/usr.bin/modstat/Makefile,v 1.4.2.1 1999/08/29 15:31:09 peter Exp $
 #
 
 PROG=	modstat
diff --git a/usr.bin/modstat/modstat.8 b/usr.bin/modstat/modstat.8
index 95f01e55f4ba..effa9d5da3f5 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$
+.\" $FreeBSD: src/usr.bin/modstat/modstat.8,v 1.7.2.1 1999/08/29 15:31:10 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt MODSTAT 8
diff --git a/usr.bin/modstat/modstat.c b/usr.bin/modstat/modstat.c
index 21dd258c06dd..b82f58944e7f 100644
--- a/usr.bin/modstat/modstat.c
+++ b/usr.bin/modstat/modstat.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/modstat/modstat.c,v 1.10.2.1 1999/08/29 15:31:10 peter Exp $";
 #endif /* not lint */
 
 #include <a.out.h>
diff --git a/usr.bin/more/Makefile b/usr.bin/more/Makefile
index 79048432118c..2362b5e5f75b 100644
--- a/usr.bin/more/Makefile
+++ b/usr.bin/more/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/more/Makefile,v 1.6.2.1 1999/08/29 15:31:12 peter Exp $
 
 PROG=	more
 CFLAGS+=-I${.CURDIR} -DTERMIOS
diff --git a/usr.bin/more/command.c b/usr.bin/more/command.c
index 0a400d881bc6..322d9f39da7b 100644
--- a/usr.bin/more/command.c
+++ b/usr.bin/more/command.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)command.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/command.c,v 1.10.2.3 1999/08/29 15:31:13 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/more/decode.c b/usr.bin/more/decode.c
index 4a3315275946..1c6f1771dc26 100644
--- a/usr.bin/more/decode.c
+++ b/usr.bin/more/decode.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)decode.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/decode.c,v 1.1.1.1.10.3 1999/08/29 15:31:14 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/input.c b/usr.bin/more/input.c
index 50e2031724ab..eacfd9574325 100644
--- a/usr.bin/more/input.c
+++ b/usr.bin/more/input.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/input.c,v 1.2.8.3 1999/08/29 15:31:15 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/less.h b/usr.bin/more/less.h
index e17ec4038210..3d744bb0a945 100644
--- a/usr.bin/more/less.h
+++ b/usr.bin/more/less.h
@@ -33,7 +33,7 @@
  *
  *	@(#)less.h	8.1 (Berkeley) 6/6/93
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/more/less.h,v 1.2.10.3 1999/08/29 15:31:15 peter Exp $
  */
 
 #define	NULL_POSITION	((off_t)(-1))
diff --git a/usr.bin/more/line.c b/usr.bin/more/line.c
index 6b980739b1dc..c9383d0d915d 100644
--- a/usr.bin/more/line.c
+++ b/usr.bin/more/line.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)line.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/line.c,v 1.4.8.3 1999/08/29 15:31:16 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/main.c b/usr.bin/more/main.c
index cb7c4e2a1c64..e7fff3c807f8 100644
--- a/usr.bin/more/main.c
+++ b/usr.bin/more/main.c
@@ -45,7 +45,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/7/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/main.c,v 1.10.2.4 2000/05/09 03:57:14 hoek Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index 7b8fa27da1b8..27856a9bc742 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)more.1	8.2 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/more/more.1,v 1.7.2.7 2000/03/06 11:34:50 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt MORE 1
diff --git a/usr.bin/more/option.c b/usr.bin/more/option.c
index 53f332b9e6ce..b7f096f928f8 100644
--- a/usr.bin/more/option.c
+++ b/usr.bin/more/option.c
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)option.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/option.c,v 1.5.2.1 1999/08/29 15:31:17 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/more/output.c b/usr.bin/more/output.c
index 337a294e6b9a..d495897364ef 100644
--- a/usr.bin/more/output.c
+++ b/usr.bin/more/output.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/output.c,v 1.7.2.4 1999/08/29 15:31:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/prim.c b/usr.bin/more/prim.c
index 03fcad8d408e..08b36baa158a 100644
--- a/usr.bin/more/prim.c
+++ b/usr.bin/more/prim.c
@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)prim.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/prim.c,v 1.6.2.3 1999/08/29 15:31:19 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/more/tags.c b/usr.bin/more/tags.c
index b0068b0e2f06..5eccfce7a265 100644
--- a/usr.bin/more/tags.c
+++ b/usr.bin/more/tags.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)tags.c	8.1 (Berkeley) 6/6/93";
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/more/tags.c,v 1.3.2.3 1999/08/29 15:31:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile
index 21cb15155568..e66d81bd1cda 100644
--- a/usr.bin/msgs/Makefile
+++ b/usr.bin/msgs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/msgs/Makefile,v 1.5.2.1 1999/08/29 15:31:21 peter Exp $
 
 PROG=	msgs
 DPADD=	${LIBTERMCAP}
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index eea9e20d5a6e..72d96d985d52 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)msgs.1	8.2 (Berkeley) 4/28/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/msgs/msgs.1,v 1.5.2.2 2000/03/06 11:34:52 sheldonh Exp $
 .\"
 .Dd April 28, 1995
 .Dt MSGS 1
diff --git a/usr.bin/msgs/msgs.c b/usr.bin/msgs/msgs.c
index 17536400f468..122e252bca2a 100644
--- a/usr.bin/msgs/msgs.c
+++ b/usr.bin/msgs/msgs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)msgs.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/msgs/msgs.c,v 1.13.2.2 1999/08/29 15:31:21 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile
index 0e692e92cd12..1b5685ce9ab3 100644
--- a/usr.bin/mt/Makefile
+++ b/usr.bin/mt/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/mt/Makefile,v 1.2.2.1 1999/08/29 15:31:23 peter Exp $
 
 PROG=	mt
 CFLAGS+=-I${.CURDIR}/../../sys
diff --git a/usr.bin/mt/mt.1 b/usr.bin/mt/mt.1
index 5b3fba81b8c6..a940eb0ea2fd 100644
--- a/usr.bin/mt/mt.1
+++ b/usr.bin/mt/mt.1
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mt.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.12.2.4 2000/03/06 11:34:54 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt MT 1
diff --git a/usr.bin/mt/mt.c b/usr.bin/mt/mt.c
index 9fcb727e197a..0a0c72713ef3 100644
--- a/usr.bin/mt/mt.c
+++ b/usr.bin/mt/mt.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mt.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/mt/mt.c,v 1.20.2.3 1999/08/29 15:31:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile
index 569453240d60..5a1d14231be2 100644
--- a/usr.bin/ncal/Makefile
+++ b/usr.bin/ncal/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ncal/Makefile,v 1.1.1.1.4.1 1999/08/29 15:31:25 peter Exp $
 PROG= ncal
 SRCS= ncal.c
 
diff --git a/usr.bin/ncal/ncal.1 b/usr.bin/ncal/ncal.1
index 5636440d0e56..caf6207ac35b 100644
--- a/usr.bin/ncal/ncal.1
+++ b/usr.bin/ncal/ncal.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/ncal/ncal.1,v 1.7.2.1 1999/08/29 15:31:25 peter Exp $
 .\"
 .Dd December 16, 1997
 .Dt CAL 1
diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c
index 31293ce9693f..dd9c2dfea10b 100644
--- a/usr.bin/ncal/ncal.c
+++ b/usr.bin/ncal/ncal.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ncal/ncal.c,v 1.6.2.1 1999/08/29 15:31:26 peter Exp $";
 #endif /* not lint */
 
 #include <calendar.h>
diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c
index f0a72e48eae1..5d8326500824 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$";
+  "$FreeBSD: src/usr.bin/netstat/atalk.c,v 1.11.2.1 1999/08/29 15:31:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 086502f75b02..9485f89e1841 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$";
+  "$FreeBSD: src/usr.bin/netstat/if.c,v 1.24.2.4 2000/01/03 17:49:34 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index 41c576fb8469..11fde96dd54a 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$";
+  "$FreeBSD: src/usr.bin/netstat/inet.c,v 1.30.2.4 2000/01/03 19:05:18 guido Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c
index 8f7c1baa889f..7acee83cad25 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$";
+  "$FreeBSD: src/usr.bin/netstat/ipx.c,v 1.10.2.2 1999/11/27 03:21:33 bp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/iso.c b/usr.bin/netstat/iso.c
index bd38e15003ee..a99f22154032 100644
--- a/usr.bin/netstat/iso.c
+++ b/usr.bin/netstat/iso.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)iso.c	8.1 (Berkeley) 6/6/93";
 #endif /* not lint */
 
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/iso.c,v 1.2.8.1 1999/08/29 15:31:31 peter Exp $
  * $Source: /home/ncvs/src/usr.bin/netstat/iso.c,v $
  */
 /*******************************************************************************
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 5ad8d477e25c..f940bc43addb 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 3/1/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/main.c,v 1.23.2.5 2000/03/20 18:34:54 guido Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index 921b31ac7bee..bc62add990cf 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mbuf.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/mbuf.c,v 1.15.2.1 1999/08/29 15:31:32 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 9b907fe3a2ae..48ae95b708e4 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.11.2.5 2000/03/06 11:34:56 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt NETSTAT 1
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index c60437990c54..130b17fe9c66 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)netstat.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/netstat/netstat.h,v 1.10.2.2 2000/01/03 19:05:20 guido Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 1e80b2e80ab1..dd593b749742 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$";
+  "$FreeBSD: src/usr.bin/netstat/route.c,v 1.33.2.2 2000/01/25 15:29:14 ru Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/netstat/unix.c b/usr.bin/netstat/unix.c
index 345e28a4ee41..fe350938a042 100644
--- a/usr.bin/netstat/unix.c
+++ b/usr.bin/netstat/unix.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unix.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/netstat/unix.c,v 1.10.2.2 1999/08/29 15:31:33 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile
index 75f369face5a..066c0215203d 100644
--- a/usr.bin/newkey/Makefile
+++ b/usr.bin/newkey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/newkey/Makefile,v 1.2.2.1 1999/08/29 15:31:35 peter Exp $
 
 PROG= newkey
 SRCS= newkey.c update.c generic.c
diff --git a/usr.bin/newkey/generic.c b/usr.bin/newkey/generic.c
index 4067867d6598..e7b59702e1c8 100644
--- a/usr.bin/newkey/generic.c
+++ b/usr.bin/newkey/generic.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)generic.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/generic.c,v 1.2.2.1 1999/08/29 15:31:35 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/newkey/newkey.c b/usr.bin/newkey/newkey.c
index 141614ee088d..3906cd3bdd68 100644
--- a/usr.bin/newkey/newkey.c
+++ b/usr.bin/newkey/newkey.c
@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)newkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/newkey.c,v 1.2.2.1 1999/08/29 15:31:36 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/newkey/update.c b/usr.bin/newkey/update.c
index 2f1c53fab9ae..e9a04ed12abe 100644
--- a/usr.bin/newkey/update.c
+++ b/usr.bin/newkey/update.c
@@ -32,7 +32,7 @@
 static	char sccsid[] = "@(#)update.c 1.2 91/03/11 Copyr 1986 Sun Micro";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/newkey/update.c,v 1.4.2.1 1999/08/29 15:31:37 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 94f36d750187..d0808225c953 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$
+.\" $FreeBSD: src/usr.bin/nfsstat/nfsstat.1,v 1.7.2.1 1999/08/29 15:31:38 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c
index f68f6216c3e5..d65e49b0e431 100644
--- a/usr.bin/nfsstat/nfsstat.c
+++ b/usr.bin/nfsstat/nfsstat.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)nfsstat.c	8.2 (Berkeley) 3/31/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nfsstat/nfsstat.c,v 1.12.2.1 1999/08/29 15:31:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index 9bebdc15cf79..9db75d078fb6 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$
+.\" $FreeBSD: src/usr.bin/nice/nice.1,v 1.7.2.3 2000/01/14 11:15:26 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt NICE 1
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index d6a52d22b42e..1f579a0d5158 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$
+.\" $FreeBSD: src/usr.bin/nm/nm.1,v 1.8.2.1 1999/08/29 15:31:42 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.1aout b/usr.bin/nm/nm.1aout
index d6a52d22b42e..f86c3cee17e8 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$
+.\" $FreeBSD: src/usr.bin/nm/nm.1aout,v 1.8.2.1 1999/08/29 15:31:42 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt NM 1
diff --git a/usr.bin/nm/nm.c b/usr.bin/nm/nm.c
index 91665b229a51..c08c01b688ef 100644
--- a/usr.bin/nm/nm.c
+++ b/usr.bin/nm/nm.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nm.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nm/nm.c,v 1.12.2.1 1999/08/29 15:31:43 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index d881d7a379bf..ac5ff1d53760 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)nohup.1	8.1 (Berkeley) 6/6/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/nohup/nohup.1,v 1.2.2.1 2000/01/14 11:15:27 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt NOHUP 1
diff --git a/usr.bin/nohup/nohup.c b/usr.bin/nohup/nohup.c
index 8992997b6cfd..07310e2b3e63 100644
--- a/usr.bin/nohup/nohup.c
+++ b/usr.bin/nohup/nohup.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)nohup.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/nohup/nohup.c,v 1.2.2.2 1999/08/29 15:31:44 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/objformat/Makefile b/usr.bin/objformat/Makefile
index a56fdd4f8b8c..6d63e05c1d19 100644
--- a/usr.bin/objformat/Makefile
+++ b/usr.bin/objformat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.14 1998/11/01 02:37:40 jdp Exp $
 
 PROG=		objformat
 CFLAGS+=	-Wall
diff --git a/usr.bin/objformat/objformat.1 b/usr.bin/objformat/objformat.1
index 9fde70c17d69..3b7ebb5f5f9b 100644
--- a/usr.bin/objformat/objformat.1
+++ b/usr.bin/objformat/objformat.1
@@ -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$
+.\" $FreeBSD: src/usr.bin/objformat/objformat.1,v 1.1.2.2 1999/08/29 15:31:46 peter Exp $
 .\"
 .Dd October 25, 1998
 .Os
diff --git a/usr.bin/objformat/objformat.c b/usr.bin/objformat/objformat.c
index 8d75f5ea64ae..d5a5d4e1f29d 100644
--- a/usr.bin/objformat/objformat.c
+++ b/usr.bin/objformat/objformat.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/objformat/objformat.c,v 1.6 1998/10/24 02:01:30 jdp Exp $
  */
 
 #include <err.h>
diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile
index 7f7241dc5e72..dba606f778f8 100644
--- a/usr.bin/opieinfo/Makefile
+++ b/usr.bin/opieinfo/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opieinfo/Makefile,v 1.3.2.1 1999/08/29 15:31:47 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile
index 6c43636ad57b..99c501670753 100644
--- a/usr.bin/opiekey/Makefile
+++ b/usr.bin/opiekey/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiekey/Makefile,v 1.3.2.1 1999/08/29 15:31:48 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile
index 7fc70ffbf5e7..8ea8b73dbed2 100644
--- a/usr.bin/opiepasswd/Makefile
+++ b/usr.bin/opiepasswd/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/opiepasswd/Makefile,v 1.3.2.1 1999/08/29 15:31:50 peter Exp $
 #
 OPIE_DIST?=	${.CURDIR}/../../contrib/opie
 
diff --git a/usr.bin/pagesize/pagesize.sh b/usr.bin/pagesize/pagesize.sh
index fd5477b3222b..3ffc7a64975a 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$
+# $FreeBSD: src/usr.bin/pagesize/pagesize.sh,v 1.4.2.1 1999/08/29 15:31:51 peter Exp $
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin; export PATH
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 51b2b9b8fce7..7b0adf98fb79 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 # From:	@(#)Makefile	8.3 (Berkeley) 4/2/94
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/passwd/Makefile,v 1.30.2.4 1999/11/18 13:33:53 roger Exp $
 
 # NOPAM is used by PicoBSD
 
diff --git a/usr.bin/passwd/extern.h b/usr.bin/passwd/extern.h
index 287646c6a380..a21e057e2e4d 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$
+ * $FreeBSD: src/usr.bin/passwd/extern.h,v 1.4.2.1 1999/08/29 15:31:53 peter Exp $
  */
 
 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 07e1d183d440..760f06c75b60 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$
+ * $FreeBSD: src/usr.bin/passwd/local_passwd.c,v 1.20.2.1 1999/08/29 15:31:53 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index fd9379331e11..72845da08b5f 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)passwd.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/passwd/passwd.1,v 1.11.2.3 2000/03/06 11:34:58 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt PASSWD 1
diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index e69864a0dedb..ce02efbfb537 100644
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)passwd.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/passwd/passwd.c,v 1.15.2.1 1999/08/29 15:31:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c
index a1971199b49c..791dc16cfedb 100644
--- a/usr.bin/paste/paste.c
+++ b/usr.bin/paste/paste.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)paste.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/paste/paste.c,v 1.5.2.1 1999/08/29 15:31:56 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index 395622729950..f84eabf21f56 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$
+.\" $FreeBSD: src/usr.bin/pr/pr.1,v 1.5.2.3 2000/03/06 11:35:00 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt PR 1
diff --git a/usr.bin/pr/pr.c b/usr.bin/pr/pr.c
index 850ecdadac7c..fe0558ad4fa2 100644
--- a/usr.bin/pr/pr.c
+++ b/usr.bin/pr/pr.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.c,v 1.6.2.1 1999/12/06 04:43:22 kris Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/pr/pr.h b/usr.bin/pr/pr.h
index 7a38d1eedcbb..a6cd7b848e6d 100644
--- a/usr.bin/pr/pr.h
+++ b/usr.bin/pr/pr.h
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *      @(#)pr.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/pr/pr.h,v 1.1.1.1.10.2 2000/01/02 23:18:00 steve Exp $
  */
 
 /*
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index 27440e221fc1..a192fc0dc083 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printf.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/printf/printf.1,v 1.3.2.2 2000/01/19 04:20:16 chris Exp $
 .\"
 .Dd June 6, 1993
 .Dt PRINTF 1
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 7d1a471e98bd..51851074c0a7 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$
+.\" $FreeBSD: src/usr.bin/quota/quota.1,v 1.6.2.1 1999/08/29 15:31:59 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt QUOTA 1
diff --git a/usr.bin/quota/quota.c b/usr.bin/quota/quota.c
index 246922df88b5..659380bcd36a 100644
--- a/usr.bin/quota/quota.c
+++ b/usr.bin/quota/quota.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)quota.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/quota/quota.c,v 1.10.2.1 1999/08/29 15:31:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 8148e57c2bac..fc8606f91902 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ranlib/Makefile,v 1.6.2.1 1999/08/29 15:32:00 peter Exp $
 
 PROG=	ranlib
 SRCS=	archive.c build.c misc.c ranlib.c touch.c
diff --git a/usr.bin/ranlib/build.c b/usr.bin/ranlib/build.c
index b4d8bc69a8ee..eb5827d66b86 100644
--- a/usr.bin/ranlib/build.c
+++ b/usr.bin/ranlib/build.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)build.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/build.c,v 1.6.2.1 1999/08/29 15:32:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/misc.c b/usr.bin/ranlib/misc.c
index 19b4854cbfa7..c2236064f19f 100644
--- a/usr.bin/ranlib/misc.c
+++ b/usr.bin/ranlib/misc.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/misc.c,v 1.4.2.1 1999/08/29 15:32:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ranlib/ranlib.1 b/usr.bin/ranlib/ranlib.1
index d57cf9836a42..ae7b0c59fec7 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$
+.\" $FreeBSD: src/usr.bin/ranlib/ranlib.1,v 1.6.2.1 1999/08/29 15:32:03 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.1aout b/usr.bin/ranlib/ranlib.1aout
index d57cf9836a42..5d7eadcd44db 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$
+.\" $FreeBSD: src/usr.bin/ranlib/ranlib.1aout,v 1.6.2.1 1999/08/29 15:32:03 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt RANLIB 1
diff --git a/usr.bin/ranlib/ranlib.c b/usr.bin/ranlib/ranlib.c
index 40263318e6a6..a56574c7a01e 100644
--- a/usr.bin/ranlib/ranlib.c
+++ b/usr.bin/ranlib/ranlib.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ranlib.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/ranlib.c,v 1.4.2.1 1999/08/29 15:32:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/ranlib/touch.c b/usr.bin/ranlib/touch.c
index b062e087c4fe..e22da41ae620 100644
--- a/usr.bin/ranlib/touch.c
+++ b/usr.bin/ranlib/touch.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ranlib/touch.c,v 1.5.2.1 1999/08/29 15:32:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rdist/Makefile b/usr.bin/rdist/Makefile
index ea47411d40a7..e055253c318c 100644
--- a/usr.bin/rdist/Makefile
+++ b/usr.bin/rdist/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.3 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rdist/Makefile,v 1.5.2.1 1999/08/29 15:32:05 peter Exp $
 
 PROG=	rdist
 SRCS=	docmd.c expand.c gram.y lookup.c main.c rshrcmd.c server.c
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 7ea9a8c1103a..f3025622a4b3 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "From: @(#)docmd.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/docmd.c,v 1.11.2.1 1999/08/29 15:32:06 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/expand.c b/usr.bin/rdist/expand.c
index 425d8c7cbf7b..b0a4ca66186b 100644
--- a/usr.bin/rdist/expand.c
+++ b/usr.bin/rdist/expand.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/expand.c,v 1.6.2.1 1999/08/29 15:32:06 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/gram.y b/usr.bin/rdist/gram.y
index bd77901726d6..49111290433a 100644
--- a/usr.bin/rdist/gram.y
+++ b/usr.bin/rdist/gram.y
@@ -37,7 +37,7 @@
 static char sccsid[] = "@(#)gram.y	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/gram.y,v 1.5.2.1 1999/08/29 15:32:07 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/lookup.c b/usr.bin/rdist/lookup.c
index b97ce3f5bf71..2e8956aa0f88 100644
--- a/usr.bin/rdist/lookup.c
+++ b/usr.bin/rdist/lookup.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lookup.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/lookup.c,v 1.5.2.1 1999/08/29 15:32:07 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/main.c b/usr.bin/rdist/main.c
index d4d94a2219b6..3a4b51a20ed4 100644
--- a/usr.bin/rdist/main.c
+++ b/usr.bin/rdist/main.c
@@ -39,7 +39,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/main.c,v 1.4.2.1 1999/08/29 15:32:08 peter Exp $";
 #endif /* not lint */
 
 #include "defs.h"
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index f789b1dc970a..3599ebc489cc 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rdist.1	8.3 (Berkeley) 3/17/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rdist/rdist.1,v 1.10.2.1 2000/03/06 11:35:02 sheldonh Exp $
 .\"
 .Dd March 17, 1994
 .Dt RDIST 1
diff --git a/usr.bin/rdist/rshrcmd.c b/usr.bin/rdist/rshrcmd.c
index c747cc6cf5ea..41d3d8db355a 100644
--- a/usr.bin/rdist/rshrcmd.c
+++ b/usr.bin/rdist/rshrcmd.c
@@ -6,7 +6,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/rshrcmd.c,v 1.5.2.1 1999/08/29 15:32:08 peter Exp $";
 #endif /* not lint */
 
 #include	"defs.h"
diff --git a/usr.bin/rdist/server.c b/usr.bin/rdist/server.c
index 44c2610fa114..552955ff5715 100644
--- a/usr.bin/rdist/server.c
+++ b/usr.bin/rdist/server.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)server.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rdist/server.c,v 1.9.2.1 1999/08/29 15:32:10 peter Exp $";
 #endif /* not lint */
 
 #include <sys/wait.h>
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index baed30a8b582..75b65909aa2a 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)renice.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/renice/renice.c,v 1.3.2.1 1999/08/29 15:32:11 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rlogin/Makefile b/usr.bin/rlogin/Makefile
index 2f2fef112f4c..2b9f233ea703 100644
--- a/usr.bin/rlogin/Makefile
+++ b/usr.bin/rlogin/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rlogin/Makefile,v 1.13.2.1 1999/08/29 15:32:12 peter Exp $
 
 PROG=	rlogin
 SRCS=	rlogin.c
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 026c3da81a45..7a38133c2c26 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rlogin.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rlogin/rlogin.1,v 1.6.2.1 2000/01/07 13:17:00 phantom Exp $
 .\"
 .Dd June 6, 1993
 .Dt RLOGIN 1
diff --git a/usr.bin/rlogin/rlogin.c b/usr.bin/rlogin/rlogin.c
index 0353ba439523..b920ab4f2c9d 100644
--- a/usr.bin/rlogin/rlogin.c
+++ b/usr.bin/rlogin/rlogin.c
@@ -40,7 +40,7 @@ static const char copyright[] =
 #ifndef lint
 static const char sccsid[] = "@(#)rlogin.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rlogin/rlogin.c,v 1.18.2.1 1999/08/29 15:32:13 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 252776eea67f..b8e9ebcb83ae 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_cout.c,v 1.5.2.1 1999/08/29 15:32:14 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 9224dbbc9832..3b6d86e77147 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_main.c,v 1.10.2.1 1999/08/29 15:32:15 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_tblout.c b/usr.bin/rpcgen/rpc_tblout.c
index 45282c87418c..d338442bf4a2 100644
--- a/usr.bin/rpcgen/rpc_tblout.c
+++ b/usr.bin/rpcgen/rpc_tblout.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_tblout.c,v 1.3.2.1 1999/08/29 15:32:16 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index 75583a586596..783f5765f8c2 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -34,7 +34,7 @@
 static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rpcgen/rpc_util.c,v 1.5.2.1 1999/08/29 15:32:17 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rpcgen/rpcgen.1 b/usr.bin/rpcgen/rpcgen.1
index 504d4a0e2320..fbfa111afac9 100644
--- a/usr.bin/rpcgen/rpcgen.1
+++ b/usr.bin/rpcgen/rpcgen.1
@@ -1,6 +1,6 @@
 .\" @(#)rpcgen.1 1.35 93/06/02 SMI
 .\" Copyright 1985-1993 Sun Microsystems, Inc.
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.6.2.2 2000/03/06 11:35:04 sheldonh Exp $
 .Dd March 28, 1993
 .Dt RPCGEN 1
 .Os
diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile
index 045c37cf1188..8ecb2e60439b 100644
--- a/usr.bin/rpcinfo/Makefile
+++ b/usr.bin/rpcinfo/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.2 (Berkeley) 5/11/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rpcinfo/Makefile,v 1.3.2.1 1999/08/29 15:32:19 peter Exp $
 
 PROG=	rpcinfo
 MAN8 = rpcinfo.8
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index e3fb914fcd09..fd877ca55b91 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$
+.\" $FreeBSD: src/usr.bin/rpcinfo/rpcinfo.8,v 1.4.2.1 1999/08/29 15:32:19 peter Exp $
 .\"
 .Dd December 17, 1987
 .Dt RPCINFO 8
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 99089bb2f305..0213722558fa 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -2,7 +2,7 @@
 /*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$";
+  "$FreeBSD: src/usr.bin/rpcinfo/rpcinfo.c,v 1.8.2.1 1999/08/29 15:32:20 peter Exp $";
 #endif
 
 /*
diff --git a/usr.bin/rs/rs.c b/usr.bin/rs/rs.c
index bd7dc33dcce8..6faf622899c9 100644
--- a/usr.bin/rs/rs.c
+++ b/usr.bin/rs/rs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rs/rs.c,v 1.4.2.1 1999/08/29 15:32:21 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rsh/Makefile b/usr.bin/rsh/Makefile
index 6b102f4dc950..f89d22f6574d 100644
--- a/usr.bin/rsh/Makefile
+++ b/usr.bin/rsh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rsh/Makefile,v 1.9.2.1 1999/08/29 15:32:22 peter Exp $
 
 PROG=	rsh
 SRCS=	rsh.c
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 800c82a26c03..e216e1c2bc40 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)rsh.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/rsh/rsh.1,v 1.6.2.2 2000/01/07 13:17:02 phantom Exp $
 .\"
 .Dd June 6, 1993
 .Dt RSH 1
diff --git a/usr.bin/rsh/rsh.c b/usr.bin/rsh/rsh.c
index deea9d94990d..78146128ad98 100644
--- a/usr.bin/rsh/rsh.c
+++ b/usr.bin/rsh/rsh.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)rsh.c	8.3 (Berkeley) 4/6/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rsh/rsh.c,v 1.16.2.2 1999/08/29 15:32:23 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile
index 2e67e374bfa7..64a5cb1cd447 100644
--- a/usr.bin/rup/Makefile
+++ b/usr.bin/rup/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rup/Makefile,v 1.3.2.1 1999/08/29 15:32:24 peter Exp $
 
 PROG=	rup
 MAN1=	rup.1
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index f7e83d715d12..4ac529a4f80d 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$
+.\" $FreeBSD: src/usr.bin/rup/rup.1,v 1.6.2.1 1999/08/29 15:32:25 peter Exp $
 .\"
 .Dd June 7, 1993
 .Dt RUP 1
diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c
index b916e9d23440..11f4c76c6e59 100644
--- a/usr.bin/rup/rup.c
+++ b/usr.bin/rup/rup.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rup/rup.c,v 1.10.2.1 1999/08/29 15:32:26 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index 03f79d4f784b..f9f523a5ff7a 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$
+.\" $FreeBSD: src/usr.bin/ruptime/ruptime.1,v 1.4.2.2 1999/08/29 15:32:27 peter Exp $
 .\"
 .Dd April 5, 1994
 .Dt RUPTIME 1
diff --git a/usr.bin/ruptime/ruptime.c b/usr.bin/ruptime/ruptime.c
index ab275b901bbe..7e492a0edf48 100644
--- a/usr.bin/ruptime/ruptime.c
+++ b/usr.bin/ruptime/ruptime.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  */
 
-/* $FreeBSD$ */
+/* $FreeBSD: src/usr.bin/ruptime/ruptime.c,v 1.11.2.1 1999/08/29 15:32:27 peter Exp $ */
 
 #ifndef lint
 static char copyright[] =
diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile
index 6ec50ab8ea50..80ff7d37873e 100644
--- a/usr.bin/rusers/Makefile
+++ b/usr.bin/rusers/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rusers/Makefile,v 1.3.2.1 1999/08/29 15:32:28 peter Exp $
 
 PROG = rusers
 MAN1 = rusers.1
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index 733b55e0e04b..bc644a5a7a47 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$
+.\" $FreeBSD: src/usr.bin/rusers/rusers.1,v 1.6.2.2 2000/03/06 11:35:06 sheldonh Exp $
 .\"
 .Dd April 23, 1991
 .Dt RUSERS 1
diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c
index a59abd62872d..0ea0fbc30c7c 100644
--- a/usr.bin/rusers/rusers.c
+++ b/usr.bin/rusers/rusers.c
@@ -33,7 +33,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rusers/rusers.c,v 1.7.2.1 1999/08/29 15:32:30 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile
index 33a2dcc6b634..1d43b37c0956 100644
--- a/usr.bin/rwall/Makefile
+++ b/usr.bin/rwall/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/rwall/Makefile,v 1.3.2.1 1999/08/29 15:32:31 peter Exp $
 
 PROG = rwall
 MAN1 = rwall.1
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index 63005020f092..640e4f227dfd 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$
+.\" $FreeBSD: src/usr.bin/rwall/rwall.1,v 1.5.2.2 2000/03/06 11:35:08 sheldonh Exp $
 .\"
 .Dd April 23, 1991
 .Dt RWALL 1
diff --git a/usr.bin/rwall/rwall.c b/usr.bin/rwall/rwall.c
index 214a5a59236e..95442e3ec74e 100644
--- a/usr.bin/rwall/rwall.c
+++ b/usr.bin/rwall/rwall.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "from: @(#)wall.c	5.14 (Berkeley) 3/2/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rwall/rwall.c,v 1.7.2.1 1999/08/29 15:32:32 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/rwho/rwho.c b/usr.bin/rwho/rwho.c
index c9045f1f9e2f..fbb7283cbc7e 100644
--- a/usr.bin/rwho/rwho.c
+++ b/usr.bin/rwho/rwho.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)rwho.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/rwho/rwho.c,v 1.12.2.1 1999/08/29 15:32:34 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sasc/sasc.1 b/usr.bin/sasc/sasc.1
index 7ace540f5c0a..a8d7a258b85a 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$
+.\" $FreeBSD: src/usr.bin/sasc/sasc.1,v 1.7.2.2 2000/03/06 11:35:09 sheldonh Exp $
 .\"
 .Dd January 6, 1995
 .Dt SASC 1
diff --git a/usr.bin/sasc/sasc.c b/usr.bin/sasc/sasc.c
index 3b023ea8eaa6..2d2ba4c632fe 100644
--- a/usr.bin/sasc/sasc.c
+++ b/usr.bin/sasc/sasc.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sasc/sasc.c,v 1.6.2.1 1999/08/29 15:32:36 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index dc9c934ac907..ae3ff19507ed 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/script/script.1,v 1.6.2.3 2000/03/06 11:35:11 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt SCRIPT 1
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 708a59b68e61..349733a0a6a2 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)script.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/script/script.c,v 1.9.2.2 1999/08/29 15:32:38 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index 136f56ce1197..80a67c2f8195 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)compile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/compile.c,v 1.12.2.1 1999/08/29 15:32:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c
index fcd5e4efdd2b..5a27ce786ee3 100644
--- a/usr.bin/sed/main.c
+++ b/usr.bin/sed/main.c
@@ -46,7 +46,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/3/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/main.c,v 1.8.2.2 2000/05/11 20:17:07 nsayer Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/misc.c b/usr.bin/sed/misc.c
index c9b013a8dbd9..a018b919bba5 100644
--- a/usr.bin/sed/misc.c
+++ b/usr.bin/sed/misc.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/misc.c,v 1.2.2.1 1999/08/29 15:32:41 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/process.c b/usr.bin/sed/process.c
index f7f0c3f1289d..3c1e57547412 100644
--- a/usr.bin/sed/process.c
+++ b/usr.bin/sed/process.c
@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)process.c	8.6 (Berkeley) 4/20/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/sed/process.c,v 1.8.2.1 1999/08/29 15:32:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 31286c5671fc..23f03a53a797 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/sed/sed.1,v 1.5.2.2 2000/02/15 03:17:11 unfurl Exp $
 .\"
 .Dd December 30, 1993
 .Dt SED 1
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index 795d939c58dc..bc4809b50a9b 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)shar.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/shar/shar.1,v 1.6.2.1 1999/08/29 15:32:43 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt SHAR 1
diff --git a/usr.bin/showmount/showmount.8 b/usr.bin/showmount/showmount.8
index 33d2fb6f0ba8..6373d8e228a8 100644
--- a/usr.bin/showmount/showmount.8
+++ b/usr.bin/showmount/showmount.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)showmount.8	8.3 (Berkeley) 3/29/95
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/showmount/showmount.8,v 1.5.2.1 2000/03/06 11:35:13 sheldonh Exp $
 .\"
 .Dd March 29, 1995
 .Dt SHOWMOUNT 8
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index ecc528d8e6ec..17ce7093893f 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)showmount.c	8.3 (Berkeley) 3/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/showmount/showmount.c,v 1.7.2.1 1999/08/29 15:32:45 peter Exp $";
 #endif not lint
 
 #include <sys/types.h>
diff --git a/usr.bin/size/size.c b/usr.bin/size/size.c
index b42e975da34a..69269ae6c62d 100644
--- a/usr.bin/size/size.c
+++ b/usr.bin/size/size.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)size.c	8.2 (Berkeley) 12/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/size/size.c,v 1.4.2.1 1999/08/29 15:32:47 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile
index a72aadfe8ba8..b2640f003af2 100644
--- a/usr.bin/sockstat/Makefile
+++ b/usr.bin/sockstat/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/sockstat/Makefile,v 1.1.2.1 1999/08/29 15:32:48 peter Exp $
 
 MAINTAINER=	des@freebsd.org
 MAN1=		sockstat.1
diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1
index 7e0e032c351c..16bd407c0937 100644
--- a/usr.bin/sockstat/sockstat.1
+++ b/usr.bin/sockstat/sockstat.1
@@ -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$
+.\" $FreeBSD: src/usr.bin/sockstat/sockstat.1,v 1.1.2.4 2000/03/06 11:35:15 sheldonh Exp $
 .\"
 .Dd April 13, 1999
 .Dt SOCKSTAT 1
diff --git a/usr.bin/sockstat/sockstat.pl b/usr.bin/sockstat/sockstat.pl
index 3c251884cb49..836b52007c81 100644
--- a/usr.bin/sockstat/sockstat.pl
+++ b/usr.bin/sockstat/sockstat.pl
@@ -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$
+# $FreeBSD: src/usr.bin/sockstat/sockstat.pl,v 1.2.2.2 1999/08/29 15:32:49 peter Exp $
 #
 
 my (%myaddr, %hisaddr);
diff --git a/usr.bin/soelim/soelim.c b/usr.bin/soelim/soelim.c
index 9152a2791b44..352f339fa868 100644
--- a/usr.bin/soelim/soelim.c
+++ b/usr.bin/soelim/soelim.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)soelim.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/soelim/soelim.c,v 1.2.2.1 1999/08/29 15:32:50 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index 12759bf0de64..286173e9468e 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)split.1	8.3 (Berkeley) 4/16/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/split/split.1,v 1.1.1.1.10.2 1999/08/29 15:32:52 peter Exp $
 .\"
 .Dd April 16, 1994
 .Dt SPLIT 1
diff --git a/usr.bin/strings/strings.c b/usr.bin/strings/strings.c
index 6a49d632035e..b8951feffa42 100644
--- a/usr.bin/strings/strings.c
+++ b/usr.bin/strings/strings.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strings.c	8.2 (Berkeley) 1/28/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/strings/strings.c,v 1.6.2.2 1999/08/29 15:32:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/strip/strip.1 b/usr.bin/strip/strip.1
index e91d6d9ada33..052bc7e78f1f 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$
+.\" $FreeBSD: src/usr.bin/strip/strip.1,v 1.6.2.1 1999/08/29 15:32:54 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.1aout b/usr.bin/strip/strip.1aout
index e91d6d9ada33..a7d30d552997 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$
+.\" $FreeBSD: src/usr.bin/strip/strip.1aout,v 1.6.2.1 1999/08/29 15:32:55 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt STRIP 1
diff --git a/usr.bin/strip/strip.c b/usr.bin/strip/strip.c
index 03ba76c6baac..b8814d201260 100644
--- a/usr.bin/strip/strip.c
+++ b/usr.bin/strip/strip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)strip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/strip/strip.c,v 1.11.2.1 1999/08/29 15:32:56 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile
index 33064a4e089d..30690d5c9195 100644
--- a/usr.bin/su/Makefile
+++ b/usr.bin/su/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/su/Makefile,v 1.21.2.2 1999/09/10 15:10:58 sheldonh Exp $
 
 PROG=	su
 SRCS=	su.c
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 54ed870922d3..d154131fd5ca 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$
+.\" $FreeBSD: src/usr.bin/su/su.1,v 1.15.2.2 2000/03/06 11:35:17 sheldonh Exp $
 .\"
 .\" this is for hilit19's braindeadness: "
 .Dd April 18, 1994
diff --git a/usr.bin/su/su.c b/usr.bin/su/su.c
index cfda2014c8bb..45f61d5ef595 100644
--- a/usr.bin/su/su.c
+++ b/usr.bin/su/su.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)su.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/su/su.c,v 1.29.2.2 1999/09/10 15:10:58 sheldonh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/symorder/symorder.c b/usr.bin/symorder/symorder.c
index 503c67eca60f..6272418f948b 100644
--- a/usr.bin/symorder/symorder.c
+++ b/usr.bin/symorder/symorder.c
@@ -42,7 +42,7 @@ char const copyright[] =
 static char sccsid[] = "@(#)symorder.c	5.8 (Berkeley) 4/1/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/symorder/symorder.c,v 1.14.2.1 1999/08/29 15:32:59 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c
index e15d7e28a50b..f9580ab8a6fa 100644
--- a/usr.bin/systat/cmds.c
+++ b/usr.bin/systat/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.2 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/cmds.c,v 1.2.2.1 1999/08/29 15:33:01 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c
index ffb0259d474a..6a23202fc594 100644
--- a/usr.bin/systat/cmdtab.c
+++ b/usr.bin/systat/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/cmdtab.c,v 1.4.2.1 1999/08/29 15:33:02 peter Exp $";
 #endif /* not lint */
 
 #include "systat.h"
diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c
index 6f9c8117063e..076fb91b55b8 100644
--- a/usr.bin/systat/devs.c
+++ b/usr.bin/systat/devs.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.c,v 1.3.2.1 1999/08/29 15:33:02 peter Exp $
  */
 /*
  * Some code and ideas taken from the old disks.c.
diff --git a/usr.bin/systat/devs.h b/usr.bin/systat/devs.h
index ec656543b91b..d149a3beeb3e 100644
--- a/usr.bin/systat/devs.h
+++ b/usr.bin/systat/devs.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/devs.h,v 1.2.2.1 1999/08/29 15:33:03 peter Exp $
  */
 
 int dsinit(int, struct statinfo *, struct statinfo *, struct statinfo *);
diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c
index 3b5b82935364..99097fa2dbcd 100644
--- a/usr.bin/systat/icmp.c
+++ b/usr.bin/systat/icmp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/icmp.c,v 1.1.2.1 1999/08/29 15:33:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c
index b499a8b21046..7e7281befc85 100644
--- a/usr.bin/systat/iostat.c
+++ b/usr.bin/systat/iostat.c
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/iostat.c,v 1.7.2.1 1999/08/29 15:33:04 peter Exp $
  */
 /*
  * Copyright (c) 1980, 1992, 1993
diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c
index d54c76ddb41d..94493e510970 100644
--- a/usr.bin/systat/ip.c
+++ b/usr.bin/systat/ip.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/ip.c,v 1.2.2.1 1999/08/29 15:33:05 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 8454682e8eba..0312c47906e4 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/main.c,v 1.10.2.1 1999/08/29 15:33:06 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mbufs.c b/usr.bin/systat/mbufs.c
index f542da99e727..37ef252409ce 100644
--- a/usr.bin/systat/mbufs.c
+++ b/usr.bin/systat/mbufs.c
@@ -34,7 +34,7 @@
 #ifndef lint
 static char sccsid[] = "@(#)mbufs.c	8.1 (Berkeley) 6/6/93";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/mbufs.c,v 1.8.2.1 1999/08/29 15:33:07 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c
index 3eb85c033f1b..d7f072a99ca9 100644
--- a/usr.bin/systat/mode.c
+++ b/usr.bin/systat/mode.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.c,v 1.1.2.1 1999/08/29 15:33:07 peter Exp $
  */
 
 /*
diff --git a/usr.bin/systat/mode.h b/usr.bin/systat/mode.h
index caa6bae7e246..c1bb5e2e7deb 100644
--- a/usr.bin/systat/mode.h
+++ b/usr.bin/systat/mode.h
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/mode.h,v 1.1.2.1 1999/08/29 15:33:08 peter Exp $
  */
 
 /*
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index b5d0422143a8..4ea32c45ecf8 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$";
+  "$FreeBSD: src/usr.bin/systat/netcmds.c,v 1.8.2.1 1999/08/29 15:33:08 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index ba53fdae58ab..ac50762bac23 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$";
+  "$FreeBSD: src/usr.bin/systat/netstat.c,v 1.11.2.1 1999/08/29 15:33:09 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c
index 4ca2284781ac..a2dd367e09bc 100644
--- a/usr.bin/systat/swap.c
+++ b/usr.bin/systat/swap.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)swap.c	8.3 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/swap.c,v 1.7.2.1 1999/08/29 15:33:10 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 9ba965790d50..37e34388889d 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.16.2.5 2000/03/06 11:35:19 sheldonh Exp $
 .\"
 .Dd September 9, 1997
 .Dt SYSTAT 1
diff --git a/usr.bin/systat/systat.h b/usr.bin/systat/systat.h
index d8045d8fecff..17799d982038 100644
--- a/usr.bin/systat/systat.h
+++ b/usr.bin/systat/systat.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	From: @(#)systat.h	8.1 (Berkeley) 6/6/93
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/systat/systat.h,v 1.2.2.1 1999/08/29 15:33:11 peter Exp $
  */
 
 #include <curses.h>
diff --git a/usr.bin/systat/tcp.c b/usr.bin/systat/tcp.c
index 433721ec187f..0533e6e3917d 100644
--- a/usr.bin/systat/tcp.c
+++ b/usr.bin/systat/tcp.c
@@ -38,7 +38,7 @@ static const char rcsid[] =
 	"Id: mbufs.c,v 1.5 1997/02/24 20:59:03 wollman Exp";
 */
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/tcp.c,v 1.2.2.1 1999/08/29 15:33:12 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index fd44db312abd..7d21e3c0e20a 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/systat/vmstat.c,v 1.32.2.2 1999/09/07 08:39:34 des Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tail/reverse.c b/usr.bin/tail/reverse.c
index 7acf45063725..c988f53ed20e 100644
--- a/usr.bin/tail/reverse.c
+++ b/usr.bin/tail/reverse.c
@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)reverse.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tail/reverse.c,v 1.8.2.1 1999/08/29 15:33:15 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile
index bddde1ba259f..dc6b2f35cf4a 100644
--- a/usr.bin/talk/Makefile
+++ b/usr.bin/talk/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/talk/Makefile,v 1.6.2.1 1999/08/29 15:33:16 peter Exp $
 
 PROG=	talk
 DPADD=	${LIBCURSES} ${LIBTERMCAP}
diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c
index c8094b47c51d..6aa679dda336 100644
--- a/usr.bin/talk/ctl.c
+++ b/usr.bin/talk/ctl.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/ctl.c,v 1.5.2.1 1999/08/29 15:33:17 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c
index fa3ebad7a5c8..e8ab34f31b25 100644
--- a/usr.bin/talk/ctl_transact.c
+++ b/usr.bin/talk/ctl_transact.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ctl_transact.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/ctl_transact.c,v 1.4.2.1 1999/08/29 15:33:17 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c
index 16c7605d447d..345f04d0719b 100644
--- a/usr.bin/talk/display.c
+++ b/usr.bin/talk/display.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)display.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/display.c,v 1.6.2.1 1999/08/29 15:33:18 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c
index 871dc9ac786b..8d9eebcf9c93 100644
--- a/usr.bin/talk/get_addrs.c
+++ b/usr.bin/talk/get_addrs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_addrs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_addrs.c,v 1.3.2.1 1999/08/29 15:33:18 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c
index 05a8368e6b1f..a0487d9defe5 100644
--- a/usr.bin/talk/get_iface.c
+++ b/usr.bin/talk/get_iface.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_iface.c,v 1.6.2.1 1999/08/29 15:33:19 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c
index 73e20a162bd9..bad583f161a5 100644
--- a/usr.bin/talk/get_names.c
+++ b/usr.bin/talk/get_names.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)get_names.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/get_names.c,v 1.5.2.1 1999/08/29 15:33:19 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c
index b752e0aa4926..59e011841da8 100644
--- a/usr.bin/talk/init_disp.c
+++ b/usr.bin/talk/init_disp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init_disp.c	8.2 (Berkeley) 2/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/init_disp.c,v 1.9.2.1 1999/08/29 15:33:20 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c
index f941c8dde78d..1a7357d56029 100644
--- a/usr.bin/talk/invite.c
+++ b/usr.bin/talk/invite.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)invite.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/invite.c,v 1.5.2.1 1999/08/29 15:33:21 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c
index 660d7430d20b..3dc7d235f9cc 100644
--- a/usr.bin/talk/io.c
+++ b/usr.bin/talk/io.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/io.c,v 1.6.2.1 1999/08/29 15:33:22 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c
index 3c6f3edc2765..03b39b97084a 100644
--- a/usr.bin/talk/look_up.c
+++ b/usr.bin/talk/look_up.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)look_up.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/look_up.c,v 1.4.2.1 1999/08/29 15:33:22 peter Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c
index 82c5038fc447..058ef115de83 100644
--- a/usr.bin/talk/msgs.c
+++ b/usr.bin/talk/msgs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)msgs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/msgs.c,v 1.4.2.1 1999/08/29 15:33:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index 73d046c2d802..95c2e05b1906 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)talk.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/talk/talk.1,v 1.3.2.1 2000/03/06 11:35:21 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt TALK 1
diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c
index d71d49ae2b7d..0e246d6d6c80 100644
--- a/usr.bin/talk/talk.c
+++ b/usr.bin/talk/talk.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)talk.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/talk/talk.c,v 1.6.2.1 1999/08/29 15:33:23 peter Exp $";
 #endif /* not lint */
 
 #include "talk.h"
diff --git a/usr.bin/tconv/Makefile b/usr.bin/tconv/Makefile
index 403397f67e4a..24986e414f81 100644
--- a/usr.bin/tconv/Makefile
+++ b/usr.bin/tconv/Makefile
@@ -1,5 +1,5 @@
 # Makefile for tconv
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/tconv/Makefile,v 1.4.2.1 1999/08/29 15:33:25 peter Exp $
 
 PROG=   tconv
 SRCS=   tconv.c quit.c
diff --git a/usr.bin/tconv/tconv.1 b/usr.bin/tconv/tconv.1
index 2cfa9c100989..9fa073cd08f4 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$
+.\" $FreeBSD: src/usr.bin/tconv/tconv.1,v 1.8.2.2 1999/08/29 15:33:25 peter Exp $
 .\"
 .Dd February 1, 1992
 .Dt TCONV 1
diff --git a/usr.bin/tconv/tconv.c b/usr.bin/tconv/tconv.c
index a9d035d028d6..94cb3e0b983f 100644
--- a/usr.bin/tconv/tconv.c
+++ b/usr.bin/tconv/tconv.c
@@ -58,7 +58,7 @@
 static const char SCCSid[] =
 	"@(#) mytinfo tconv.c 3.2 92/02/01 public domain, By Ross Ridge";
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tconv/tconv.c,v 1.4.2.1 1999/08/29 15:33:26 peter Exp $";
 #endif
 
 /* the right margin of the output */
diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c
index d4520b3fceac..361615dd6589 100644
--- a/usr.bin/tcopy/tcopy.c
+++ b/usr.bin/tcopy/tcopy.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tcopy.c	8.2 (Berkeley) 4/17/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tcopy/tcopy.c,v 1.4.2.1 1999/08/29 15:33:27 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tee/tee.c b/usr.bin/tee/tee.c
index c393200780c1..dc4de367f574 100644
--- a/usr.bin/tee/tee.c
+++ b/usr.bin/tee/tee.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tee.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tee/tee.c,v 1.3.2.1 1999/08/29 15:33:29 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index ca2e968be6fd..de53621e2448 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$
+.\" $FreeBSD: src/usr.bin/telnet/telnet.1,v 1.10.2.3 1999/08/29 15:33:30 peter Exp $
 .\"
 .Dd March 1, 1994
 .Dt TELNET 1
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c
index 4ae5dc4c11c0..8035bae1c384 100644
--- a/usr.bin/tftp/main.c
+++ b/usr.bin/tftp/main.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/main.c,v 1.7.2.1 1999/08/29 15:33:32 peter Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c
index 9dc00afeddba..039a102d292d 100644
--- a/usr.bin/tftp/tftp.c
+++ b/usr.bin/tftp/tftp.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftp.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/tftp.c,v 1.4.2.1 1999/08/29 15:33:33 peter Exp $";
 #endif /* not lint */
 
 /* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 5f3549d7dcf8..b9540a3e0111 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tftpsubs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tftp/tftpsubs.c,v 1.2.2.1 1999/08/29 15:33:34 peter Exp $";
 #endif /* not lint */
 
 /* Simple minded read-ahead/write-behind subroutines for tftp user and
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 8dbed2e9af7b..9ee460cd88f7 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)time.1	8.1 (Berkeley) 6/6/93
-.\"	$FreeBSD$
+.\"	$FreeBSD: src/usr.bin/time/time.1,v 1.8.2.2 2000/01/14 11:15:32 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt TIME 1
diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
index 960d00e27aac..10b9269ce0e8 100644
--- a/usr.bin/time/time.c
+++ b/usr.bin/time/time.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/time/time.c,v 1.12.2.2 1999/08/29 15:33:35 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/libacu/acucommon.c b/usr.bin/tip/libacu/acucommon.c
index efb644fce7d6..0a64bb9a4163 100644
--- a/usr.bin/tip/libacu/acucommon.c
+++ b/usr.bin/tip/libacu/acucommon.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acucommon.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/acucommon.c,v 1.2.2.1 1999/08/29 15:33:36 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/unidialer.c b/usr.bin/tip/libacu/unidialer.c
index 0206571007a1..a2c51e78360e 100644
--- a/usr.bin/tip/libacu/unidialer.c
+++ b/usr.bin/tip/libacu/unidialer.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)unidialer.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/unidialer.c,v 1.6.2.1 1999/08/29 15:33:38 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/libacu/ventel.c b/usr.bin/tip/libacu/ventel.c
index 08f2be588e62..3080cbb2f101 100644
--- a/usr.bin/tip/libacu/ventel.c
+++ b/usr.bin/tip/libacu/ventel.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ventel.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/libacu/ventel.c,v 1.2.2.1 1999/08/29 15:33:39 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/acu.c b/usr.bin/tip/tip/acu.c
index 3ee0381f9468..50097b8103e3 100644
--- a/usr.bin/tip/tip/acu.c
+++ b/usr.bin/tip/tip/acu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/acu.c,v 1.3.2.2 1999/08/29 15:33:40 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/acutab.c b/usr.bin/tip/tip/acutab.c
index 2d38c7d3efb8..83c5d1f5fb18 100644
--- a/usr.bin/tip/tip/acutab.c
+++ b/usr.bin/tip/tip/acutab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)acutab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/acutab.c,v 1.3.2.1 1999/08/29 15:33:41 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmds.c b/usr.bin/tip/tip/cmds.c
index f0caf1e648d8..01c18a23a59a 100644
--- a/usr.bin/tip/tip/cmds.c
+++ b/usr.bin/tip/tip/cmds.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmds.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cmds.c,v 1.8.2.2 1999/08/29 15:33:41 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cmdtab.c b/usr.bin/tip/tip/cmdtab.c
index 3ad19e89afa8..9a22a1ff236f 100644
--- a/usr.bin/tip/tip/cmdtab.c
+++ b/usr.bin/tip/tip/cmdtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cmdtab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cmdtab.c,v 1.2.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/cu.c b/usr.bin/tip/tip/cu.c
index 2b3b2ed60d42..8fae40e32fa8 100644
--- a/usr.bin/tip/tip/cu.c
+++ b/usr.bin/tip/tip/cu.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)cu.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.3.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/hunt.c b/usr.bin/tip/tip/hunt.c
index 90f7a613ad70..880f357a1aa0 100644
--- a/usr.bin/tip/tip/hunt.c
+++ b/usr.bin/tip/tip/hunt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hunt.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/hunt.c,v 1.4.2.1 1999/08/29 15:33:42 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tip/tip/log.c b/usr.bin/tip/tip/log.c
index 20004e8aa683..fb178be2935f 100644
--- a/usr.bin/tip/tip/log.c
+++ b/usr.bin/tip/tip/log.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/log.c,v 1.3.2.1 1999/08/29 15:33:43 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tip/tip/partab.c b/usr.bin/tip/tip/partab.c
index 94b2ab195e5d..8600a743edab 100644
--- a/usr.bin/tip/tip/partab.c
+++ b/usr.bin/tip/tip/partab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)partab.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/partab.c,v 1.2.2.1 1999/08/29 15:33:44 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/remote.c b/usr.bin/tip/tip/remote.c
index 2bc934389252..a583aa7add8e 100644
--- a/usr.bin/tip/tip/remote.c
+++ b/usr.bin/tip/tip/remote.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)remote.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/remote.c,v 1.3.2.1 1999/08/29 15:33:45 peter Exp $";
 #endif /* not lint */
 
 #include <sys/syslimits.h>
diff --git a/usr.bin/tip/tip/tip.1 b/usr.bin/tip/tip/tip.1
index a9c083d6a0da..621814f4f061 100644
--- a/usr.bin/tip/tip/tip.1
+++ b/usr.bin/tip/tip/tip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tip.1	8.4 (Berkeley) 4/18/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tip/tip/tip.1,v 1.4.2.1 2000/03/06 11:35:22 sheldonh Exp $
 .\"
 .Dd April 18, 1994
 .Dt TIP 1
diff --git a/usr.bin/tip/tip/tip.c b/usr.bin/tip/tip/tip.c
index 810c9c6b123f..f6aea815694f 100644
--- a/usr.bin/tip/tip/tip.c
+++ b/usr.bin/tip/tip/tip.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tip.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/tip.c,v 1.9.2.2 1999/08/29 15:33:45 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tip/tip/tipout.c b/usr.bin/tip/tip/tipout.c
index c9292a870a30..8b962b6f0958 100644
--- a/usr.bin/tip/tip/tipout.c
+++ b/usr.bin/tip/tip/tipout.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)tipout.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/tipout.c,v 1.5.2.1 1999/08/29 15:33:46 peter Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/value.c b/usr.bin/tip/tip/value.c
index 8be5cd9a0db0..82ce702ea775 100644
--- a/usr.bin/tip/tip/value.c
+++ b/usr.bin/tip/tip/value.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)value.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/value.c,v 1.4.2.1 1999/08/29 15:33:46 peter Exp $";
 #endif /* not lint */
 
 #include "tip.h"
diff --git a/usr.bin/tip/tip/vars.c b/usr.bin/tip/tip/vars.c
index 6aba4993e23d..714c9111c382 100644
--- a/usr.bin/tip/tip/vars.c
+++ b/usr.bin/tip/tip/vars.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)vars.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tip/tip/vars.c,v 1.3.2.1 1999/08/29 15:33:47 peter Exp $";
 #endif /* not lint */
 
 #include "tipconf.h"
diff --git a/usr.bin/tn3270/api/api_bsd.c b/usr.bin/tn3270/api/api_bsd.c
index 0e39a855b0fd..515910756473 100644
--- a/usr.bin/tn3270/api/api_bsd.c
+++ b/usr.bin/tn3270/api/api_bsd.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)api_bsd.c	8.2 (Berkeley) 1/7/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tn3270/api/api_bsd.c,v 1.2.2.1 1999/08/29 15:33:48 peter Exp $";
 #endif /* not lint */
 
 #if	defined(unix)
diff --git a/usr.bin/tn3270/ascii/mset.c b/usr.bin/tn3270/ascii/mset.c
index 8e344930320d..56dd69285980 100644
--- a/usr.bin/tn3270/ascii/mset.c
+++ b/usr.bin/tn3270/ascii/mset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mset.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tn3270/ascii/mset.c,v 1.3.2.1 1999/08/29 15:33:50 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 9dab5bbd2b7d..9f24cd8228e5 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -19,7 +19,7 @@
  *          Steven Wallace  <swallace@freebsd.org>
  *          Wolfram Schneider <wosch@FreeBSD.org>
  *
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/top/machine.c,v 1.18.2.3 1999/08/29 15:33:52 peter Exp $
  */
 
 
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 834f49e78585..1136236f3a07 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tput.1	8.2 (Berkeley) 3/19/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/tput/tput.1,v 1.3.2.2 1999/08/29 15:33:53 peter Exp $
 .\"
 .Dd March 19, 1994
 .Dt TPUT 1
diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c
index ff27e4add3ce..39a529929c53 100644
--- a/usr.bin/tr/str.c
+++ b/usr.bin/tr/str.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tr/str.c,v 1.9.2.1 1999/08/29 15:33:55 peter Exp $";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index b842e6d3452f..82993c4e106e 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tr.c	8.2 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tr/tr.c,v 1.7.2.1 1999/08/29 15:33:56 peter Exp $";
 #endif /* not lint */
 
 #include <locale.h>
diff --git a/usr.bin/truss/alpha-fbsd.c b/usr.bin/truss/alpha-fbsd.c
index 125e126da9c4..8c6cef3c8bad 100644
--- a/usr.bin/truss/alpha-fbsd.c
+++ b/usr.bin/truss/alpha-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/alpha-fbsd.c,v 1.2.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-fbsd.c b/usr.bin/truss/i386-fbsd.c
index 463f475cefaf..ab0f0f5aa7ab 100644
--- a/usr.bin/truss/i386-fbsd.c
+++ b/usr.bin/truss/i386-fbsd.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-fbsd.c,v 1.6.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/i386-linux.c b/usr.bin/truss/i386-linux.c
index ec7632b83e0d..67ff4a6855df 100644
--- a/usr.bin/truss/i386-linux.c
+++ b/usr.bin/truss/i386-linux.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/i386-linux.c,v 1.6.2.1 1999/08/29 15:33:57 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/main.c b/usr.bin/truss/main.c
index ab5c0bae20dd..9aa1d517bc6d 100644
--- a/usr.bin/truss/main.c
+++ b/usr.bin/truss/main.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/main.c,v 1.13.2.1 1999/08/29 15:33:58 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/setup.c b/usr.bin/truss/setup.c
index afa011308e93..ccb0fd0aad48 100644
--- a/usr.bin/truss/setup.c
+++ b/usr.bin/truss/setup.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/setup.c,v 1.8.2.1 1999/08/29 15:33:58 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/truss/syscall.h b/usr.bin/truss/syscall.h
index ccf80edf8c89..00c5cc8e7df4 100644
--- a/usr.bin/truss/syscall.h
+++ b/usr.bin/truss/syscall.h
@@ -18,7 +18,7 @@
  * IN (meaning that the data is passed *into* the system call).
  */
 /*
- * $FreeBSD$
+ * $FreeBSD: src/usr.bin/truss/syscall.h,v 1.3.2.1 1999/08/29 15:33:59 peter Exp $
  */
 
 enum Argtype { None = 1, Hex, Octal, Int, String, Ptr, Stat, Ioctl, Quad };
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 2a5915bb2019..9d0acb7542d5 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -31,7 +31,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/truss/syscalls.c,v 1.6.2.2 1999/08/29 15:34:00 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/tset/map.c b/usr.bin/tset/map.c
index 016afb1ff596..ac2922704b3e 100644
--- a/usr.bin/tset/map.c
+++ b/usr.bin/tset/map.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/map.c,v 1.5.2.1 1999/08/29 15:34:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/misc.c b/usr.bin/tset/misc.c
index 4d8d705a9a25..58a82195fe15 100644
--- a/usr.bin/tset/misc.c
+++ b/usr.bin/tset/misc.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/misc.c,v 1.3.2.1 1999/08/29 15:34:02 peter Exp $";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/usr.bin/tset/set.c b/usr.bin/tset/set.c
index 0f3081437d60..a99b140964ec 100644
--- a/usr.bin/tset/set.c
+++ b/usr.bin/tset/set.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.2 (Berkeley) 2/28/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/set.c,v 1.5.2.1 1999/08/29 15:34:03 peter Exp $";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/usr.bin/tset/term.c b/usr.bin/tset/term.c
index eb889ce6b123..f2386d3cbb42 100644
--- a/usr.bin/tset/term.c
+++ b/usr.bin/tset/term.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)term.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/term.c,v 1.2.2.1 1999/08/29 15:34:03 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/tset.c b/usr.bin/tset/tset.c
index df6b5b452d1a..db24dd1ed660 100644
--- a/usr.bin/tset/tset.c
+++ b/usr.bin/tset/tset.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tset.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcdif[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/tset.c,v 1.12.2.1 1999/08/29 15:34:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tset/wrterm.c b/usr.bin/tset/wrterm.c
index 8c5936898d63..45dce2faf80a 100644
--- a/usr.bin/tset/wrterm.c
+++ b/usr.bin/tset/wrterm.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)wrterm.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tset/wrterm.c,v 1.2.2.1 1999/08/29 15:34:04 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c
index 4d041d75775c..bbca469906e0 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$
+ * $FreeBSD: src/usr.bin/tsort/tsort.c,v 1.8.2.1 1999/08/29 15:34:06 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index dbf0e777661c..33d80669e9a6 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$
+.\" $FreeBSD: src/usr.bin/tty/tty.1,v 1.5.2.1 1999/08/29 15:34:08 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt TTY 1
diff --git a/usr.bin/tty/tty.c b/usr.bin/tty/tty.c
index 4d02fa9dccd4..8cd1281652b2 100644
--- a/usr.bin/tty/tty.c
+++ b/usr.bin/tty/tty.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)tty.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/tty/tty.c,v 1.3.2.1 1999/08/29 15:34:08 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index cfdd55245690..a0b0f30c6d5f 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ul/ul.c,v 1.5.2.1 1999/08/29 15:34:09 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index ed05c85d73af..3772a3f51951 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unexpand/unexpand.c,v 1.4.2.1 1999/08/29 15:34:11 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index 0b7344b2eb77..4ec979597833 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unifdef/unifdef.c,v 1.3.2.1 1999/08/29 15:34:12 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uniq/uniq.1 b/usr.bin/uniq/uniq.1
index e14dd517cda1..ea9b51611c16 100644
--- a/usr.bin/uniq/uniq.1
+++ b/usr.bin/uniq/uniq.1
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)uniq.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uniq/uniq.1,v 1.3.2.2 1999/08/29 15:34:13 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt UNIQ 1
diff --git a/usr.bin/uniq/uniq.c b/usr.bin/uniq/uniq.c
index 07e25a07c9cf..3c2142840285 100644
--- a/usr.bin/uniq/uniq.c
+++ b/usr.bin/uniq/uniq.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uniq.c	8.3 (Berkeley) 5/4/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uniq/uniq.c,v 1.5.2.5 1999/12/10 13:11:19 ache Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile
index 946132c7bb99..65e5f30f1772 100644
--- a/usr.bin/units/Makefile
+++ b/usr.bin/units/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/Makefile,v 1.4.2.1 1999/08/29 15:34:15 peter Exp $
 
 PROG=	units
 
diff --git a/usr.bin/units/README b/usr.bin/units/README
index 974cbe9fee3f..0a31dbccffc1 100644
--- a/usr.bin/units/README
+++ b/usr.bin/units/README
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/units/README,v 1.3.2.1 1999/08/29 15:34:16 peter Exp $
 
 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 227dd00b4922..3f634ff21289 100644
--- a/usr.bin/units/pathnames.h
+++ b/usr.bin/units/pathnames.h
@@ -1,4 +1,4 @@
-/* $FreeBSD$	*/
+/* $FreeBSD: src/usr.bin/units/pathnames.h,v 1.3.2.1 1999/08/29 15:34:16 peter Exp $	*/
 
 /*
  * Copyright (c) 1993 Christopher G. Demetriou
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index f1c2de8602e7..1a8c288766f2 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/units/units.1,v 1.7.2.1 1999/08/29 15:34:17 peter Exp $
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
diff --git a/usr.bin/units/units.c b/usr.bin/units/units.c
index 7d1fd785d5b6..0d8354b9991e 100644
--- a/usr.bin/units/units.c
+++ b/usr.bin/units/units.c
@@ -17,7 +17,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/units/units.c,v 1.5.2.1 1999/08/29 15:34:18 peter Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/usr.bin/units/units.lib b/usr.bin/units/units.lib
index 2e62cae7695d..1a60c31345ea 100644
--- a/usr.bin/units/units.lib
+++ b/usr.bin/units/units.lib
@@ -1,4 +1,4 @@
-/ $FreeBSD$
+/ $FreeBSD: src/usr.bin/units/units.lib,v 1.3.2.3 2000/04/18 16:39:26 joerg Exp $
 
 / primitive units
 
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 418b74ec460b..360b8f61cba2 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/unvis/unvis.c,v 1.4.2.1 1999/08/29 15:34:20 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 7acb26836e40..eac59d0b4ce7 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/users/users.c,v 1.4.2.1 1999/08/29 15:34:21 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/uudecode/uudecode.c b/usr.bin/uudecode/uudecode.c
index 247e80212d1e..89035474fbb9 100644
--- a/usr.bin/uudecode/uudecode.c
+++ b/usr.bin/uudecode/uudecode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uudecode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uudecode/uudecode.c,v 1.12.2.1 1999/08/29 15:34:23 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index a01f18b2ff0c..15c3c6ac2941 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$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.1,v 1.7.2.2 2000/03/06 11:35:24 sheldonh Exp $
 .\"
 .Dd June 6, 1993
 .Dt UUENCODE 1
diff --git a/usr.bin/uuencode/uuencode.c b/usr.bin/uuencode/uuencode.c
index e8696e900d0a..febc26ba26ce 100644
--- a/usr.bin/uuencode/uuencode.c
+++ b/usr.bin/uuencode/uuencode.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)uuencode.c	8.2 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/uuencode/uuencode.c,v 1.3.2.1 1999/08/29 15:34:24 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/uuencode/uuencode.format.5 b/usr.bin/uuencode/uuencode.format.5
index d256a0b1b164..003b0c81b514 100644
--- a/usr.bin/uuencode/uuencode.format.5
+++ b/usr.bin/uuencode/uuencode.format.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)uuencode.format.5	8.2 (Berkeley) 1/12/94
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/uuencode/uuencode.format.5,v 1.5.2.1 2000/03/06 11:35:25 sheldonh Exp $
 .\"
 .Dd January 12, 1994
 .Dt UUENCODE 5
diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile
index ee668d894e64..6de17d9d5875 100644
--- a/usr.bin/vacation/Makefile
+++ b/usr.bin/vacation/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vacation/Makefile,v 1.5.2.1 1999/08/29 15:34:25 peter Exp $
 
 PROG=	vacation
 CFLAGS+= -Wall
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index b5db13922d0b..a9461b453116 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$
+.\" $FreeBSD: src/usr.bin/vacation/vacation.1,v 1.6.2.3 2000/03/06 11:35:27 sheldonh Exp $
 .\"
 .Dd June 16, 1993
 .Dt VACATION 1
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c
index 98a2987abd3c..4a06ed0d29f8 100644
--- a/usr.bin/vacation/vacation.c
+++ b/usr.bin/vacation/vacation.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)from: vacation.c	8.2 (Berkeley) 1/26/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vacation/vacation.c,v 1.13.2.2 1999/08/29 15:34:27 peter Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index 09c63380307f..d3b8050f77c9 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vgrind/vfontedpr.c,v 1.11.2.1 1999/08/29 15:34:28 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile
index d2c463e06d2d..f0cbef5babc1 100644
--- a/usr.bin/vi/Makefile
+++ b/usr.bin/vi/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/vi/Makefile,v 1.24.2.1 1999/08/29 15:34:30 peter Exp $
 #
 # This has most of the glue needed to compile tknvi and the perl hooks,
 # but not all.
diff --git a/usr.bin/vis/foldit.c b/usr.bin/vis/foldit.c
index 6cf63f35ac05..af2ac3f3f3ea 100644
--- a/usr.bin/vis/foldit.c
+++ b/usr.bin/vis/foldit.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)foldit.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vis/foldit.c,v 1.3.2.1 1999/08/29 15:34:31 peter Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/usr.bin/vis/vis.c b/usr.bin/vis/vis.c
index 0ff6a21f0a0f..7760c36abe5f 100644
--- a/usr.bin/vis/vis.c
+++ b/usr.bin/vis/vis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vis/vis.c,v 1.5.2.1 1999/08/29 15:34:32 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 7f4b8b9eeaa3..c11d11de3e79 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.10.2.3 2000/03/06 07:38:31 jkoshy Exp $
 .\"
 .Dd June 6, 1996
 .Dt VMSTAT 8
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index 84497c87c145..eb386ba80e1a 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vmstat.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/vmstat/vmstat.c,v 1.29.2.4 2000/03/03 15:32:35 ps Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c
index 4b9614c1af88..a1420aea5668 100644
--- a/usr.bin/w/pr_time.c
+++ b/usr.bin/w/pr_time.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)pr_time.c	8.2 (Berkeley) 4/4/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/w/pr_time.c,v 1.12.2.2 1999/11/15 02:28:54 davidn Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 12f3da808c13..798d954b10fd 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$
+.\" $FreeBSD: src/usr.bin/w/w.1,v 1.10.2.2 1999/10/30 22:15:30 green Exp $
 .\"
 .Dd June 6, 1993
 .Dt W 1
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 6441ee8f8966..d119d66fe24e 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)w.c	8.4 (Berkeley) 4/16/94";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/w/w.c,v 1.32.2.2 1999/10/30 22:15:31 green Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c
index 2b58a1b97eb8..6c693119423a 100644
--- a/usr.bin/wall/ttymsg.c
+++ b/usr.bin/wall/ttymsg.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)ttymsg.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/wall/ttymsg.c,v 1.3.2.1 1999/08/29 15:34:39 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c
index 941211963d7e..a8619a0ba734 100644
--- a/usr.bin/wall/wall.c
+++ b/usr.bin/wall/wall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)wall.c	8.2 (Berkeley) 11/16/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/wall/wall.c,v 1.10.2.2 1999/09/09 23:05:51 dbaker Exp $";
 #endif /* not lint */
 
 /*
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index 86fc751fe7ac..5c02e7953fac 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$
+.\" $FreeBSD: src/usr.bin/wc/wc.1,v 1.5.2.1 1999/08/29 15:34:40 peter Exp $
 .\"
 .Dd April 19, 1994
 .Dt WC 1
diff --git a/usr.bin/wc/wc.c b/usr.bin/wc/wc.c
index 3793a905af2a..1fa5c2bd3134 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$";
+  "$FreeBSD: src/usr.bin/wc/wc.c,v 1.8.2.3 1999/08/29 15:34:41 peter Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index b5fe8bb05c80..c3ffa4b62f99 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$
+.\" $FreeBSD: src/usr.bin/what/what.1,v 1.9.2.1 1999/08/29 15:34:43 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt WHAT 1
diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c
index 5a9bf35018ec..c3a836b20d0a 100644
--- a/usr.bin/what/what.c
+++ b/usr.bin/what/what.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)what.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/what/what.c,v 1.4.2.1 1999/08/29 15:34:44 peter Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index d3ca9866d5ac..10cc33c0614b 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$
+.\" $FreeBSD: src/usr.bin/whereis/whereis.1,v 1.6.2.1 1999/08/29 15:34:45 peter Exp $
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index 7fce8e9fd866..90e803e2651f 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$
+# $FreeBSD: src/usr.bin/whereis/whereis.pl,v 1.6.2.1 1999/08/29 15:34:45 peter Exp $
 #
 
 sub usage
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index a8048ac85179..dabf974792d0 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$
+.\" $FreeBSD: src/usr.bin/which/which.1,v 1.12.2.3 2000/01/14 11:20:04 sheldonh Exp $
 .Dd January 26, 1995
 .Dt WHICH 1
 .Os FreeBSD
diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl
index 781e1c151602..3d046ec96f25 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$
+# $FreeBSD: src/usr.bin/which/which.pl,v 1.13.2.1 1999/08/29 15:34:47 peter Exp $
 
 $all = $silent = $found = 0;
 @path = split(/:/, $ENV{'PATH'});
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 6352eab33d8c..5cd215b20689 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$
+.\" $FreeBSD: src/usr.bin/who/who.1,v 1.6.2.1 1999/08/29 15:34:48 peter Exp $
 .\"
 .Dd December 30, 1993
 .Dt WHO 1
diff --git a/usr.bin/who/who.c b/usr.bin/who/who.c
index 76ecdc2ae94d..0d9eb731b9ec 100644
--- a/usr.bin/who/who.c
+++ b/usr.bin/who/who.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)who.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/who/who.c,v 1.8.2.1 1999/08/29 15:34:49 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile
index 299c963fb1a6..fa6ce6857a44 100644
--- a/usr.bin/whois/Makefile
+++ b/usr.bin/whois/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/whois/Makefile,v 1.2.4.1 1999/12/06 22:05:37 joe Exp $
 
 PROG=	whois
 
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index dc337c9cc076..0fdb23a10529 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)whois.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/whois/whois.1,v 1.4.2.5 2000/03/06 11:35:29 sheldonh Exp $
 .\"
 .Dd November 17, 1999
 .Dt WHOIS 1
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c
index 0ef3d4b5c30f..0b432b153518 100644
--- a/usr.bin/whois/whois.c
+++ b/usr.bin/whois/whois.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)whois.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/whois/whois.c,v 1.6.2.3 1999/12/06 22:05:38 joe Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index 2b9490209418..ed24d2c5060e 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$
+.\" $FreeBSD: src/usr.bin/write/write.1,v 1.6.2.1 1999/08/29 15:34:53 peter Exp $
 .\"
 .Dd June 6, 1993
 .Dt WRITE 1
diff --git a/usr.bin/write/write.c b/usr.bin/write/write.c
index f3827de092f9..d4d5fe554a15 100644
--- a/usr.bin/write/write.c
+++ b/usr.bin/write/write.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)write.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/write/write.c,v 1.10.2.1 1999/08/29 15:34:53 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c
index 2ad94cc90926..3c3e43802095 100644
--- a/usr.bin/xargs/xargs.c
+++ b/usr.bin/xargs/xargs.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xargs.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xargs/xargs.c,v 1.7.2.2 1999/08/29 15:34:54 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 2612f4271d44..dca50b0191dd 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$
+.\" $FreeBSD: src/usr.bin/xinstall/install.1,v 1.13.2.2 2000/03/06 11:35:31 sheldonh Exp $
 .\"
 .Dd September 22, 1996
 .Dt INSTALL 1
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 769d095624c5..3a02c19c2cc5 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "From: @(#)xinstall.c	8.1 (Berkeley) 7/21/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xinstall/xinstall.c,v 1.34.2.1 1999/08/29 15:34:57 peter Exp $";
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile
index fef8dae73801..a74d41398741 100644
--- a/usr.bin/xlint/lint1/Makefile
+++ b/usr.bin/xlint/lint1/Makefile
@@ -1,5 +1,5 @@
 #	$NetBSD: Makefile,v 1.3 1995/07/04 01:53:05 cgd Exp $
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/xlint/lint1/Makefile,v 1.6.2.1 1999/08/29 15:34:59 peter Exp $
 
 PROG=	lint1
 SRCS=	cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
diff --git a/usr.bin/xlint/xlint/lint.1 b/usr.bin/xlint/xlint/lint.1
index 6524f85f8e14..f32d12024cbb 100644
--- a/usr.bin/xlint/xlint/lint.1
+++ b/usr.bin/xlint/xlint/lint.1
@@ -1,5 +1,5 @@
 .\"	$NetBSD: lint.1,v 1.3 1995/10/23 13:45:31 jpo Exp $
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/xlint/xlint/lint.1,v 1.5.2.1 2000/03/06 11:35:33 sheldonh Exp $
 .\"
 .\" Copyright (c) 1994, 1995 Jochen Pohl
 .\" All Rights Reserved.
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 8160bb857630..e84c1fc0d77d 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)xstr.c	8.1 (Berkeley) 6/9/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/xstr/xstr.c,v 1.3.2.1 1999/08/29 15:35:01 peter Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 3a871d989b4e..e4e28fd81a73 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/yacc/Makefile,v 1.7.2.1 1999/08/29 15:35:03 peter Exp $
 
 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 4caf45857640..9f9023745a7e 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$
+ * $FreeBSD: src/usr.bin/yacc/closure.c,v 1.5.2.1 1999/08/29 15:35:03 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/defs.h b/usr.bin/yacc/defs.h
index 46f3efad22d0..e885d84542e5 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$
+ * $FreeBSD: src/usr.bin/yacc/defs.h,v 1.6.2.1 1999/08/29 15:35:04 peter Exp $
  */
 
 #include <sys/cdefs.h>	/* for __P macro */
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 3229f345104c..e4bb92113c25 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/error.c,v 1.6.2.1 1999/08/29 15:35:04 peter Exp $";
 #endif /* not lint */
 
 /* routines for printing error messages  */
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index bd61e489e46b..8459d2bdc15e 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$
+ * $FreeBSD: src/usr.bin/yacc/lalr.c,v 1.6.2.1 1999/08/29 15:35:05 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 07816d2ac114..9515c98cea5d 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$
+ * $FreeBSD: src/usr.bin/yacc/lr0.c,v 1.5.2.1 1999/08/29 15:35:06 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 0a5511fdf568..9087bb57c5c8 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -45,7 +45,7 @@ static char const copyright[] =
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/main.c,v 1.9.2.1 1999/08/29 15:35:06 peter Exp $";
 #endif /* not lint */
 
 #include <signal.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index 2d1147a69f86..203684251b5f 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -39,7 +39,7 @@
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/yacc/mkpar.c,v 1.7.2.1 1999/08/29 15:35:07 peter Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index 255aeea809b2..764d8ca012c9 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$
+ * $FreeBSD: src/usr.bin/yacc/output.c,v 1.10.2.1 1999/08/29 15:35:08 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 48609d5a32a9..2b92b44d59ab 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$
+ * $FreeBSD: src/usr.bin/yacc/reader.c,v 1.6.2.1 1999/08/29 15:35:09 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 266b03042af8..31efb8023b4d 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$
+ * $FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.14.2.1 1999/08/29 15:35:09 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index f155021bb68e..909f00a2d8b9 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$
+ * $FreeBSD: src/usr.bin/yacc/symtab.c,v 1.5.2.1 1999/08/29 15:35:10 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 69ce15e1d271..27558e26b8df 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$
+ * $FreeBSD: src/usr.bin/yacc/verbose.c,v 1.5.2.1 1999/08/29 15:35:10 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 37408c0b3fa9..333c5a227d31 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$
+ * $FreeBSD: src/usr.bin/yacc/warshall.c,v 1.5.2.1 1999/08/29 15:35:11 peter Exp $
  */
 
 #ifndef lint
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 23a3b0d5b4a9..41feb43578cf 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$
+.\" $FreeBSD: src/usr.bin/yacc/yacc.1,v 1.8.2.1 1999/08/29 15:35:11 peter Exp $
 .\"
 .Dd May 24, 1993
 .Dt YACC 1
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 3b50a624e2d8..d7bebb4cdecf 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)yyfix.1	5.4 (Berkeley) 3/23/93
-.\" $FreeBSD$
+.\" $FreeBSD: src/usr.bin/yacc/yyfix.1,v 1.2.2.1 1999/08/29 15:35:12 peter Exp $
 .\"
 .Dd March 23, 1993
 .Dt YYFIX 1
diff --git a/usr.bin/yes/yes.c b/usr.bin/yes/yes.c
index 80641aa3938f..8b607a0eb12b 100644
--- a/usr.bin/yes/yes.c
+++ b/usr.bin/yes/yes.c
@@ -41,7 +41,7 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)yes.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$FreeBSD$";
+static const char rcsid[] = "$FreeBSD: src/usr.bin/yes/yes.c,v 1.1.1.1.10.1 2000/06/08 06:23:55 kris Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile
index 58ee6907f07f..e3e04ed5bc9a 100644
--- a/usr.bin/ypcat/Makefile
+++ b/usr.bin/ypcat/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypcat/Makefile,v 1.3.2.1 1999/08/29 15:35:15 peter Exp $
 
 PROG=	ypcat
 
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 139b2c6e5799..55444fd76a66 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$
+.\" $FreeBSD: src/usr.bin/ypcat/ypcat.1,v 1.7.2.1 1999/08/29 15:35:16 peter Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPCAT 1
diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c
index e90e763a0349..45cd75c5aaf6 100644
--- a/usr.bin/ypcat/ypcat.c
+++ b/usr.bin/ypcat/ypcat.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypcat/ypcat.c,v 1.3.2.1 1999/08/29 15:35:17 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile
index 22e62996937e..0309c4425aac 100644
--- a/usr.bin/ypmatch/Makefile
+++ b/usr.bin/ypmatch/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypmatch/Makefile,v 1.3.2.1 1999/08/29 15:35:18 peter Exp $
 
 PROG=	ypmatch
 
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 6491407e942a..c7ecee27bb49 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$
+.\" $FreeBSD: src/usr.bin/ypmatch/ypmatch.1,v 1.7.2.1 1999/08/29 15:35:18 peter Exp $
 .\"
 .Dd December 3, 1993
 .Dt YPMATCH 1
diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c
index be266bb7e1e0..4b11f220b458 100644
--- a/usr.bin/ypmatch/ypmatch.c
+++ b/usr.bin/ypmatch/ypmatch.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypmatch/ypmatch.c,v 1.6.2.1 1999/08/29 15:35:19 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile
index f28f864ab097..00637e6d16d1 100644
--- a/usr.bin/ypwhich/Makefile
+++ b/usr.bin/ypwhich/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.8 (Berkeley) 7/28/90
-# $FreeBSD$
+# $FreeBSD: src/usr.bin/ypwhich/Makefile,v 1.4.2.1 1999/08/29 15:35:20 peter Exp $
 
 PROG=	ypwhich
 
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 88ca36d759ba..c1556db6b520 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.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$
+.\" $FreeBSD: src/usr.bin/ypwhich/ypwhich.1,v 1.3.2.1 1999/08/29 15:35:21 peter Exp $
 .\"
 .Dd February 23, 1994
 .Dt YPWHICH 1
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 2bc9ff377dd5..5a2f7f53150c 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD$";
+  "$FreeBSD: src/usr.bin/ypwhich/ypwhich.c,v 1.10.2.1 1999/08/29 15:35:22 peter Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>