release/2.2.8_cvs

138 files changed, 139 insertions, 139 deletions

diff --git a/sbin/adjkerntz/adjkerntz.8 b/sbin/adjkerntz/adjkerntz.8
index beb9a6204486..5e93c1500683 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: adjkerntz.8,v 1.10.2.1 1997/03/03 07:01:06 mpp Exp $
+.\"	$Id: adjkerntz.8,v 1.10.2.2 1998/07/17 20:12:55 jkh Exp $
 .\"
 .Dd April 4, 1996
 .Dt ADJKERNTZ 8
diff --git a/sbin/adjkerntz/adjkerntz.c b/sbin/adjkerntz/adjkerntz.c
index 7082123975b0..3d1d2dc92300 100644
--- a/sbin/adjkerntz/adjkerntz.c
+++ b/sbin/adjkerntz/adjkerntz.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *		$Id: adjkerntz.c,v 1.18.2.3 1998/02/25 09:43:47 ache Exp $
+ *		$Id: adjkerntz.c,v 1.18.2.4 1998/07/17 20:12:55 jkh Exp $
  */
 
 #ifndef lint
diff --git a/sbin/badsect/badsect.8 b/sbin/badsect/badsect.8
index 0322ff2b3d05..7c7c97440dec 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: badsect.8,v 1.1.1.1.8.3 1997/10/15 17:36:09 max Exp $
+.\"	$Id: badsect.8,v 1.1.1.1.8.4 1998/07/17 20:12:56 jkh Exp $
 .\"
 .Dd June 5, 1993
 .Dt BADSECT 8
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 704f92c42e8c..f1c1894e9704 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static const char sccsid[] = "@(#)badsect.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: badsect.c,v 1.4.2.1 1998/07/17 20:12:57 jkh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index 16974e3b505c..b4e0c37b6a92 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: ccdconfig.8,v 1.4.2.1 1998/07/17 20:12:57 jkh Exp $
 .\"
 .Dd July 17, 1995
 .Dt CCDCONFIG 8
diff --git a/sbin/ccdconfig/ccdconfig.c b/sbin/ccdconfig/ccdconfig.c
index 856750686d62..94ab1e927d80 100644
--- a/sbin/ccdconfig/ccdconfig.c
+++ b/sbin/ccdconfig/ccdconfig.c
@@ -1,4 +1,4 @@
-/* $Id: ccdconfig.c,v 1.4.4.1 1997/06/11 06:58:39 charnier Exp $ */
+/* $Id: ccdconfig.c,v 1.4.4.2 1997/12/30 05:15:13 imp Exp $ */
 
 /*	$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 937ed35f8378..1e03cb7f974a 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: clri.8,v 1.2.2.1 1997/03/03 07:01:14 mpp Exp $
+.\"	$Id: clri.8,v 1.2.2.2 1998/07/17 20:12:58 jkh Exp $
 .\"
 .Dd April 19, 1994
 .Dt CLRI 8
diff --git a/sbin/clri/clri.c b/sbin/clri/clri.c
index 87622b0251a0..593435f5e6c8 100644
--- a/sbin/clri/clri.c
+++ b/sbin/clri/clri.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)clri.c	8.2 (Berkeley) 9/23/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: clri.c,v 1.1.1.1.8.2 1998/07/17 20:12:58 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 8090bdc5d53d..a5c51af03f51 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)disklabel.5.5	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$Id: disklabel.5,v 1.2.2.2 1998/07/17 20:12:59 jkh Exp $
 .\"
 .Dd June 5, 1993
 .Dt DISKLABEL 5
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 1a6fe7655740..69a92c32624f 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: disklabel.8,v 1.3.2.2 1997/08/25 21:28:37 jkh Exp $
+.\"	$Id: disklabel.8,v 1.3.2.3 1998/07/17 20:12:59 jkh Exp $
 .\"
 .Dd April 19, 1994
 .Dt DISKLABEL 8
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 4f5dfabf6847..aeceb38ecd85 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *		$Id: disklabel.c,v 1.9.2.3 1997/08/25 21:28:37 jkh Exp $
+ *		$Id: disklabel.c,v 1.9.2.4 1998/07/17 20:13:00 jkh Exp $
  */
 
 #ifndef lint
diff --git a/sbin/disklabel/dkcksum.c b/sbin/disklabel/dkcksum.c
index 78489e5627f0..bc616fc1f429 100644
--- a/sbin/disklabel/dkcksum.c
+++ b/sbin/disklabel/dkcksum.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *		$Id$
+ *		$Id: dkcksum.c,v 1.1.1.1.8.1 1997/06/11 07:02:17 charnier Exp $
  */
 
 #ifndef lint
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index af9da8328867..2142568998d1 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dmesg.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$Id: dmesg.8,v 1.3.2.1 1998/07/17 20:13:02 jkh Exp $
 .\"
 .Dd June 5, 1993
 .Dt DMESG 8
diff --git a/sbin/dmesg/dmesg.c b/sbin/dmesg/dmesg.c
index d7f97138ad89..f213fb247534 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: dmesg.c,v 1.4.2.2 1998/06/25 00:45:59 jkh Exp $";
+	"$Id: dmesg.c,v 1.4.2.3 1998/07/28 18:14:23 hoek Exp $";
 #endif /* not lint */
 
 #include <sys/msgbuf.h>
diff --git a/sbin/dset/dset.8 b/sbin/dset/dset.8
index 9f69b0798405..965172564127 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.4 1996/10/02 07:22:26 jkh Exp $
+.\" $Id: dset.8,v 1.4.2.1 1998/06/03 04:35:19 jkoshy Exp $
 .\" "
 .Dd May 2, 1996
 .Dt DSET 8
