release/4.2.0_cvs

19 files changed, 20 insertions, 20 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 5dedda5ce520..523e8fc31ffe 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -1,7 +1,7 @@
 # Makefile.alpha -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.alpha	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.47.2.2 2000/07/07 00:29:27 obrien Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 7cacac5dfd8e..ad61c23a92d0 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -1,7 +1,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.179.2.2 2000/07/07 00:29:27 obrien Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 66b762fdfb9b..10df1a97b377 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.82.2.2 2000/07/07 12:36:58 nyan Exp $
 #
 # Makefile for FreeBSD
 #
diff --git a/sys/conf/files b/sys/conf/files
index 0f7d048b3d44..e61babe3a5e3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files,v 1.340.2.39 2000/11/16 17:28:30 archie Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 89bc0e34632e..bb108bf83264 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.alpha,v 1.43.2.6 2000/10/25 06:26:54 sos Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 2bdc9db39f82..2866ea5185cc 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.i386,v 1.307.2.8 2000/11/01 20:06:37 obrien Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 57178affc742..42caebc4d6a1 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/files.pc98,v 1.140.2.11 2000/11/02 01:41:17 nyan Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 79ec92d3fea7..533f1734c975 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -1,5 +1,5 @@
 #	From: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.82.2.2 2000/07/07 09:49:48 peter Exp $
 #
 # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device
 # drivers (KLD's).
diff --git a/sys/conf/ldscript.alpha b/sys/conf/ldscript.alpha
index a0e054787876..84ab4d55181a 100644
--- a/sys/conf/ldscript.alpha
+++ b/sys/conf/ldscript.alpha
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.alpha,v 1.4 2000/01/11 15:35:16 peter Exp $ */
 OUTPUT_FORMAT("elf64-alpha", "elf64-alpha", "elf64-alpha")
 OUTPUT_ARCH(alpha)
 ENTRY(__start)
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index a42b8fa70c12..4c80af57bb2a 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -1,4 +1,4 @@
-/* $FreeBSD$ */
+/* $FreeBSD: src/sys/conf/ldscript.i386,v 1.4 2000/01/11 15:35:16 peter Exp $ */
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)
 ENTRY(btext)
diff --git a/sys/conf/majors b/sys/conf/majors
index d1b076d5c345..ab844c863946 100644
--- a/sys/conf/majors
+++ b/sys/conf/majors
@@ -1,4 +1,4 @@
-$FreeBSD$
+$FreeBSD: src/sys/conf/majors,v 1.98.2.9 2000/10/30 10:33:27 n_hibma Exp $
 
 Hopefully, this list will one day be obsoleted by DEVFS, but for now
 this is the current allocation of device major numbers.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index cfbf065a2f3b..791d582a0bdb 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,12 +32,12 @@
 # SUCH DAMAGE.
 #
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.9 2000/11/19 19:45:55 jkh Exp $
 
 TYPE="FreeBSD"
 REVISION="4.2"
 BRANCH="RELEASE"
-RELEASE="${REVISION}-${BRANCH}"
+RELEASE=4.2-RELEASE
 SNAPDATE=""
 if [ "X${SNAPDATE}" != "X" ]; then
 	RELEASE="${RELEASE}-${SNAPDATE}"
diff --git a/sys/conf/nfsswapkernel.c b/sys/conf/nfsswapkernel.c
index 8f8a67e2f130..37a03269e7d6 100644
--- a/sys/conf/nfsswapkernel.c
+++ b/sys/conf/nfsswapkernel.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  * from: @(#)nfsswapvmunix.c	8.1 (Berkeley) 6/10/93
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/nfsswapkernel.c,v 1.6 1999/08/28 00:41:01 peter Exp $
  */
 
 /*
diff --git a/sys/conf/options b/sys/conf/options
index 72e5dc57b208..08d401349022 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options,v 1.191.2.20 2000/11/16 17:28:30 archie Exp $
 #
 #        On the handling of kernel options
 #
diff --git a/sys/conf/options.alpha b/sys/conf/options.alpha
index 674174d13b8b..5a806696422a 100644
--- a/sys/conf/options.alpha
+++ b/sys/conf/options.alpha
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.alpha,v 1.19.2.2 2000/07/18 20:39:05 dfr Exp $
 
 EV5			opt_global.h
 EV4			opt_global.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 73367cfdb0e5..f7c6d93ac8a0 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.i386,v 1.132.2.4 2000/09/30 02:49:30 ps Exp $
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 74fe773a77ca..9cd2f90431a7 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/options.pc98,v 1.103.2.5 2000/09/30 15:58:26 nyan Exp $
 
 DISABLE_PSE
 IDE_DELAY
diff --git a/sys/conf/param.c b/sys/conf/param.c
index 42b124d751b7..db1f2695cbfe 100644
--- a/sys/conf/param.c
+++ b/sys/conf/param.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.c	8.3 (Berkeley) 8/20/94
- * $FreeBSD$
+ * $FreeBSD: src/sys/conf/param.c,v 1.36.2.2 2000/08/04 22:31:06 peter Exp $
  */
 
 #include <stddef.h>
diff --git a/sys/conf/systags.sh b/sys/conf/systags.sh
index a8e0e4df4945..f77c4c7eaec6 100644
--- a/sys/conf/systags.sh
+++ b/sys/conf/systags.sh
@@ -32,7 +32,7 @@
 # SUCH DAMAGE.
 #
 #	@(#)systags.sh	8.1 (Berkeley) 6/10/93
-# $FreeBSD$
+# $FreeBSD: src/sys/conf/systags.sh,v 1.7 1999/08/28 00:41:02 peter Exp $
 #
 # systags.sh - construct a system tags file using dependence relations
 #	in a .depend file