116 files changed, 116 insertions, 116 deletions

diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index cf1c76758b2e5..20fce35c6e05c 100644
--- a/sbin/adjkerntz/adjkerntz.8
+++ b/sbin/adjkerntz/adjkerntz.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 322f8c40afab6..0b74234fb7bff 100644
--- a/sbin/badsect/badsect.8
+++ b/sbin/badsect/badsect.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)badsect.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8
index eab396d677084..14725f33c8f9f 100644
--- a/sbin/bsdlabel/bsdlabel.8
+++ b/sbin/bsdlabel/bsdlabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd "April 19, 1994"
 .Dt DISKLABEL 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 2de876e793bcb..24fa0a236bd2a 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,4 @@
-/* $Id: ccdconfig.c,v 1.3 1995/12/28 00:22:16 asami Exp $ */
+/* $FreeBSD$ */
 
 /*	$NetBSD: ccdconfig.c,v 1.2.2.1 1995/11/11 02:43:35 thorpej Exp $	*/
 
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 187c79019b789..95420c86419f5 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)clri.8	8.2 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/comcontrol/comcontrol.8 b/sbin/comcontrol/comcontrol.8
index e9d35c611360d..25fd4efdb7457 100644
--- a/sbin/comcontrol/comcontrol.8
+++ b/sbin/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$FreeBSD$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index eab396d677084..14725f33c8f9f 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)disklabel.8	8.2 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd "April 19, 1994"
 .Dt DISKLABEL 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index b68a1d9e4eed2..e23443dffdc8e 100644
--- a/sbin/dmesg/dmesg.c
+++ b/sbin/dmesg/dmesg.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)dmesg.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/dset/dset.8 b/sbin/dset/dset.8
index aeec2edc70c03..92cd9b7b5cfc6 100644
--- a/sbin/dset/dset.8
+++ b/sbin/dset/dset.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.
 .\"
-.\" $Id: dset.8,v 1.3 1996/10/01 14:42:35 jkh Exp $
+.\" $FreeBSD$
 .\" "
 .Dd May 2, 1996
 .Dt DSET 8
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index 11405a876b849..13a69e42f6775 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dump.8	8.1 (Berkeley) 6/16/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 16, 1993
 .Dt DUMP 8
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 7f52246b436fe..cf8135cbd6bca 100644
--- a/sbin/dumpfs/dumpfs.8
+++ b/sbin/dumpfs/dumpfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumpfs.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumplfs/dumplfs.8 b/sbin/dumplfs/dumplfs.8
index 445ff7b966efb..12a7dfa807ff8 100644
--- a/sbin/dumplfs/dumplfs.8
+++ b/sbin/dumplfs/dumplfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dumplfs.8	8.1 (Berkeley) 6/18/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 18, 1993
 .Dt DUMPLFS 8
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index da6f365066792..9bdc92683d75c 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$FreeBSD$
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index 6d050ce22f4bf..5d6e621ed75b7 100644
--- a/sbin/dumpon/dumpon.8
+++ b/sbin/dumpon/dumpon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: dumpon.8,v 1.2 1996/02/12 01:20:09 mpp Exp $
+.\"	$FreeBSD$
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index dc185e9be6ae2..31a46fd97c44a 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)swapon.c	8.1 (Berkeley) 6/5/93";*/
 static const char rcsid[] =