diff --git a/sbin/dset/dset.c b/sbin/dset/dset.c
index f3eecbd3b783..52a430effc9a 100644
--- a/sbin/dset/dset.c
+++ b/sbin/dset/dset.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: dset.c,v 1.7.2.5 1998/07/17 20:13:03 jkh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index b048ce18845d..ec8db2f8b68b 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: dump.8,v 1.5.2.8 1998/05/10 16:36:47 steve Exp $
+.\"	$Id: dump.8,v 1.5.2.9 1998/07/17 20:13:04 jkh Exp $
 .\"
 .Dd June 16, 1993
 .Dt DUMP 8
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index d2cffe2fe505..6939794c66f8 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dumprmt.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: dumprmt.c,v 1.6.2.6 1998/07/17 20:13:05 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/itime.c b/sbin/dump/itime.c
index 483533eb7f82..d45053bbf1a9 100644
--- a/sbin/dump/itime.c
+++ b/sbin/dump/itime.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)itime.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: itime.c,v 1.1.1.1.8.1 1998/07/17 20:13:05 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index b85b383c97f7..4e442c47f12f 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *		$Id: main.c,v 1.7.2.6 1997/10/15 18:30:35 markm Exp $
+ *		$Id: main.c,v 1.7.2.7 1998/07/17 20:13:05 jkh Exp $
  */
 
 #ifndef lint
diff --git a/sbin/dumpfs/dumpfs.8 b/sbin/dumpfs/dumpfs.8
index 55f637bec178..af4ec8ed1967 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: dumpfs.8,v 1.4 1997/02/22 14:32:17 peter Exp $
+.\"	$Id: dumpfs.8,v 1.1.1.1.8.1 1997/03/03 07:01:21 mpp Exp $
 .\"
 .Dd June 5, 1993
 .Dt DUMPFS 8
diff --git a/sbin/dumpfs/dumpfs.c b/sbin/dumpfs/dumpfs.c
index 3aaea24deda3..0d2ed19c7da0 100644
--- a/sbin/dumpfs/dumpfs.c
+++ b/sbin/dumpfs/dumpfs.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)dumpfs.c	8.5 (Berkeley) 4/29/95";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: dumpfs.c,v 1.5.2.3 1998/07/17 20:13:07 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile
index da6f36506679..32359f8ac2c8 100644
--- a/sbin/dumpon/Makefile
+++ b/sbin/dumpon/Makefile
@@ -1,4 +1,4 @@
-#	$Id$
+#	$Id: Makefile,v 1.1 1995/05/12 19:10:08 wollman Exp $
 
 PROG=	dumpon
 MAN8=	dumpon.8
diff --git a/sbin/dumpon/dumpon.8 b/sbin/dumpon/dumpon.8
index c35925f31a77..e3e58f90a40b 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.3.2.2 1998/05/31 05:56:11 thepish Exp $
+.\"	$Id: dumpon.8,v 1.3.2.3 1998/07/17 20:13:09 jkh Exp $
 .\"
 .Dd May 12, 1995
 .Dt DUMPON 8
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index 5b4cd5b6543a..ca2c10574c66 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.2.6.1 1997/08/26 13:15:01 jkh Exp $";
+	"$Id: dumpon.c,v 1.2.6.2 1998/07/17 20:13:10 jkh Exp $";
 #endif /* not lint */
 
 #include <errno.h>
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index f61e9a96a9d5..41bce5d97be2 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: fsck.8,v 1.8 1997/02/22 14:32:23 peter Exp $
+.|'	$Id: fsck.8,v 1.5.2.1 1997/03/03 07:01:23 mpp Exp $
 .\"
 .Dd December 11, 1993
 .Dt FSCK 8
diff --git a/sbin/fsdb/Makefile b/sbin/fsdb/Makefile
index 5fa4d665c23b..b551bdfa0b45 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$
+#	$Id: Makefile,v 1.4 1996/09/02 23:40:08 peter Exp $
 
 PROG=	fsdb
 MAN8=	fsdb.8
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index 1b839d7ced74..569a056a1314 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: fsdb.8,v 1.3.2.1 1997/03/03 07:01:25 mpp Exp $
+.\"	$Id: fsdb.8,v 1.3.2.2 1998/08/12 06:15:16 charnier Exp $
 .\"
 .Dd September 14, 1995
 .Dt FSDB 8
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index e6c8793755d7..4423f2d81c05 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -27,7 +27,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *		$Id: fsdb.c,v 1.5.2.1 1997/06/12 07:01:23 charnier Exp $
+ *		$Id: fsdb.c,v 1.5.2.2 1998/08/12 06:15:16 charnier Exp $
  */
 
 #ifndef lint
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 51e99a344e94..a561474c5b82 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -27,7 +27,7 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"	$OpenBSD: fsirand.8,v 1.6 1997/02/23 03:58:26 millert Exp $
-.\" $Id: fsirand.8,v 1.3.2.3 1997/06/16 06:57:42 max Exp $
+.\" $Id: fsirand.8,v 1.3.2.4 1998/07/17 20:13:11 jkh Exp $
 .\"
 .Dd January 25, 1997
 .Dt FSIRAND 8
diff --git a/sbin/fsirand/fsirand.c b/sbin/fsirand/fsirand.c
index ffa2d74b6b43..fe972437d126 100644
--- a/sbin/fsirand/fsirand.c
+++ b/sbin/fsirand/fsirand.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: fsirand.c,v 1.3.2.4 1998/07/17 20:13:11 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/i386/Makefile b/sbin/i386/Makefile
index f2d418a85473..44bbcba55489 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 $
+#	$Id: Makefile,v 1.3 1996/08/09 22:44:55 julian Exp $
 
 SUBDIR=	comcontrol fdisk ft mount_msdos nextboot
 #NOTYET: cxconfig
diff --git a/sbin/i386/Makefile.inc b/sbin/i386/Makefile.inc
index c961f8568307..2eb7be47d2de 100644
--- a/sbin/i386/Makefile.inc
+++ b/sbin/i386/Makefile.inc
@@ -1,3 +1,3 @@
-#	$Id$
+#	$Id: Makefile.inc,v 1.1 1994/12/02 23:53:23 wollman Exp $
 
 .include "${.CURDIR}/../../Makefile.inc"
diff --git a/sbin/i386/comcontrol/comcontrol.8 b/sbin/i386/comcontrol/comcontrol.8
index eeeabcfaab30..3988821ae0b3 100644
--- a/sbin/i386/comcontrol/comcontrol.8
+++ b/sbin/i386/comcontrol/comcontrol.8
@@ -1,4 +1,4 @@
-.\"	$Id: comcontrol.8,v 1.8.2.2 1997/03/03 07:01:28 mpp Exp $
+.\"	$Id: comcontrol.8,v 1.8.2.3 1998/07/17 20:13:12 jkh Exp $
 .Dd May 15, 1994
 .Dt COMCONTROL 8
 .Os FreeBSD
