From 79403fe30060eef58fe06c0d53f0a95899ba829e Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Sun, 23 Feb 1997 09:21:14 +0000
Subject: Revert $FreeBSD$ to $Id$

---
 README                         | 2 +-
 etc/MAKEDEV                    | 2 +-
 etc/Makefile                   | 2 +-
 etc/crontab                    | 2 +-
 etc/defaults/make.conf         | 2 +-
 etc/defaults/pccard.conf       | 2 +-
 etc/etc.amd64/rc.amd64         | 2 +-
 etc/etc.i386/MAKEDEV           | 2 +-
 etc/etc.i386/rc.i386           | 2 +-
 etc/host.conf                  | 2 +-
 etc/hosts                      | 2 +-
 etc/login.conf                 | 2 +-
 etc/make.conf                  | 2 +-
 etc/mtree/BSD.include.dist     | 2 +-
 etc/mtree/BSD.local.dist       | 2 +-
 etc/mtree/BSD.release.dist     | 2 +-
 etc/mtree/BSD.root.dist        | 2 +-
 etc/mtree/BSD.usr.dist         | 2 +-
 etc/mtree/BSD.var.dist         | 2 +-
 etc/namedb/PROTO.localhost.rev | 2 +-
 etc/namedb/named.boot          | 2 +-
 etc/netstart                   | 2 +-
 etc/newsyslog.conf             | 2 +-
 etc/pccard.conf.sample         | 2 +-
 etc/phones                     | 2 +-
 etc/ppp/ppp.conf.filter.sample | 2 +-
 etc/ppp/ppp.conf.iij.sample    | 2 +-
 etc/ppp/ppp.conf.sample        | 2 +-
 etc/ppp/ppp.linkup.sample      | 2 +-
 etc/ppp/ppp.secret.sample      | 2 +-
 etc/printcap                   | 2 +-
 etc/protocols                  | 2 +-
 etc/rc                         | 2 +-
 etc/rc.d/serial                | 2 +-
 etc/rc.firewall                | 2 +-
 etc/rc.local                   | 2 +-
 etc/rc.serial                  | 2 +-
 etc/root/dot.klogin            | 2 +-
 etc/root/dot.profile           | 2 +-
 etc/security                   | 2 +-
 etc/services                   | 2 +-
 etc/sysconfig                  | 2 +-
 etc/weekly                     | 2 +-
 include/Makefile               | 2 +-
 include/arpa/inet.h            | 2 +-
 include/arpa/nameser.h         | 2 +-
 include/link.h                 | 2 +-
 include/login_cap.h            | 2 +-
 include/netdb.h                | 2 +-
 include/nl_types.h             | 2 +-
 include/nlist.h                | 2 +-
 include/resolv.h               | 2 +-
 include/rpc/auth.h             | 2 +-
 include/rpc/auth_unix.h        | 2 +-
 include/rpc/clnt.h             | 2 +-
 include/rpc/pmap_clnt.h        | 2 +-
 include/rpc/pmap_prot.h        | 2 +-
 include/rpc/pmap_rmt.h         | 2 +-
 include/rpc/rpc.h              | 2 +-
 include/rpc/rpc_msg.h          | 2 +-
 include/rpc/svc.h              | 2 +-
 include/rpc/svc_auth.h         | 2 +-
 include/rpc/types.h            | 2 +-
 include/rpc/xdr.h              | 2 +-
 include/rpcsvc/Makefile        | 2 +-
 include/rpcsvc/klm_prot.x      | 2 +-
 include/rpcsvc/mount.x         | 2 +-
 include/rpcsvc/nfs_prot.x      | 2 +-
 include/rpcsvc/nlm_prot.x      | 2 +-
 include/rpcsvc/rex.x           | 2 +-
 include/rpcsvc/rnusers.x       | 2 +-
 include/rpcsvc/rquota.x        | 2 +-
 include/rpcsvc/rstat.x         | 2 +-
 include/rpcsvc/rwall.x         | 2 +-
 include/rpcsvc/sm_inter.x      | 2 +-
 include/rpcsvc/spray.x         | 2 +-
 include/rpcsvc/yp.x            | 2 +-
 include/rpcsvc/yp_prot.h       | 2 +-
 include/rpcsvc/ypclnt.h        | 2 +-
 include/rpcsvc/yppasswd.x      | 2 +-
 include/rpcsvc/ypxfrd.x        | 4 ++--
 include/stdio.h                | 2 +-
 include/timers.h               | 2 +-
 include/utmp.h                 | 2 +-
 include/vis.h                  | 2 +-
 share/examples/etc/make.conf   | 2 +-
 sys/rpc/types.h                | 2 +-
 sys/sys/link_aout.h            | 2 +-
 sys/sys/link_elf.h             | 2 +-
 sys/sys/nlist_aout.h           | 2 +-
 90 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/README b/README