-	"$Id: dumpon.c,v 1.1 1995/05/12 19:10:09 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index db91f329c571d..369454e58bdf2 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$Id$
+.|'	$FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index db91f329c571d..369454e58bdf2 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$Id$
+.|'	$FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsck_ifs/fsck_ifs.8 b/sbin/fsck_ifs/fsck_ifs.8
index db91f329c571d..369454e58bdf2 100644
--- a/sbin/fsck_ifs/fsck_ifs.8
+++ b/sbin/fsck_ifs/fsck_ifs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsck.8	8.2 (Berkeley) 12/11/93
-.|'	$Id$
+.|'	$FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 5fa4d665c23be..8b2fb8f60cd36 100644
--- a/sbin/fsdb/Makefile
+++ b/sbin/fsdb/Makefile
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id$
+#	$FreeBSD$
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 046fc46883e65..08b599fcfa8e3 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -26,7 +26,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index f2d418a854734..7501cc494554e 100644
--- a/sbin/i386/Makefile
+++ b/sbin/i386/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1994/12/02 23:53:23 wollman Exp $
+#	$FreeBSD$
 
 SUBDIR=	comcontrol fdisk ft mount_msdos nextboot
 #NOTYET: cxconfig
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index c961f85683079..c38435529c41a 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+#	$FreeBSD$
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/comcontrol/comcontrol.8 b/sbin/i386/comcontrol/comcontrol.8
index e9d35c611360d..25fd4efdb7457 100644
--- a/sbin/i386/comcontrol/comcontrol.8
+++ b/sbin/i386/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$FreeBSD$
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile
index 1cc600b798479..90b8cb59cdf26 100644
--- a/sbin/i386/ft/Makefile
+++ b/sbin/i386/ft/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.4 1995/08/29 14:04:39 ache Exp $
+#	$FreeBSD$
 
 PROG=	ft
 MAN8=	ft.8
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index 19ec0ac78ebdd..57610ab81b8d5 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.1 1994/09/19 15:30:33 dfr Exp $
+#	$FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index d6bd154a94014..77664eb865eef 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.8
@@ -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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.2 1994/11/19 17:55:35 nate Exp $
+.\"	$FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c
index c90d51b311aa0..b752448074396 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 089debd204128..3f998c7964396 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: nextboot.8,v 1.3 1996/09/23 22:23:15 wosch Exp $
+.\"	$FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 28fdd26ffe2db..ad038caf2d448 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id$
+#	$FreeBSD$
 
 PROG=	ifconfig
 MAN8=	ifconfig.8
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 83cf193b194ed..3cc62421a88c3 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)ifconfig.8	8.3 (Berkeley) 1/5/94
-.\"	$Id: ifconfig.8,v 1.9 1996/09/04 20:21:47 julian Exp $
+.\"	$FreeBSD$
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 0a1bc90da0818..116dcd15a1f83 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ifconfig.c	8.2 (Berkeley) 2/16/94";
 */
 static const char rcsid[] =
-	"$Id: ifconfig.c,v 1.21 1996/12/10 17:07:17 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 285240b9454c6..eb5a35659c387 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.7 1996/05/04 08:16:20 markm Exp $
+#	$FreeBSD$
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 9e16c3cd2a0d1..98ebc17fa9ff9 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)init.8	8.3 (Berkeley) 4/18/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 7487b21dbd8d4..f1bb15a45c778 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -16,7 +16,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $Id: ipfw.c,v 1.34 1996/10/17 01:05:03 alex Exp $
+ * $FreeBSD$
  *
  */
 
diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile
index 1dfb159514ae7..246727049a0e6 100644
--- a/sbin/ldconfig/Makefile
+++ b/sbin/ldconfig/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1994/04/13 20:49:42 ats Exp $
+#	$FreeBSD$
 
 PROG=	ldconfig
 SRCS=	ldconfig.c shlib.c support.c
diff --git a/sbin/ldconfig/ldconfig.8 b/sbin/ldconfig/ldconfig.8
index 652ebf9b79e44..b05a011a1f57b 100644
--- a/sbin/ldconfig/ldconfig.8
+++ b/sbin/ldconfig/ldconfig.8
@@ -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.
 .\"
-.\"	$Id: ldconfig.8,v 1.9 1996/10/10 23:14:22 jdp Exp $
+.\"	$FreeBSD$
 .\"
 .Dd October 3, 1993
 .Dt LDCONFIG 8
diff --git a/sbin/ldconfig/ldconfig.c b/sbin/ldconfig/ldconfig.c
index 1189d6d13fc1b..e1f6de4497803 100644
--- a/sbin/ldconfig/ldconfig.c
+++ b/sbin/ldconfig/ldconfig.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.
  *
- *	$Id: ldconfig.c,v 1.15 1996/10/10 23:14:23 jdp Exp $
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index e3e598612d27e..1d776902554ea 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -1,5 +1,5 @@
 /*
- * $Id: md5.c,v 1.6 1995/07/12 09:14:46 phk Exp $
+ * $FreeBSD$
  *
  * Derived from:
  */
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index a3050ebec65ab..e5b02c4ed886e 100644
--- a/sbin/mknod/mknod.c
+++ b/sbin/mknod/mknod.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)mknod.c	8.1 (Berkeley) 6/5/93";
 #else
 static const char rcsid[] =