diff --git a/sbin/i386/comcontrol/comcontrol.c b/sbin/i386/comcontrol/comcontrol.c
index 372f984409e4..9618b221f6d6 100644
--- a/sbin/i386/comcontrol/comcontrol.c
+++ b/sbin/i386/comcontrol/comcontrol.c
@@ -28,7 +28,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: comcontrol.c,v 1.6.6.1 1998/07/17 20:13:13 jkh Exp $";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/sbin/i386/cxconfig/cxconfig.8 b/sbin/i386/cxconfig/cxconfig.8
index e502e38edfac..80b6b46cc5d7 100644
--- a/sbin/i386/cxconfig/cxconfig.8
+++ b/sbin/i386/cxconfig/cxconfig.8
@@ -1,4 +1,4 @@
-.\"	$Id$
+.\"	$Id: cxconfig.8,v 1.1.1.1.6.2 1998/07/17 20:13:14 jkh Exp $
 .Dd December 2, 1994
 .Dt CXCONFIG 8
 .Os FreeBSD
diff --git a/sbin/i386/cxconfig/cxconfig.c b/sbin/i386/cxconfig/cxconfig.c
index cae322b702b7..628c41eafe53 100644
--- a/sbin/i386/cxconfig/cxconfig.c
+++ b/sbin/i386/cxconfig/cxconfig.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: cxconfig.c,v 1.2.2.1 1998/07/17 20:13:14 jkh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/fdisk/fdisk.c b/sbin/i386/fdisk/fdisk.c
index a4e3c1f518eb..1d9b3f9069c4 100644
--- a/sbin/i386/fdisk/fdisk.c
+++ b/sbin/i386/fdisk/fdisk.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: fdisk.c,v 1.11.2.9 1998/07/17 20:13:17 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/disklabel.h>
diff --git a/sbin/i386/ft/Makefile b/sbin/i386/ft/Makefile
index 1cc600b79847..ac0878e9bc05 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 $
+#	$Id: Makefile,v 1.5 1995/09/17 06:57:43 davidg Exp $
 
 PROG=	ft
 MAN8=	ft.8
diff --git a/sbin/i386/ft/ft.8 b/sbin/i386/ft/ft.8
index 986bb9267e18..385384eecacb 100644
--- a/sbin/i386/ft/ft.8
+++ b/sbin/i386/ft/ft.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)ft.8
-.\"	$Id$
+.\"	$Id: ft.8,v 1.2.6.2 1998/07/17 20:13:18 jkh Exp $
 .\"
 .Dd February 7, 1994
 .Dt FT 8
diff --git a/sbin/i386/ft/ft.c b/sbin/i386/ft/ft.c
index 41591a4239f9..1be86854c789 100644
--- a/sbin/i386/ft/ft.c
+++ b/sbin/i386/ft/ft.c
@@ -36,7 +36,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ft.c,v 1.3.6.1 1998/07/17 20:13:18 jkh Exp $";
 #endif /* not lint */
 
 #include <err.h>
diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile
index 051f01f0e777..c7ab8fdf4a41 100644
--- a/sbin/i386/mount_msdos/Makefile
+++ b/sbin/i386/mount_msdos/Makefile
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.2.6.1 1998/03/06 08:06:39 jkh Exp $
+#	$Id: Makefile,v 1.2.6.2 1998/07/16 02:02:01 jkh Exp $
 #
 
 PROG=	mount_msdos
diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8
index b201f7ab3bcd..94f6998ebbcc 100644
--- a/sbin/i386/mount_msdos/mount_msdos.8
+++ b/sbin/i386/mount_msdos/mount_msdos.8
@@ -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.
 .\"
-.\"	$Id: mount_msdos.8,v 1.14 1998/06/30 06:23:41 charnier Exp $
+.\"	$Id: mount_msdos.8,v 1.3.2.1 1998/07/16 02:02:02 jkh Exp $
 .\"
 .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 74ec60632ebf..4e2781475f4d 100644
--- a/sbin/i386/mount_msdos/mount_msdos.c
+++ b/sbin/i386/mount_msdos/mount_msdos.c
@@ -32,7 +32,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: mount_msdos.c,v 1.15 1998/06/30 06:23:42 charnier Exp $";
+	"$Id: mount_msdos.c,v 1.5.2.2 1998/07/16 02:02:02 jkh Exp $";
 #endif /* not lint */
 
 #ifndef __FreeBSD_version
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index f4fab2b8380d..d94ef0bd808d 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,4 +1,4 @@
-.\"	$Id: nextboot.8,v 1.3.2.1 1996/12/10 16:43:01 joerg Exp $
+.\"	$Id: nextboot.8,v 1.3.2.2 1998/07/17 20:13:19 jkh Exp $
 .Dd July 9, 1996
 .Dt NEXTBOOT 8
 .\".Os BSD 4
diff --git a/sbin/i386/nextboot/nextboot.c b/sbin/i386/nextboot/nextboot.c
index d266061b1415..b9bbf55791b0 100644
--- a/sbin/i386/nextboot/nextboot.c
+++ b/sbin/i386/nextboot/nextboot.c
@@ -15,7 +15,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: nextboot.c,v 1.3.2.2 1998/07/17 20:13:19 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index 00651ad8d823..83a8740d5a15 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id: Makefile,v 1.10 1997/05/04 06:27:45 peter Exp $
+#	$Id: Makefile,v 1.6.2.1 1997/06/30 11:01:57 peter Exp $
 
 PROG=	ifconfig
 SRCS=	ifconfig.c
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 282e049c2430..2d4b195b172e 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.2.4 1998/06/08 02:02:31 danny Exp $
+.\"	$Id: ifconfig.8,v 1.9.2.5 1998/07/17 20:13:20 jkh Exp $
 .\"
 .Dd February 13, 1996
 .Dt IFCONFIG 8
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 2b38511ac973..3400733d7a93 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";
 #endif
 static const char rcsid[] =