index ead9732e2c9e..334ea3fe5022 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $FreeBSD$
+was last revised on: $Id$
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some
diff --git a/etc/MAKEDEV b/etc/MAKEDEV
index e1b0544c4165..964e175c1148 100644
--- a/etc/MAKEDEV
+++ b/etc/MAKEDEV
@@ -102,7 +102,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
diff --git a/etc/Makefile b/etc/Makefile
index 50f4255740c4..23295db70ebe 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$FreeBSD$
+#	$Id$
 
 # -rw-r--r--
 BINOWN= root
diff --git a/etc/crontab b/etc/crontab
index fd9f7ec0064a..152634b5bd1d 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $FreeBSD$
+# $Id$
 #
 SHELL=/bin/sh
 PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 7fee7a8745f7..c944dcc08e71 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/etc/defaults/pccard.conf b/etc/defaults/pccard.conf
index 761fb28d3301..c26b32703d9f 100644
--- a/etc/defaults/pccard.conf
+++ b/etc/defaults/pccard.conf
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $FreeBSD$
+# $Id$
 
 # Generally available IO ports
 io	0x240-0x360
diff --git a/etc/etc.amd64/rc.amd64 b/etc/etc.amd64/rc.amd64
index c2799a48be98..c03c24957c3f 100644
--- a/etc/etc.amd64/rc.amd64
+++ b/etc/etc.amd64/rc.amd64
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$FreeBSD$
+#	$Id$
 #	Do i386 specific processing
 #
 
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index e1b0544c4165..964e175c1148 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -102,7 +102,7 @@
 #	perfmon	CPU performance-monitoring counters
 #	pci	PCI configuration-space access from user mode
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:$PATH
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index c2799a48be98..c03c24957c3f 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$FreeBSD$
+#	$Id$
 #	Do i386 specific processing
 #
 
diff --git a/etc/host.conf b/etc/host.conf
index 06c04d7b9353..10f4c6575936 100644
--- a/etc/host.conf
+++ b/etc/host.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 # Default is to use the nameserver first
 bind
 # If that doesn't work, then try the /etc/hosts file
diff --git a/etc/hosts b/etc/hosts
index f2aeebcb7528..d5a185edb091 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # Host Database
 # This file should contain the addresses and aliases
diff --git a/etc/login.conf b/etc/login.conf
index 2b658ab3e809..154b0fb5fd4c 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -9,7 +9,7 @@
 # This file controls resource limits, accounting limits and
 # default user environment settings.
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 
diff --git a/etc/make.conf b/etc/make.conf
index 7fee7a8745f7..c944dcc08e71 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 666901e7626d..05454d76e667 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 
 /set type=dir uname=bin gname=bin mode=0755
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index f6d3e817a3e6..d922b4476dc0 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#     $FreeBSD$
+#     $Id$
 #
 
 /set type=dir uname=bin gname=bin mode=0755
diff --git a/etc/mtree/BSD.release.dist b/etc/mtree/BSD.release.dist
index 8f20b2cde678..7dcb262bdcad 100644
--- a/etc/mtree/BSD.release.dist
+++ b/etc/mtree/BSD.release.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index d88b9ad81858..9c14869ba430 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 367ee88eeac3..de3c435da4ee 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 
 /set type=dir uname=bin gname=bin mode=0755
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 78fda9a8c3e9..a7e89ebc0c69 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 
 /set type=dir uname=bin gname=bin mode=0755