-    "$Id$";
+    "$FreeBSD$";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile
index 265869fbaa6a5..d55588d18f39b 100644
--- a/sbin/modload/Makefile
+++ b/sbin/modload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: Makefile,v 1.4 1994/02/09 15:00:32 deraadt Exp $
+#	$FreeBSD$
 #
 
 PROG=	modload
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index c0338cdb34423..80e11fdf9e6d2 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.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.
 .\"
-.\"	$Id: modload.8,v 1.7 1995/10/28 17:06:02 peter Exp $
+.\"	$FreeBSD$
 .\"
 .Dd September 22, 1994
 .Dt MODLOAD 8
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index 71dffc3a3d951..d2aac78320a6d 100644
--- a/sbin/modload/modload.c
+++ b/sbin/modload/modload.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: modload.c,v 1.13 1996/08/13 00:50:59 pst Exp $
+ *	$FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/modload/pathnames.h b/sbin/modload/pathnames.h
index 4359013dd9f39..d4e33f03dcdb8 100644
--- a/sbin/modload/pathnames.h
+++ b/sbin/modload/pathnames.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $FreeBSD$ */
 #include <paths.h>
 
 #define	_PATH_LKM	"/dev/lkm"
diff --git a/sbin/modunload/Makefile b/sbin/modunload/Makefile
index 3520c48d2f836..f3322708d07fa 100644
--- a/sbin/modunload/Makefile
+++ b/sbin/modunload/Makefile
@@ -33,7 +33,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-#	$Id: Makefile,v 1.4 1994/02/09 15:00:35 deraadt Exp $
+#	$FreeBSD$
 #
 
 PROG=	modunload
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index cfeac8ebae364..c62c64409c253 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.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.
 .\"
-.\"	$Id: modunload.8,v 1.4 1995/10/26 21:44:11 torstenb Exp $
+.\"	$FreeBSD$
 .\"
 .Dd June 7, 1993
 .Dt MODUNLOAD 8
diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c
index b4593b3cf22a2..ebfb7b47e9a6f 100644
--- a/sbin/modunload/modunload.c
+++ b/sbin/modunload/modunload.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: modunload.c,v 1.1 1994/08/19 12:07:21 davidg Exp $
+ *	$FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index 38a044de01fcf..e05c8b2dc10a9 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
-.\"	$Id: mount.8,v 1.11 1996/09/08 13:28:12 davidg Exp $
+.\"	$FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 463b6601a5a5b..0e1c4388de5d7 100644
--- a/sbin/mount_cd9660/mount_cd9660.c
+++ b/sbin/mount_cd9660/mount_cd9660.c
@@ -49,7 +49,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_cd9660.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id$";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 91d96fd86a8e6..fc99417a09842 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_ext2fs.c,v 1.3 1996/07/23 19:29:27 peter Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_ifs/mount.8 b/sbin/mount_ifs/mount.8
index 38a044de01fcf..e05c8b2dc10a9 100644
--- a/sbin/mount_ifs/mount.8
+++ b/sbin/mount_ifs/mount.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.7 (Berkeley) 3/27/94
-.\"	$Id: mount.8,v 1.11 1996/09/08 13:28:12 davidg Exp $
+.\"	$FreeBSD$
 .\"
 .Dd March 27, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_lfs/mount_lfs.c b/sbin/mount_lfs/mount_lfs.c
index 67c1b31e2de6f..51d25624edebf 100644
--- a/sbin/mount_lfs/mount_lfs.c
+++ b/sbin/mount_lfs/mount_lfs.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_lfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_lfs.c,v 1.4 1996/05/13 17:43:05 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile
index 19ec0ac78ebdd..57610ab81b8d5 100644
--- a/sbin/mount_msdos/Makefile
+++ b/sbin/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.1 1994/09/19 15:30:33 dfr Exp $
+#	$FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index d6bd154a94014..77664eb865eef 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.2 1994/11/19 17:55:35 nate Exp $
+.\"	$FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c
index c90d51b311aa0..b752448074396 100644
--- a/sbin/mount_msdos/mount_msdos.c
+++ b/sbin/mount_msdos/mount_msdos.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile
index 19ec0ac78ebdd..57610ab81b8d5 100644
--- a/sbin/mount_msdosfs/Makefile
+++ b/sbin/mount_msdosfs/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.1 1994/09/19 15:30:33 dfr Exp $
+#	$FreeBSD$
 #
 
 PROG=	mount_msdos
diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8
index d6bd154a94014..77664eb865eef 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.8
+++ b/sbin/mount_msdosfs/mount_msdosfs.8
@@ -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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.2 1994/11/19 17:55:35 nate Exp $
+.\"	$FreeBSD$
 .\"
 .Dd April 7, 1994
 .Dt MOUNT_MSDOS 8
diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c
index c90d51b311aa0..b752448074396 100644
--- a/sbin/mount_msdosfs/mount_msdosfs.c
+++ b/sbin/mount_msdosfs/mount_msdosfs.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.4 1996/05/13 17:56:34 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 5048d4af2729e..6b233145027d0 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)mount_nfs.8	8.2 (Berkeley) 3/27/94
 .\"
-.\" $Id$
+.\" $FreeBSD$
 .\""
 .Dd March 27, 1994
 .Dt MOUNT_NFS 8
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 659e26b43ba57..cbcb9ba334f8f 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -45,7 +45,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)mount_nfs.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_nfs.c,v 1.13 1996/05/13 17:43:06 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 1a47b27d9d652..6d6d2e60526f2 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.4 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c
index e78c3fc8ea3c8..179e8787dbc6d 100644
--- a/sbin/mount_null/mount_null.c
+++ b/sbin/mount_null/mount_null.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_null.c,v 1.4 1996/05/13 17:43:08 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 1a47b27d9d652..6d6d2e60526f2 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount_null.8	8.4 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt MOUNT_NULL 8
diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c
index e78c3fc8ea3c8..179e8787dbc6d 100644
--- a/sbin/mount_nullfs/mount_nullfs.c
+++ b/sbin/mount_nullfs/mount_nullfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_null.c	8.5 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_null.c,v 1.4 1996/05/13 17:43:08 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 85eca128f4dbd..1218514c77d77 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id$
+#	$FreeBSD$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portal/activate.c b/sbin/mount_portal/activate.c
index 33617988f7dfb..7de746a62660b 100644
--- a/sbin/mount_portal/activate.c
+++ b/sbin/mount_portal/activate.c
@@ -36,7 +36,7 @@
  *
  *	@(#)activate.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: activate.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index 3eb4af3c748b3..5400baf0e87b4 100644
--- a/sbin/mount_portal/conf.c
+++ b/sbin/mount_portal/conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: conf.c,v 1.2 1995/02/21 04:05:20 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 1608e22b00e16..e396370fd895a 100644
--- a/sbin/mount_portal/mount_portal.c
+++ b/sbin/mount_portal/mount_portal.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.6 1996/05/13 17:43:09 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 25321145d9901..6b557704e38fa 100644
--- a/sbin/mount_portal/pathnames.h
+++ b/sbin/mount_portal/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: pathnames.h,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 5b5a773eaa3cf..53a07a92231c5 100644
--- a/sbin/mount_portal/portal.conf
+++ b/sbin/mount_portal/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $Id: portal.conf,v 1.1 1992/05/27 06:50:13 jsp Exp jsp $
+# $FreeBSD$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index fbe111b1a7ad9..61f1b96b4daea 100644
--- a/sbin/mount_portal/portald.h
+++ b/sbin/mount_portal/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: portald.h,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index d1eba94ea3fe9..dc98fbf5a5b77 100644
--- a/sbin/mount_portal/pt_conf.c
+++ b/sbin/mount_portal/pt_conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  *
- * $Id: pt_conf.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 06e3382da85b4..df50dc19fb334 100644
--- a/sbin/mount_portal/pt_exec.c
+++ b/sbin/mount_portal/pt_exec.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  *
- * $Id: pt_exec.c,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index a9cd2ca3ea20b..f1189d1cc1085 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_file.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: pt_file.c,v 1.2 1994/09/19 13:52:38 ache Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 11f1453cefb8e..d2001c83556ef 100644
--- a/sbin/mount_portal/pt_tcp.c
+++ b/sbin/mount_portal/pt_tcp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_tcp.c	8.3 (Berkeley) 3/27/94
  *
- * $Id: pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/Makefile b/sbin/mount_portalfs/Makefile
index 85eca128f4dbd..1218514c77d77 100644
--- a/sbin/mount_portalfs/Makefile
+++ b/sbin/mount_portalfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id$
+#	$FreeBSD$
 
 PROG=	mount_portal
 SRCS=	mount_portal.c activate.c conf.c getmntopts.c pt_conf.c \
diff --git a/sbin/mount_portalfs/activate.c b/sbin/mount_portalfs/activate.c
index 33617988f7dfb..7de746a62660b 100644
--- a/sbin/mount_portalfs/activate.c
+++ b/sbin/mount_portalfs/activate.c
@@ -36,7 +36,7 @@
  *
  *	@(#)activate.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: activate.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/conf.c b/sbin/mount_portalfs/conf.c
index 3eb4af3c748b3..5400baf0e87b4 100644
--- a/sbin/mount_portalfs/conf.c
+++ b/sbin/mount_portalfs/conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)conf.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: conf.c,v 1.2 1995/02/21 04:05:20 wollman Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/mount_portalfs.c b/sbin/mount_portalfs/mount_portalfs.c
index 1608e22b00e16..e396370fd895a 100644
--- a/sbin/mount_portalfs/mount_portalfs.c
+++ b/sbin/mount_portalfs/mount_portalfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_portal.c	8.4 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_portal.c,v 1.6 1996/05/13 17:43:09 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portalfs/pathnames.h b/sbin/mount_portalfs/pathnames.h
index 25321145d9901..6b557704e38fa 100644
--- a/sbin/mount_portalfs/pathnames.h
+++ b/sbin/mount_portalfs/pathnames.h
@@ -36,7 +36,7 @@
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: pathnames.h,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portalfs/portal.conf b/sbin/mount_portalfs/portal.conf
index 5b5a773eaa3cf..53a07a92231c5 100644
--- a/sbin/mount_portalfs/portal.conf
+++ b/sbin/mount_portalfs/portal.conf
@@ -1,5 +1,5 @@
 # @(#)portal.conf	8.1 (Berkeley) 6/5/93
-# $Id: portal.conf,v 1.1 1992/05/27 06:50:13 jsp Exp jsp $
+# $FreeBSD$
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portalfs/portald.h b/sbin/mount_portalfs/portald.h
index fbe111b1a7ad9..61f1b96b4daea 100644
--- a/sbin/mount_portalfs/portald.h
+++ b/sbin/mount_portalfs/portald.h
@@ -36,7 +36,7 @@
  *
  *	@(#)portald.h	8.1 (Berkeley) 6/5/93
  *
- * $Id: portald.h,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portalfs/pt_conf.c b/sbin/mount_portalfs/pt_conf.c
index d1eba94ea3fe9..dc98fbf5a5b77 100644
--- a/sbin/mount_portalfs/pt_conf.c
+++ b/sbin/mount_portalfs/pt_conf.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_conf.c	8.1 (Berkeley) 6/5/93
  *
- * $Id: pt_conf.c,v 1.2 1992/05/27 07:09:27 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portalfs/pt_exec.c b/sbin/mount_portalfs/pt_exec.c
index 06e3382da85b4..df50dc19fb334 100644
--- a/sbin/mount_portalfs/pt_exec.c
+++ b/sbin/mount_portalfs/pt_exec.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_exec.c	8.1 (Berkeley) 6/5/93
  *
- * $Id: pt_exec.c,v 1.1 1992/05/25 21:43:09 jsp Exp jsp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/pt_file.c b/sbin/mount_portalfs/pt_file.c
index a9cd2ca3ea20b..f1189d1cc1085 100644
--- a/sbin/mount_portalfs/pt_file.c
+++ b/sbin/mount_portalfs/pt_file.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_file.c	8.2 (Berkeley) 3/27/94
  *
- * $Id: pt_file.c,v 1.2 1994/09/19 13:52:38 ache Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portalfs/pt_tcp.c b/sbin/mount_portalfs/pt_tcp.c
index 11f1453cefb8e..d2001c83556ef 100644
--- a/sbin/mount_portalfs/pt_tcp.c
+++ b/sbin/mount_portalfs/pt_tcp.c
@@ -36,7 +36,7 @@
  *
  *	@(#)pt_tcp.c	8.3 (Berkeley) 3/27/94
  *
- * $Id: pt_tcp.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp $
+ * $FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index 9f3ab7ac6de63..66cad4fc8c5a8 100644
--- a/sbin/mount_std/mount_std.8
+++ b/sbin/mount_std/mount_std.8
@@ -34,7 +34,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: mount_std.8,v 1.4 1996/12/14 22:58:37 mpp Exp $
+.\"	$FreeBSD$
 .\"
 .Dd May 13, 1996
 .Dt MOUNT_STD 8
diff --git a/sbin/mount_std/mount_std.c b/sbin/mount_std/mount_std.c
index afe035491fc0f..6a542d49a635c 100644
--- a/sbin/mount_std/mount_std.c
+++ b/sbin/mount_std/mount_std.c
@@ -43,7 +43,7 @@ char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_std.c,v 1.2 1996/05/14 15:16:49 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index 0542ab33c45b7..9c5cb94dacb07 100644
--- a/sbin/mount_umap/mount_umap.c
+++ b/sbin/mount_umap/mount_umap.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_umap.c,v 1.6 1996/05/13 17:43:18 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umapfs/mount_umapfs.c b/sbin/mount_umapfs/mount_umapfs.c
index 0542ab33c45b7..9c5cb94dacb07 100644
--- a/sbin/mount_umapfs/mount_umapfs.c
+++ b/sbin/mount_umapfs/mount_umapfs.c
@@ -45,7 +45,7 @@ char copyright[] =
 static char sccsid[] = "@(#)mount_umap.c	8.3 (Berkeley) 3/27/94";
 */
 static const char rcsid[] =
-	"$Id: mount_umap.c,v 1.6 1996/05/13 17:43:18 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index f32e11b895eb0..0096b0a11e1bf 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id$
+#	$FreeBSD$
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 536cf36de2c7e..f4425ba67efaf 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)mountd.8	8.1 (Berkeley) 6/9/93
-.\"	$Id: mountd.8,v 1.4 1995/06/27 11:06:18 dfr Exp $
+.\"	$FreeBSD$
 .\"
 .Dd September 22, 1994
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index cb331865879cb..7411228d0e012 100644
--- a/sbin/mountd/mountd.c
+++ b/sbin/mountd/mountd.c
@@ -43,7 +43,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)mountd.c	8.8 (Berkeley) 2/20/94";*/
 static const char rcsid[] =
-	"$Id: mountd.c,v 1.10 1995/11/17 23:22:34 joerg Exp $";
+	"$FreeBSD$";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/newlfs/newlfs.8 b/sbin/newlfs/newlfs.8
index 63abcbe65736c..8e4498327eb80 100644
--- a/sbin/newlfs/newlfs.8
+++ b/sbin/newlfs/newlfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newlfs.8	8.1 (Berkeley) 6/19/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 19, 1993
 .Dt NEWLFS 8
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index 089debd204128..3f998c7964396 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: nextboot.8,v 1.3 1996/09/23 22:23:15 wosch Exp $
+.\"	$FreeBSD$
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index 51249e1bd50c7..d82eecbc71bf9 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsiod.8	8.2 (Berkeley) 2/22/94
-.\"	$Id: nfsiod.8,v 1.2 1994/09/22 22:16:59 wollman Exp $
+.\"	$FreeBSD$
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 0b8f673e9c399..538a0450da489 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ping.8	8.2 (Berkeley) 12/11/93
-.\"	$Id: ping.8,v 1.3 1996/10/05 22:27:04 wosch Exp $
+.\"	$FreeBSD$
 .\"
 .Dd December 11, 1993
 .Dt PING 8
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index bfdb00f1d4fc0..fbf64d579281b 100644
--- a/sbin/reboot/boot_i386.8
+++ b/sbin/reboot/boot_i386.8
@@ -36,7 +36,7 @@
 .\"
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
-.\" $Id: boot_i386.8,v 1.4 1996/01/29 23:52:33 mpp Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 33763d4b3757a..13a5583f0034f 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\" "
 .Dd December 11, 1993
 .Dt RESTORE 8
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 8a3596f4841b8..121c5bb7c558f 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
-.|'	$Id$
+.|'	$FreeBSD$
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 9aad6ffe43c75..66cbfae097dc9 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -43,7 +43,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 */
 static const char rcsid[] =
-	"$Id: route.c,v 1.18 1996/12/10 17:07:30 wollman Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 4d6ea8feede0c..785ad378d893c 100644
--- a/sbin/routed/Makefile
+++ b/sbin/routed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/19/93
-#	$Id: Makefile,v 1.2 1996/09/16 17:03:27 wollman Exp $
+#	$FreeBSD$
 
 PROG=	routed
 SRCS=	if.c input.c main.c output.c parms.c radix.c rdisc.c table.c \
diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h
index 29484ffba6c5a..74c02f151dc71 100644
--- a/sbin/routed/defs.h
+++ b/sbin/routed/defs.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)defs.h	8.1 (Berkeley) 6/5/93
- *	$Id: defs.h,v 1.6 1996/12/17 21:11:51 wollman Exp $
+ *	$FreeBSD$
  */
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index 0219a207a3de7..e7a17e9eff122 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)routed.8	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index e69c3e7776640..d1349dcf3e174 100644
--- a/sbin/routed/rtquery/Makefile
+++ b/sbin/routed/rtquery/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.2 1996/09/16 17:04:22 wollman Exp $
+#	$FreeBSD$
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 38b389ea819f0..c6c7d899a813c 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$FreeBSD$
 .Dd June 1, 1996
 .Dt RTQUERY 8
 .Os BSD 4.4
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 5a613c9f7e0e1..7e4a7ce605e63 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)savecore.8	8.1 (Berkeley) 6/5/93
-.\"	$Id: savecore.8,v 1.3 1994/09/24 00:08:21 wollman Exp $
+.\"	$FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index a36b533468664..5704f17c2aae2 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -39,7 +39,7 @@
 .\" SUCH DAMAGE.
 .\" 
 .\"