-	"$Id: ifconfig.c,v 1.19.2.1 1997/06/30 11:02:00 peter Exp $";
+	"$Id: ifconfig.c,v 1.19.2.2 1998/07/17 20:13:21 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index 544618eae2cb..a3c4f3e26268 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id$
+ * $Id: ifconfig.h,v 1.3.2.1 1997/06/30 11:02:02 peter Exp $
  */
 
 extern struct ifreq ifr;
diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c
index cfaef8870da7..7daacb08447f 100644
--- a/sbin/ifconfig/ifmedia.c
+++ b/sbin/ifconfig/ifmedia.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ifconfig.c,v 1.34 1997/04/21 01:17:58 lukem Exp $	*/
-/*	$Id: ifmedia.c,v 1.3.2.1 1997/06/30 11:02:04 peter Exp $ */
+/*	$Id: ifmedia.c,v 1.3.2.2 1998/07/17 20:13:21 jkh Exp $ */
 
 /*
  * Copyright (c) 1997 Jason R. Thorpe.
diff --git a/sbin/init/Makefile b/sbin/init/Makefile
index 0fce88c9a424..c7c787671949 100644
--- a/sbin/init/Makefile
+++ b/sbin/init/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 7/19/93
-#	$Id: Makefile,v 1.8.2.1 1997/08/18 03:30:04 davidn Exp $
+#	$Id: Makefile,v 1.8.2.2 1998/03/06 07:29:45 jkh Exp $
 
 PROG=	init
 MAN8=	init.8
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 7e50f613994a..c93b141fe06f 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: init.8,v 1.4.2.4 1998/07/06 12:01:34 jkoshy Exp $
+.\"	$Id: init.8,v 1.4.2.5 1998/07/17 20:13:23 jkh Exp $
 .\"
 .Dd April 18, 1994
 .Dt INIT 8
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 8917bf46133a..efb0cbf2d13e 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *		$Id: init.c,v 1.12.2.3 1997/08/18 03:30:04 davidn Exp $
+ *		$Id: init.c,v 1.12.2.4 1998/03/06 08:12:26 jkh Exp $
  */
 
 #ifndef lint
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index 641ab7ef85a9..900c07399a46 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.2.19 1998/09/17 18:01:59 luigi Exp $
+ * $Id: ipfw.c,v 1.34.2.20 1998/10/12 17:29:15 luigi Exp $
  *
  */
 
diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c
index 81a86168dd74..e8d4f4d3267d 100644
--- a/sbin/md5/md5.c
+++ b/sbin/md5/md5.c
@@ -1,5 +1,5 @@
 /*
- * $Id: md5.c,v 1.7.2.2 1998/03/06 08:15:33 jkh Exp $
+ * $Id: md5.c,v 1.7.2.3 1998/07/17 20:13:26 jkh Exp $
  *
  * Derived from:
  */
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: md5.c,v 1.7.2.3 1998/07/17 20:13:26 jkh Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index 0c6d5c605e96..80441c9499ef 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mknod.8	8.2 (Berkeley) 12/11/93
-.\"	$Id$
+.\"	$Id: mknod.8,v 1.5.2.2 1998/07/17 20:13:27 jkh Exp $
 .\"
 .Dd December 11, 1993
 .Dt MKNOD 8
diff --git a/sbin/mknod/mknod.c b/sbin/mknod/mknod.c
index 0db1fe143f0c..d933dcf84251 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: mknod.c,v 1.3.2.1 1997/03/12 19:05:01 bde Exp $";
+    "$Id: mknod.c,v 1.3.2.2 1997/06/18 06:13:34 charnier Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/sbin/modload/Makefile b/sbin/modload/Makefile
index 265869fbaa6a..05619d222c51 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 $
+#	$Id: Makefile,v 1.1 1994/08/19 12:07:09 davidg Exp $
 #
 
 PROG=	modload
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 7e8dfb16a5d7..517844c761e6 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.2.1 1997/03/03 07:01:31 mpp Exp $
+.\"	$Id: modload.8,v 1.7.2.2 1998/07/17 20:13:28 jkh Exp $
 .\"
 .Dd September 22, 1994
 .Dt MODLOAD 8
diff --git a/sbin/modload/modload.c b/sbin/modload/modload.c
index 63f2ed138c9b..3230abe23f24 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.2.3 1997/09/03 06:53:51 jkh Exp $
+ *	$Id: modload.c,v 1.13.2.4 1998/08/12 06:26:05 charnier Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/modload/pathnames.h b/sbin/modload/pathnames.h
index 4359013dd9f3..13c34fab4028 100644
--- a/sbin/modload/pathnames.h
+++ b/sbin/modload/pathnames.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Id: pathnames.h,v 1.2 1995/01/23 04:08:00 wollman Exp $ */
 #include <paths.h>
 
 #define	_PATH_LKM	"/dev/lkm"
diff --git a/sbin/modunload/Makefile b/sbin/modunload/Makefile
index 3520c48d2f83..8bbbbde93ad7 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 $
+#	$Id: Makefile,v 1.1 1994/08/19 12:07:18 davidg Exp $
 #
 
 PROG=	modunload
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index 889f17f48ef5..273f9dfcab56 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.2.1 1996/12/14 13:57:47 joerg Exp $
+.\"	$Id: modunload.8,v 1.4.2.2 1998/07/17 20:13:28 jkh Exp $
 .\"
 .Dd June 7, 1993
 .Dt MODUNLOAD 8