diff --git a/etc/namedb/PROTO.localhost.rev b/etc/namedb/PROTO.localhost.rev
index 18c6380a49de..bc4e8ac1d796 100644
--- a/etc/namedb/PROTO.localhost.rev
+++ b/etc/namedb/PROTO.localhost.rev
@@ -1,5 +1,5 @@
 ;	From: @(#)localhost.rev	5.1 (Berkeley) 6/30/90
-;	$FreeBSD$
+;	$Id$
 ;
 ; This file is automatically edited by the `make-localhost' script in
 ; the /etc/namedb directory.
diff --git a/etc/namedb/named.boot b/etc/namedb/named.boot
index 872a0dfa0459..8f298efe92ee 100644
--- a/etc/namedb/named.boot
+++ b/etc/namedb/named.boot
@@ -1,4 +1,4 @@
-;	$FreeBSD$
+;	$Id$
 ;	From: @(#)named.boot	5.1 (Berkeley) 6/30/90
 
 ; boot file for secondary name server
diff --git a/etc/netstart b/etc/netstart
index bd7baca1d709..c6772e01a2c5 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$FreeBSD$
+#	$Id$
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
diff --git a/etc/newsyslog.conf b/etc/newsyslog.conf
index bd3b6e2ceeef..12323640586b 100644
--- a/etc/newsyslog.conf
+++ b/etc/newsyslog.conf
@@ -1,5 +1,5 @@
 # configuration file for newsyslog
-# $FreeBSD$
+# $Id$
 #
 # logfilename           owner.group     mode count size time [ZB]
 /var/cron/log				600  3	   100  *     Z
diff --git a/etc/pccard.conf.sample b/etc/pccard.conf.sample
index 761fb28d3301..c26b32703d9f 100644
--- a/etc/pccard.conf.sample
+++ b/etc/pccard.conf.sample
@@ -8,7 +8,7 @@
 # IRQ == 0 means "allocate free IRQ from IRQ pool"
 # IRQ == 16 means "do not use IRQ (e.g. PIO mode)"
 #
-# $FreeBSD$
+# $Id$
 
 # Generally available IO ports
 io	0x240-0x360
diff --git a/etc/phones b/etc/phones
index 89a13397a092..a0d1db3b9533 100644
--- a/etc/phones
+++ b/etc/phones
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #	From: @(#)phones	5.2 (Berkeley) 6/30/90
 #
 # phones -- remote host phone number data base
diff --git a/etc/ppp/ppp.conf.filter.sample b/etc/ppp/ppp.conf.filter.sample
index c925ed98e2a0..9eaae8e6cedf 100644
--- a/etc/ppp/ppp.conf.filter.sample
+++ b/etc/ppp/ppp.conf.filter.sample
@@ -1,5 +1,5 @@
 #
-# $FreeBSD$
+# $Id$
 #
 # An example of packet filter definition.
 #
diff --git a/etc/ppp/ppp.conf.iij.sample b/etc/ppp/ppp.conf.iij.sample
index e667179fb0af..b089860e691b 100644
--- a/etc/ppp/ppp.conf.iij.sample
+++ b/etc/ppp/ppp.conf.iij.sample
@@ -10,7 +10,7 @@
 #	   In all cases, you can use same username and password assigned
 #	   from IIJ.
 #
-#  $FreeBSD$
+#  $Id$
 #
 #############################################################################
 #
diff --git a/etc/ppp/ppp.conf.sample b/etc/ppp/ppp.conf.sample
index 809e37ee7f3b..75c30ad48876 100644
--- a/etc/ppp/ppp.conf.sample
+++ b/etc/ppp/ppp.conf.sample
@@ -4,7 +4,7 @@
 #
 #	  Written by Toshiharu OHNO
 #
-# $FreeBSD$
+# $Id$
 #
 #################################################################
 #
diff --git a/etc/ppp/ppp.linkup.sample b/etc/ppp/ppp.linkup.sample
index 544657aa50cc..1913c3df1065 100644
--- a/etc/ppp/ppp.linkup.sample
+++ b/etc/ppp/ppp.linkup.sample
@@ -14,7 +14,7 @@
 #
 #  3) If given label name is not found, then label MYADDR is searched.
 #
-# $FreeBSD$
+# $Id$
 #
 #########################################################################
 #
diff --git a/etc/ppp/ppp.secret.sample b/etc/ppp/ppp.secret.sample
index 074d399b88d3..d1a781c3e691 100644
--- a/etc/ppp/ppp.secret.sample
+++ b/etc/ppp/ppp.secret.sample
@@ -1,7 +1,7 @@
 ##################################################
 # Sysname	Secret Key	Peer's IP address
 #
-# $FreeBSD$
+# $Id$
 #
 ##################################################
 oscar		OurSecretKey	192.244.184.34/24
diff --git a/etc/printcap b/etc/printcap
index 94aafcef6d70..77698d569283 100644
--- a/etc/printcap
+++ b/etc/printcap
@@ -1,5 +1,5 @@
 #	@(#)printcap	5.3 (Berkeley) 6/30/90
-# $FreeBSD$
+# $Id$
 
 #
 # This enables a simple local "raw" printer, hooked up to the first
diff --git a/etc/protocols b/etc/protocols
index 31b06e495cce..caf271303f16 100644
--- a/etc/protocols
+++ b/etc/protocols
@@ -1,7 +1,7 @@
 #
 # Internet (IP) protocols
 #
-#	$FreeBSD$
+#	$Id$
 #	from: @(#)protocols	5.1 (Berkeley) 4/17/89
 #
 # Updated for FreeBSD based on RFC 1340, Assigned Numbers (July 1992).
diff --git a/etc/rc b/etc/rc
index a71b8c70031c..967cfe2eac26 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$FreeBSD$
+#	$Id$
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
diff --git a/etc/rc.d/serial b/etc/rc.d/serial
index 3ddbd071832f..580e505846f8 100644
--- a/etc/rc.d/serial
+++ b/etc/rc.d/serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $Id$
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/etc/rc.firewall b/etc/rc.firewall
index ddd945988f80..e56760f422b1 100644
--- a/etc/rc.firewall
+++ b/etc/rc.firewall
@@ -1,6 +1,6 @@
 ############
 # Setup system for firewall service.
-# $FreeBSD$
+# $Id$
 
 ############
 #
diff --git a/etc/rc.local b/etc/rc.local
index d4bf6bd057c7..2b2a60d37264 100644
--- a/etc/rc.local
+++ b/etc/rc.local
@@ -1,7 +1,7 @@
 #
 # site-specific startup actions, daemons
 #
-#	$FreeBSD$
+#	$Id$
 #
 
 T=/tmp/_motd
diff --git a/etc/rc.serial b/etc/rc.serial
index 3ddbd071832f..580e505846f8 100644
--- a/etc/rc.serial
+++ b/etc/rc.serial
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD$
+# $Id$
 
 # Change some defaults for serial devices.
 # Standard defaults are:
diff --git a/etc/root/dot.klogin b/etc/root/dot.klogin
index 5f3cb7f69f58..7faa46575a3e 100644
--- a/etc/root/dot.klogin
+++ b/etc/root/dot.klogin
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 # user1.root@your.realm.wherever
 # user2.root@your.realm.wherever
diff --git a/etc/root/dot.profile b/etc/root/dot.profile
index ef21e19ebaf6..66b7b684f53d 100644
--- a/etc/root/dot.profile
+++ b/etc/root/dot.profile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 #
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
 echo 'erase ^H, kill ^U, intr ^C'
diff --git a/etc/security b/etc/security
index a62c5334f9d6..7e2f6abb973f 100644
--- a/etc/security
+++ b/etc/security
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)security	5.3 (Berkeley) 5/28/91
-#	$FreeBSD$
+#	$Id$
 #
 PATH=/sbin:/bin:/usr/bin
 LC_ALL=C; export LC_ALL
diff --git a/etc/services b/etc/services
index 0f9ba3b6544b..d4473afef83f 100644
--- a/etc/services
+++ b/etc/services
@@ -9,7 +9,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-#	$FreeBSD$
+#	$Id$
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
diff --git a/etc/sysconfig b/etc/sysconfig
index aedeb692e9e0..48315525028d 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,7 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$FreeBSD$
+#	$Id$
 
 ######################### Start Of Local Configuration Section ###########
 
diff --git a/etc/weekly b/etc/weekly
index 9d8ceef49e61..cb65947dd18a 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)weekly	5.14 (Berkeley) 6/23/91
-#	$FreeBSD$
+#	$Id$
 
 PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/libexec
 export PATH
diff --git a/include/Makefile b/include/Makefile
index 6beb5c4a7063..c8dc71a9ff18 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/4/94
-#	$FreeBSD$
+#	$Id$
 #
 # Doing a make install builds /usr/include
 #
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
index e3a2616bc59a..bdab7797f6d2 100644
--- a/include/arpa/inet.h
+++ b/include/arpa/inet.h
@@ -50,7 +50,7 @@
  *
  *	@(#)inet.h	8.1 (Berkeley) 6/2/93
  *	From: inet.h,v 8.6 1996/08/08 06:54:29 vixie Exp
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _ARPA_INET_H_
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h
index 1fc6850440d0..06406170492b 100644
--- a/include/arpa/nameser.h
+++ b/include/arpa/nameser.h
@@ -73,7 +73,7 @@
  *
  *      @(#)nameser.h	8.2 (Berkeley) 2/16/94
  *	From Id: nameser.h,v 8.11 1996/10/08 04:51:02 vixie Exp
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _ARPA_NAMESER_H_
diff --git a/include/link.h b/include/link.h
index 133074aa11a7..74725040a50c 100644
--- a/include/link.h
+++ b/include/link.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/login_cap.h b/include/login_cap.h
index b4619e104730..90aba94847bb 100644
--- a/include/login_cap.h
+++ b/include/login_cap.h
@@ -21,7 +21,7 @@
  *
  * Low-level routines relating to the user capabilities database
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _LOGIN_CAP_H_
diff --git a/include/netdb.h b/include/netdb.h
index 5cfe3a2c14cb..2f8619b2b506 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -32,7 +32,7 @@
  *
  *      @(#)netdb.h	8.1 (Berkeley) 6/2/93
  *      From: Id: netdb.h,v 8.7 1996/05/09 05:59:09 vixie Exp
- *	$FreeBSD$
+ *	$Id$
  * -
  * Portions Copyright (c) 1993 by Digital Equipment Corporation.
  *
diff --git a/include/nl_types.h b/include/nl_types.h
index 63d0886e2e02..ef0d99e3856d 100644
--- a/include/nl_types.h
+++ b/include/nl_types.h
@@ -1,4 +1,4 @@
-/*	$FreeBSD$ */
+/*	$Id$ */
 
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
diff --git a/include/nlist.h b/include/nlist.h
index 6161d2d63344..b91af10e18ce 100644
--- a/include/nlist.h
+++ b/include/nlist.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _NLIST_H_
diff --git a/include/resolv.h b/include/resolv.h
index 9e8142249850..c6a841684029 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -53,7 +53,7 @@
  *
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
  *	From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _RESOLV_H_
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index 40191e92bdf5..e144629ba307 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index daf7c45409c0..664f798dbeb6 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 9d9336226b1e..773aa9524968 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)clnt.h 1.31 88/02/08 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 5c6cd0117e74..ada124af30d1 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index e01d6fed1e04..aaec5b5b1952 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 6769ddd390b9..7bb625984f4c 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index e746f98f116c..18543e45146a 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index c42984005b6b..654cd7d59817 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 8fe073785008..e72959f0b786 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc.h 1.20 88/02/08 SMI
  *	from: @(#)svc.h	2.2 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index bf68f571b6db..295027cc6394 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	from: @(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/types.h b/include/rpc/types.h
index 4e342f8f06af..e520c14e0223 100644
--- a/include/rpc/types.h
+++ b/include/rpc/types.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index 5be985e868f0..ae9923f9c7a0 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile
index 41e425b106ff..3b1a77c5e00f 100644
--- a/include/rpcsvc/Makefile
+++ b/include/rpcsvc/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	2.3 88/08/11 4.0 RPCSRC
-#	$FreeBSD$
+#	$Id$
 
 .SUFFIXES: .x
 
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index 234e0eb4bca7..d269fa7f750e 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -40,7 +40,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index fd87ca9ca46f..ae60fa378cd3 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index 560fdd6c4d52..22db3f219964 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -31,7 +31,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index f3163af3580c..dee9ec945bd6 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -12,7 +12,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index a30fc63d8d9c..dfe42c909fcb 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index 7ecd7bc4a2db..72f558c79172 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -35,7 +35,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 23f52efce331..1d593ddc2190 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -7,7 +7,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index e46619bb836e..274b1fb4e2c6 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -47,7 +47,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 
 #endif /* def RPC_HDR */
diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x
index 19b11c82b812..c3d5a605360d 100644
--- a/include/rpcsvc/rwall.x
+++ b/include/rpcsvc/rwall.x
@@ -35,7 +35,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index eac47369b863..b29529e6e42d 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -37,7 +37,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)sm_inter.x	2.2 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 8ddca6e6581b..ecce9b8b914f 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -36,7 +36,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index cc97cf4a1a8a..692d0ebe7fe7 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -34,7 +34,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yp.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h
index f953d577c54a..d72fd0b8f517 100644
--- a/include/rpcsvc/yp_prot.h
+++ b/include/rpcsvc/yp_prot.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _RPCSVC_YP_PROT_H_
diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h
index 3d5629d37d0a..5ed87027a64f 100644
--- a/include/rpcsvc/ypclnt.h
+++ b/include/rpcsvc/ypclnt.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _RPCSVC_YPCLNT_H_
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index 960132cf1e9f..b304fdac6569 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -36,7 +36,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$FreeBSD$";
+%static char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x
index 93c0f794f720..f9aba45bf3b0 100644
--- a/include/rpcsvc/ypxfrd.x
+++ b/include/rpcsvc/ypxfrd.x
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
@@ -68,7 +68,7 @@
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$FreeBSD$";
+%static const char rcsid[] = "$Id$";
 %#endif /* not lint */
 #endif
 
diff --git a/include/stdio.h b/include/stdio.h
index e87e1faac289..a238301d0e50 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.4 (Berkeley) 1/4/94
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef	_STDIO_H_
diff --git a/include/timers.h b/include/timers.h
index 73180f9c75e1..534852b4f442 100644
--- a/include/timers.h
+++ b/include/timers.h
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $Id$
  *
  * Description : Basic timers header.
  *
diff --git a/include/utmp.h b/include/utmp.h
index 43561234bd2d..e4dbe2dfc401 100644
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)utmp.h	8.2 (Berkeley) 1/21/94
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef	_UTMP_H_
diff --git a/include/vis.h b/include/vis.h
index 025c7cdc4b36..9cfbd79eba93 100644
--- a/include/vis.h
+++ b/include/vis.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vis.h	8.1 (Berkeley) 6/2/93
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _VIS_H_
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 7fee7a8745f7..c944dcc08e71 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
diff --git a/sys/rpc/types.h b/sys/rpc/types.h
index 4e342f8f06af..e520c14e0223 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -28,7 +28,7 @@
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/sys/sys/link_aout.h b/sys/sys/link_aout.h
index 133074aa11a7..74725040a50c 100644
--- a/sys/sys/link_aout.h
+++ b/sys/sys/link_aout.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/sys/sys/link_elf.h b/sys/sys/link_elf.h
index 133074aa11a7..74725040a50c 100644
--- a/sys/sys/link_elf.h
+++ b/sys/sys/link_elf.h
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 /*
diff --git a/sys/sys/nlist_aout.h b/sys/sys/nlist_aout.h
index 6161d2d63344..b91af10e18ce 100644
--- a/sys/sys/nlist_aout.h
+++ b/sys/sys/nlist_aout.h
@@ -37,7 +37,7 @@
  *
  *	@(#)nlist.h	8.2 (Berkeley) 1/21/94
  *
- *	$FreeBSD$
+ *	$Id$
  */
 
 #ifndef _NLIST_H_
-- 
cgit v1.2.3