-.\"	$Id: scsi.8,v 1.6 1996/08/23 00:56:43 mpp Exp $
+.\"	$FreeBSD$
 .\"
 .Dd October 11, 1993
 .Dt SCSI 8
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index eb399a1d1c173..c8f1079b5ff0e 100644
--- a/sbin/scsi/scsi.c
+++ b/sbin/scsi/scsi.c
@@ -39,7 +39,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $
+ *	$FreeBSD$
  */
 
 #include <stdio.h>
diff --git a/sbin/scsiformat/scsiformat.8 b/sbin/scsiformat/scsiformat.8
index d0f18c150ab41..8f13b0ef0268d 100644
--- a/sbin/scsiformat/scsiformat.8
+++ b/sbin/scsiformat/scsiformat.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)scsiformat.8	5.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt SCSIFORMAT 8
diff --git a/sbin/scsiformat/scsiformat.sh b/sbin/scsiformat/scsiformat.sh
index 9d2c13293a1e5..dede9883cd4a3 100644
--- a/sbin/scsiformat/scsiformat.sh
+++ b/sbin/scsiformat/scsiformat.sh
@@ -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.
 # 
-# $Id: scsiformat.sh,v 1.1 1995/09/17 12:47:01 joerg Exp $
+# $FreeBSD$
 #
 # scsiformat [-qw] [-p page-control] raw-device-name
 #
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index dcbdcd27a8a62..34156bfc73d68 100644
--- a/sbin/slattach/slattach.c
+++ b/sbin/slattach/slattach.c
@@ -42,7 +42,7 @@ static char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)slattach.c	4.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: slattach.c,v 1.22 1996/12/10 21:25:42 wollman Exp $";
+static char rcsid[] = "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index 7b39ca7936da2..66655b19d1d4b 100644
--- a/sbin/startslip/startslip.1
+++ b/sbin/startslip/startslip.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)startslip.1	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index feb0f908e2c81..60c2544c0d6d4 100644
--- a/sbin/startslip/startslip.c
+++ b/sbin/startslip/startslip.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: startslip.c,v 1.19 1996/12/10 17:07:48 wollman Exp $
+ * $FreeBSD$
  */
 
 #ifndef lint
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 979f77aca46d9..6beffe6d5ca19 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$FreeBSD$
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index 3c20dd81db420..fe61d94ebbdf8 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)sysctl.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: sysctl.8,v 1.9 1996/08/23 00:56:57 mpp Exp $
+.\"	$FreeBSD$
 .\"
 .Dd September 23, 1994
 .Dt SYSCTL 8
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 373d42e36640b..deff4510b2ead 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -40,7 +40,7 @@ static char copyright[] =
 #ifndef lint
 /*static char sccsid[] = "From: @(#)sysctl.c	8.1 (Berkeley) 6/6/93"; */
 static const char rcsid[] =
-	"$Id: sysctl.c,v 1.9 1995/12/21 12:39:25 phk Exp $";
+	"$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>