diff --git a/sbin/modunload/modunload.c b/sbin/modunload/modunload.c
index ab9a5752fd14..ade12ad9362c 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.8.2 1997/09/03 06:55:39 jkh Exp $
+ *	$Id: modunload.c,v 1.1.8.3 1998/07/17 20:13:29 jkh Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index f9957902c33f..d1e86e0d7378 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.2.4 1998/07/20 02:33:46 jkoshy Exp $
+.\"	$Id: mount.8,v 1.11.2.5 1998/08/12 06:19:35 charnier Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT 8
diff --git a/sbin/mount_cd9660/mount_cd9660.c b/sbin/mount_cd9660/mount_cd9660.c
index 283f97ecb393..a3330b1da33b 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: mount_cd9660.c,v 1.7 1996/05/13 17:42:55 wollman Exp $";
+	"$Id: mount_cd9660.c,v 1.7.2.1 1997/08/17 13:30:23 joerg Exp $";
 #endif /* not lint */
 
 #include <sys/cdio.h>
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 9441c8bcd2e0..6c560b3fcc10 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: mount_ext2fs.8,v 1.3.2.1 1998/07/17 20:13:30 jkh Exp $
 .\"
 .Dd January 31, 1996
 .Dt MOUNT_EXT2FS 8
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 979d8061f988..ae060b6c4f16 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.4.2.1 1997/12/04 07:36:11 imp Exp $";
+	"$Id: mount_ext2fs.c,v 1.4.2.2 1998/08/12 06:21:10 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 16531310a7ec..fac7c15703aa 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: mount_nfs.8,v 1.5.2.1 1997/05/14 08:19:19 dfr Exp $
+.\" $Id: mount_nfs.8,v 1.5.2.2 1998/07/07 04:52:54 jkoshy Exp $
 .\""
 .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 1684d448d942..83e6f7ef9196 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.14.2.2 1997/05/14 12:06:34 dfr Exp $";
+	"$Id: mount_nfs.c,v 1.14.2.3 1998/08/12 06:31:03 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index fa7a2b7bbd5c..db15e9a27122 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: mount_null.8,v 1.5.2.1 1997/10/19 17:23:25 joerg Exp $
+.\"	$Id: mount_null.8,v 1.5.2.2 1998/08/12 06:28:38 charnier Exp $
 .\"
 .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 4b8a920faef8..b391f6926261 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.5 1996/09/14 02:58:23 bde Exp $";
+	"$Id: mount_null.c,v 1.5.2.1 1997/12/04 07:36:12 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/Makefile b/sbin/mount_portal/Makefile
index 85eca128f4db..20bd316d4e2f 100644
--- a/sbin/mount_portal/Makefile
+++ b/sbin/mount_portal/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 3/27/94
-#	$Id$
+#	$Id: Makefile,v 1.4 1995/02/21 04:05:17 wollman Exp $
 
 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 3ee9a0e27bc1..79dc92076f1a 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.1.1.1 1994/05/26 06:34:32 rgrimes Exp $
+ * $Id: activate.c,v 1.1.1.1.8.1 1998/07/17 20:13:32 jkh Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/conf.c b/sbin/mount_portal/conf.c
index 3eb4af3c748b..4a79c7400134 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 $
+ * $Id: conf.c,v 1.3 1995/05/30 06:09:25 rgrimes Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index ed9434e557fe..aab427d1251a 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -35,7 +35,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mount_portal.8	8.3 (Berkeley) 3/27/94
-.\"	$Id$
+.\"	$Id: mount_portal.8,v 1.2.2.1 1998/07/17 20:13:33 jkh Exp $
 .\"
 .Dd March 27, 1994
 .Dt MOUNT_PORTAL 8
diff --git a/sbin/mount_portal/mount_portal.c b/sbin/mount_portal/mount_portal.c
index 08d7b7f2ad0e..97a23ae75e39 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.7.2.1 1997/03/24 05:53:41 imp Exp $";
+	"$Id: mount_portal.c,v 1.7.2.2 1997/12/04 07:36:13 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_portal/pathnames.h b/sbin/mount_portal/pathnames.h
index 25321145d990..97bde75e7731 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 $
+ * $Id: pathnames.h,v 1.1.1.1 1994/05/26 06:34:32 rgrimes Exp $
  */
 
 #include <paths.h>
diff --git a/sbin/mount_portal/portal.conf b/sbin/mount_portal/portal.conf
index 5b5a773eaa3c..51a88a014cfd 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 $
+# $Id: portal.conf,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $
 tcplisten/	tcplisten tcplisten/
 tcp/		tcp tcp/
 fs/		file fs/
diff --git a/sbin/mount_portal/portald.h b/sbin/mount_portal/portald.h
index fbe111b1a7ad..9bc75ac34925 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 $
+ * $Id: portald.h,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $
  */
 
 #include <sys/cdefs.h>
diff --git a/sbin/mount_portal/pt_conf.c b/sbin/mount_portal/pt_conf.c
index d1eba94ea3fe..f84ddf4d08bb 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 $
+ * $Id: pt_conf.c,v 1.1.1.1 1994/05/26 06:34:33 rgrimes Exp $
  */
 
 #include <sys/types.h>
diff --git a/sbin/mount_portal/pt_exec.c b/sbin/mount_portal/pt_exec.c
index 06e3382da85b..6ae2b834ab3f 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 $
+ * $Id: pt_exec.c,v 1.1.1.1 1994/05/26 06:34:34 rgrimes Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index a9cd2ca3ea20..940e2b9d50e7 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 $
+ * $Id: pt_file.c,v 1.3 1995/04/19 12:24:06 gpalmer Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_portal/pt_tcp.c b/sbin/mount_portal/pt_tcp.c
index 64728a4186af..53477a1f4a63 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.2 1995/04/19 12:24:08 gpalmer Exp $
+ * $Id: pt_tcp.c,v 1.2.6.1 1998/08/12 06:27:34 charnier Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/mount_std/mount_std.8 b/sbin/mount_std/mount_std.8
index b9694d9ac417..bb5bf53c9977 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.3.2.2 1997/01/02 17:48:06 mpp Exp $
+.\"	$Id: mount_std.8,v 1.3.2.3 1998/07/17 20:13:34 jkh Exp $
 .\"
 .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 ce2c317b0053..ecbea7176de1 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.3 1996/09/14 02:58:55 bde Exp $";
+	"$Id: mount_std.c,v 1.3.2.1 1997/12/04 07:36:13 imp Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mount_umap/mount_umap.c b/sbin/mount_umap/mount_umap.c
index b6f5c7fc31e3..55e42519060a 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.7.2.1 1997/12/04 07:36:14 imp Exp $";
+	"$Id: mount_umap.c,v 1.7.2.2 1998/08/12 06:23:56 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/mountd/Makefile b/sbin/mountd/Makefile
index f32e11b895eb..1eac0032579a 100644
--- a/sbin/mountd/Makefile
+++ b/sbin/mountd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.3 (Berkeley) 1/25/94
-#	$Id$
+#	$Id: Makefile,v 1.4 1994/09/22 22:16:48 wollman Exp $
 
 PROG=	mountd
 CFLAGS+=-DNFS -DMFS -DCD9660 -DMSDOSFS
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index 21c90607fdf5..091bbe2be4d4 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)exports.5	8.3 (Berkeley) 3/29/95
-.\"	$Id: exports.5,v 1.3.2.1 1997/03/12 15:07:13 mpp Exp $
+.\"	$Id: exports.5,v 1.3.2.2 1998/08/12 06:44:25 charnier Exp $
 .\"
 .Dd March 29, 1995
 .Dt EXPORTS 5
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 1469ac6c30ca..6b6ae396e9e0 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mountd.8	8.4 (Berkeley) 4/28/95
-.\"	$Id: mountd.8,v 1.5.2.4 1998/07/17 20:13:36 jkh Exp $
+.\"	$Id: mountd.8,v 1.5.2.5 1998/07/30 02:11:58 alex Exp $
 .\"
 .Dd April 28, 1995
 .Dt MOUNTD 8
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c
index 3d65a69aa829..7077c818a9d7 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.11.2.11 1998/06/25 21:27:24 wpaul Exp $";
+	"$Id: mountd.c,v 1.11.2.12 1998/08/12 06:44:25 charnier Exp $";
 #endif /*not lint*/
 
 #include <sys/param.h>
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 147db97bab9c..9d34c023b252 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)newfs.8	8.6 (Berkeley) 5/3/95
-.\"	$Id$
+.\"	$Id: newfs.8,v 1.7.2.4 1998/07/17 20:13:38 jkh Exp $
 .\"
 .Dd May 3, 1995
 .Dt NEWFS 8
diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile
index 635fafb13457..519ddf222880 100644
--- a/sbin/newfs_msdos/Makefile
+++ b/sbin/newfs_msdos/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1998/07/06 20:01:33 rnordier Exp $
+#	$Id: Makefile,v 1.1.1.1.2.1 1998/09/29 17:44:20 obrien Exp $
 
 PROG=	newfs_msdos
 MAN8=	newfs_msdos.8
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index 11cd7278d82b..66177ce61d0f 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -23,7 +23,7 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: newfs_msdos.8,v 1.4 1998/09/29 17:34:25 obrien Exp $
+.\"	$Id: newfs_msdos.8,v 1.4.2.1 1998/09/29 17:44:20 obrien Exp $
 .\"
 .Dd July 6, 1998
 .Dt NEWFS_MSDOS 8
diff --git a/sbin/newfs_msdos/newfs_msdos.c b/sbin/newfs_msdos/newfs_msdos.c
index e76040ec2a08..e4380486f1a3 100644
--- a/sbin/newfs_msdos/newfs_msdos.c
+++ b/sbin/newfs_msdos/newfs_msdos.c
@@ -27,7 +27,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: newfs_msdos.c,v 1.4 1998/07/19 15:02:39 rnordier Exp $";
+	"$Id: newfs_msdos.c,v 1.4.2.1 1998/09/29 17:44:20 obrien Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index a676a7b183c1..0ec95d0f1895 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.3 1996/08/23 20:35:40 mpp Exp $
+.\"	$Id: nfsiod.8,v 1.3.2.1 1998/07/17 20:13:42 jkh Exp $
 .\"
 .Dd September 22, 1994
 .Dt NFSIOD 8
diff --git a/sbin/nologin/nologin.5 b/sbin/nologin/nologin.5
index d84c56604419..979c0ed5d782 100644
--- a/sbin/nologin/nologin.5
+++ b/sbin/nologin/nologin.5
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id$
+.\"	$Id: nologin.5,v 1.2.2.2 1998/07/17 20:13:42 jkh Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 5
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index 9802672007d7..2af8398e820d 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)nologin.8	8.1 (Berkeley) 6/19/93
-.\"	$Id$
+.\"	$Id: nologin.8,v 1.1.1.1.8.1 1998/07/17 20:13:42 jkh Exp $
 .\"
 .Dd June 19, 1993
 .Dt NOLOGIN 8
diff --git a/sbin/nologin/nologin.sh b/sbin/nologin/nologin.sh
index 346836f63918..196f4b9616bf 100644
--- a/sbin/nologin/nologin.sh
+++ b/sbin/nologin/nologin.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)nologin.sh	8.1 (Berkeley) 6/5/93
-#	$Id$
+#	$Id: nologin.sh,v 1.1.1.1.8.2 1998/07/17 20:13:43 jkh Exp $
 #
 
 echo 'This account is currently not available.'
diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile
index 47708df39c8a..3fe84a0c9366 100644
--- a/sbin/ping/Makefile
+++ b/sbin/ping/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$Id$
+#	$Id: Makefile,v 1.2.8.2 1998/03/06 13:07:12 jkh Exp $
 
 PROG=	ping
 MAN8=	ping.8
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index 56a46ce854c7..d72cfefd4fb6 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.2.6 1997/09/14 19:40:03 jkh Exp $
+.\"	$Id: ping.8,v 1.3.2.7 1998/07/17 20:13:44 jkh Exp $
 .\"
 .Dd March 1, 1997
 .Dt PING 8
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 4fe954ba3feb..28ea3651336f 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #endif
 static const char rcsid[] =
-	"$Id: ping.c,v 1.8.2.16 1998/05/25 20:21:34 fenner Exp $";
+	"$Id: ping.c,v 1.8.2.17 1998/07/17 20:13:45 jkh Exp $";
 #endif /* not lint */
 
 /*
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 080f8851ad28..c70b2f7e3747 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)quotacheck.8	8.1 (Berkeley) 6/5/93
-.\"	$Id$
+.\"	$Id: quotacheck.8,v 1.2.2.1 1998/07/17 20:13:47 jkh Exp $
 .\"
 .Dd June 5, 1993
 .Dt QUOTACHECK 8
diff --git a/sbin/quotacheck/quotacheck.c b/sbin/quotacheck/quotacheck.c
index 49d303534c85..f02e25fd348f 100644
--- a/sbin/quotacheck/quotacheck.c
+++ b/sbin/quotacheck/quotacheck.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: quotacheck.c,v 1.5.2.3 1997/09/14 19:41:18 jkh Exp $
+ *	$Id: quotacheck.c,v 1.5.2.4 1998/08/12 06:25:11 charnier Exp $
  */
 
 #ifndef lint
diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8
index 25dabcdc7be8..e08cbba3d48e 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.2.3 1998/02/10 00:18:25 msmith Exp $
+.\" $Id: boot_i386.8,v 1.4.2.4 1998/03/23 08:14:06 danny Exp $
 .\"
 .Dd April 19, 1994
 .Dt BOOT 8 i386
diff --git a/sbin/reboot/reboot.8 b/sbin/reboot/reboot.8
index c43c5f172a66..66973f36891e 100644
--- a/sbin/reboot/reboot.8
+++ b/sbin/reboot/reboot.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)reboot.8	8.1 (Berkeley) 6/9/93
-.\"	$Id$
+.\"	$Id: reboot.8,v 1.4.2.1 1998/07/17 20:13:47 jkh Exp $
 .\"
 .Dd June 9, 1993
 .Dt REBOOT 8
diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c
index d0ee42c27097..2ad396c5458c 100644
--- a/sbin/reboot/reboot.c
+++ b/sbin/reboot/reboot.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: reboot.c,v 1.3.2.3 1997/09/14 19:41:49 jkh Exp $
+ *	$Id: reboot.c,v 1.3.2.4 1998/07/17 20:13:48 jkh Exp $
  */
 
 #ifndef lint
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 2fac964381c6..a6a0d02e6449 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\"	$Id: restore.8,v 1.5.2.4 1998/05/11 13:03:24 jkh Exp $
+.\"	$Id: restore.8,v 1.5.2.5 1998/08/12 06:51:28 charnier Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index 1c870d51cef3..9cdc9ae51c2d 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: route.8,v 1.7.2.3 1998/07/21 06:50:20 charnier Exp $
+.\"	$Id: route.8,v 1.7.2.4 1998/08/12 06:48:51 charnier Exp $
 .\"
 .Dd March 19, 1994
 .Dt ROUTE 8
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 3c2093c37eb5..5b181e8bdf48 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.16.2.6 1997/12/04 07:36:18 imp Exp $";
+	"$Id: route.c,v 1.16.2.7 1998/08/12 06:48:51 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/routed/Makefile b/sbin/routed/Makefile
index 5d5c24b1be3d..c618bc12742a 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.5 1997/02/22 14:33:11 peter Exp $
+#	$Id: Makefile,v 1.2.2.1 1997/08/19 21:22:00 joerg Exp $
 
 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 9f665b571c0e..e77411533766 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.2.2.1 1997/08/19 21:22:01 joerg Exp $
+ *	$Id: defs.h,v 1.2.2.2 1998/08/12 06:54:14 charnier Exp $
  */
 
 /* Definitions for RIPv2 routing process.
diff --git a/sbin/routed/if.c b/sbin/routed/if.c
index 47f7ddbe78a6..132fe0606884 100644
--- a/sbin/routed/if.c
+++ b/sbin/routed/if.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.1 $"
+#ident "$Revision: 1.1.1.1.2.2 $"
 
 #include "defs.h"
 #include "pathnames.h"
diff --git a/sbin/routed/input.c b/sbin/routed/input.c
index d122efcb796f..c66512f78e7a 100644
--- a/sbin/routed/input.c
+++ b/sbin/routed/input.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.1 $"
+#ident "$Revision: 1.1.1.1.2.2 $"
 
 #include "defs.h"
 
diff --git a/sbin/routed/main.c b/sbin/routed/main.c
index 88f25fb6e77e..246ba460b2cc 100644
--- a/sbin/routed/main.c
+++ b/sbin/routed/main.c
@@ -39,7 +39,7 @@ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.2.2.2 $"
+#ident "$Revision: 1.2.2.3 $"
 
 #include "defs.h"
 #include "pathnames.h"
diff --git a/sbin/routed/output.c b/sbin/routed/output.c
index 2dcc49cf692d..1cc2ce2c0493 100644
--- a/sbin/routed/output.c
+++ b/sbin/routed/output.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)output.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.1 $"
+#ident "$Revision: 1.1.1.1.2.2 $"
 
 #include "defs.h"
 
diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c
index ea4a61fc9a87..c079da3a1594 100644
--- a/sbin/routed/parms.c
+++ b/sbin/routed/parms.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)if.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.2 $"
+#ident "$Revision: 1.1.1.1.2.3 $"
 
 #include "defs.h"
 #include "pathnames.h"
diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c
index f12b15b8b66d..3ccefdc5fa8e 100644
--- a/sbin/routed/radix.c
+++ b/sbin/routed/radix.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)rdisc.c	8.1 (Berkeley) x/y/95";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1 $"
+#ident "$Revision: 1.1.1.1.2.1 $"
 
 #include "defs.h"
 
diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c
index fc25fce19a5f..c526bf964a1a 100644
--- a/sbin/routed/rdisc.c
+++ b/sbin/routed/rdisc.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)rdisc.c	8.1 (Berkeley) x/y/95";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.1 $"
+#ident "$Revision: 1.1.1.1.2.2 $"
 
 #include "defs.h"
 #include <netinet/in_systm.h>
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index beb62edddcf6..ed7fd154e78b 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: routed.8,v 1.2.2.4 1998/07/17 20:13:50 jkh Exp $
+.\"	$Id: routed.8,v 1.2.2.5 1998/08/12 06:54:16 charnier Exp $
 .\"
 .Dd June 1, 1996
 .Dt ROUTED 8
diff --git a/sbin/routed/rtquery/Makefile b/sbin/routed/rtquery/Makefile
index dd80c18a5d7c..392a22e238b2 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.5 1997/02/22 14:33:13 peter Exp $
+#	$Id: Makefile,v 1.2.2.1 1997/08/19 21:22:17 joerg Exp $
 
 PROG=	rtquery
 MAN8=	rtquery.8
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index 2d41f9e8d623..534a82cac702 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -1,4 +1,4 @@
-.\"	$Id: rtquery.8,v 1.1.1.1.2.4 1997/08/19 21:22:17 joerg Exp $
+.\"	$Id: rtquery.8,v 1.1.1.1.2.5 1998/08/12 06:54:23 charnier Exp $
 .Dd June 1, 1996
 .Dt RTQUERY 8
 .Os BSD 4.4
diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c
index d4c0697aefbb..c6978ce5f36e 100644
--- a/sbin/routed/rtquery/rtquery.c
+++ b/sbin/routed/rtquery/rtquery.c
@@ -40,7 +40,7 @@ static char sccsid[] = "@(#)query.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.1.2.2 $"
+#ident "$Revision: 1.1.1.1.2.3 $"
 
 #include <sys/param.h>
 #include <sys/protosw.h>
diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c
index 6bfb8117f6ff..01904598db46 100644
--- a/sbin/routed/trace.c
+++ b/sbin/routed/trace.c
@@ -36,7 +36,7 @@ static char sccsid[] = "@(#)trace.c	8.1 (Berkeley) 6/5/93";
 #elif defined(__NetBSD__)
 static char rcsid[] = "$NetBSD$";
 #endif
-#ident "$Revision: 1.1.1.4 $"
+#ident "$Revision: 1.1.1.1.2.1 $"
 
 #define	RIPCMDS
 #include "defs.h"
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 5a613c9f7e0e..76f30fb188cc 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 $
+.\"	$Id: savecore.8,v 1.4 1996/10/13 18:12:20 fenner Exp $
 .\"
 .Dd September 23, 1994
 .Dt SAVECORE 8
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index 91983563d907..b10cdd674d13 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -39,7 +39,7 @@
 .\" SUCH DAMAGE.
 .\" 
 .\"
-.\"	$Id: scsi.8,v 1.6.2.7 1998/06/03 04:02:20 jkoshy Exp $
+.\"	$Id: scsi.8,v 1.6.2.8 1998/08/12 06:32:47 charnier Exp $
 .\"
 .Dd October 11, 1993
 .Dt SCSI 8
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index e09c2da71f2a..7a299a2585d4 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.12.2.3 1998/07/17 20:13:51 jkh Exp $
+ *	$Id: scsi.c,v 1.12.2.4 1998/08/12 06:32:47 charnier Exp $
  */
 
 #include <stdio.h>
diff --git a/sbin/scsiformat/scsiformat.8 b/sbin/scsiformat/scsiformat.8
index 2b3963f4917f..4280ef3e2249 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: scsiformat.8,v 1.4.2.2 1997/03/02 11:27:07 joerg Exp $
+.\"	$Id: scsiformat.8,v 1.4.2.3 1998/08/12 06:34:18 charnier Exp $
 .\"
 .Dd June 5, 1993
 .Dt SCSIFORMAT 8
diff --git a/sbin/scsiformat/scsiformat.sh b/sbin/scsiformat/scsiformat.sh
index 22c6747575c7..c00bb9de940a 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.4.4 1998/03/09 21:59:32 andreas Exp $
+# $Id: scsiformat.sh,v 1.1.4.5 1998/11/25 04:45:49 jkoshy Exp $
 #
 
 PATH="/sbin:/usr/sbin:/bin:/usr/bin"; export PATH
diff --git a/sbin/shutdown/shutdown.c b/sbin/shutdown/shutdown.c
index b8f2f8eaa6d9..29ffaede240e 100644
--- a/sbin/shutdown/shutdown.c
+++ b/sbin/shutdown/shutdown.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: shutdown.c,v 1.4.2.6 1998/07/17 20:13:52 jkh Exp $
+ *	$Id: shutdown.c,v 1.4.2.7 1998/08/12 06:35:49 charnier Exp $
  */
 
 #ifndef lint
diff --git a/sbin/slattach/Makefile b/sbin/slattach/Makefile
index e0e1a0a39243..c9d1e36c9991 100644
--- a/sbin/slattach/Makefile
+++ b/sbin/slattach/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/11/90
 #
-#	$Header: /home/ncvs/src/sbin/slattach/Makefile,v 1.6 1995/09/20 12:56:23 ache Exp $
+#	$Header: /home/ncvs/src/sbin/slattach/Makefile,v 1.6.2.1 1997/09/14 19:50:32 jkh Exp $
 
 PROG=	slattach
 SRCS=   slattach.c
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index 3315acda56b8..a4a69852f7fc 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -31,7 +31,7 @@
 .\"
 .\"     @(#)slattach.8	6.4 (Berkeley) 3/16/91
 .\"
-.\"	$Header: /x/ncvs/src/sbin/slattach/slattach.8,v 1.11.2.2 1997/09/14 19:50:34 jkh Exp $
+.\"	$Header: /home/ncvs/src/sbin/slattach/slattach.8,v 1.11.2.3 1998/08/12 06:57:33 charnier Exp $
 .\"
 .Dd April 4, 1993
 .Dt SLATTACH 8
diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c
index 38b78262fa13..907bd211e76e 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.20.2.3 1998/07/17 20:13:53 jkh Exp $";
+static char rcsid[] = "$Id: slattach.c,v 1.20.2.4 1998/08/12 06:57:33 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/sbin/startslip/startslip.1 b/sbin/startslip/startslip.1
index f00194be0219..91d436771b9f 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: startslip.1,v 1.10.2.1 1997/03/03 07:01:52 mpp Exp $
+.\"	$Id: startslip.1,v 1.10.2.2 1998/08/12 06:37:07 charnier Exp $
 .\"
 .Dd June 5, 1993
 .Dt STARTSLIP 1
diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c
index b048de04787a..b63a0cff71a1 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.18.2.2 1997/09/14 19:53:00 jkh Exp $
+ * $Id: startslip.c,v 1.18.2.3 1998/08/12 06:37:07 charnier Exp $
  */
 
 #ifndef lint
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index 638ce597d704..49f5f1f196ce 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: swapon.8,v 1.4.2.1 1997/08/26 00:32:59 imp Exp $
+.\"	$Id: swapon.8,v 1.4.2.2 1998/07/17 20:13:53 jkh Exp $
 .\"
 .Dd June 5, 1993
 .Dt SWAPON 8
diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c
index 2db50e2db114..435d29f03ec7 100644
--- a/sbin/swapon/swapon.c
+++ b/sbin/swapon/swapon.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: swapon.c,v 1.4.2.1 1997/06/23 06:35:35 charnier Exp $
+ *	$Id: swapon.c,v 1.4.2.2 1997/09/14 19:53:31 jkh Exp $
  */
 
 #ifndef lint