diff --git a/share/doc/FAQ/FAQ.sgml b/share/doc/FAQ/FAQ.sgml
index 70abfa3dd48..28f080b78a8 100644
--- a/share/doc/FAQ/FAQ.sgml
+++ b/share/doc/FAQ/FAQ.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN">
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 
   <article>
 
@@ -7,7 +7,7 @@
 <author>Maintainer: Peter da Silva <tt><htmlurl url='mailto:pds@FreeBSD.ORG'
   name='&lt;pds@FreeBSD.ORG&gt;'></tt>
 
-<date>$Date: 1997/02/04 02:11:30 $
+<date>$Date: 1997/02/07 19:17:22 $
 <abstract>
 This is the FAQ for FreeBSD systems version 2.X  All entries are
 assumed to be relevant to FreeBSD 2.0.5+, unless otherwise noted.
diff --git a/share/doc/FAQ/Makefile b/share/doc/FAQ/Makefile
index 8053cea92cf..c1781ee9b4e 100644
--- a/share/doc/FAQ/Makefile
+++ b/share/doc/FAQ/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 DOC=	FAQ
 SRCS=	FAQ.sgml
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 4d1e1ee5d21..746569d4d40 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/5/93
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	FAQ handbook psd smm usd papers
 
diff --git a/share/doc/handbook/Makefile b/share/doc/handbook/Makefile
index ec02bb73d04..c4dfc000ed9 100644
--- a/share/doc/handbook/Makefile
+++ b/share/doc/handbook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 
 SRCS= authors.sgml basics.sgml bibliography.sgml boothelp.sgml
 SRCS+= booting.sgml contrib.sgml crypt.sgml ctm.sgml current.sgml cvsup.sgml
diff --git a/share/doc/handbook/authors.sgml b/share/doc/handbook/authors.sgml
index 590ed68177a..f7cca425bf8 100644
--- a/share/doc/handbook/authors.sgml
+++ b/share/doc/handbook/authors.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- 
diff --git a/share/doc/handbook/basics.sgml b/share/doc/handbook/basics.sgml
index c4c1294533c..d7cf4970017 100644
--- a/share/doc/handbook/basics.sgml
+++ b/share/doc/handbook/basics.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Unix Basics<label id="basics"></heading>
diff --git a/share/doc/handbook/bibliography.sgml b/share/doc/handbook/bibliography.sgml
index 87078891460..53a4f6c6886 100644
--- a/share/doc/handbook/bibliography.sgml
+++ b/share/doc/handbook/bibliography.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
     <chapt>
diff --git a/share/doc/handbook/boothelp.sgml b/share/doc/handbook/boothelp.sgml
index 96e9a70c78a..c10c53656f5 100644
--- a/share/doc/handbook/boothelp.sgml
+++ b/share/doc/handbook/boothelp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
diff --git a/share/doc/handbook/booting.sgml b/share/doc/handbook/booting.sgml
index d157b932e84..ff342966a74 100644
--- a/share/doc/handbook/booting.sgml
+++ b/share/doc/handbook/booting.sgml
@@ -3,7 +3,7 @@
      
      This conversion has been made by Ollivier Robert.
 
-     $FreeBSD$
+     $Id$
 
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN">
diff --git a/share/doc/handbook/contrib.sgml b/share/doc/handbook/contrib.sgml
index 1a3bb4f5309..4c8146a0caa 100644
--- a/share/doc/handbook/contrib.sgml
+++ b/share/doc/handbook/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Please try to keep the file 'avail' (from CVSROOT) 
diff --git a/share/doc/handbook/crypt.sgml b/share/doc/handbook/crypt.sgml
index e8345af28d9..2efe3504cda 100644
--- a/share/doc/handbook/crypt.sgml
+++ b/share/doc/handbook/crypt.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>DES, MD5, and Crypt<label id="crypt"></heading>
diff --git a/share/doc/handbook/ctm.sgml b/share/doc/handbook/ctm.sgml
index 2d49f9cc9f9..eaf56be2066 100644
--- a/share/doc/handbook/ctm.sgml
+++ b/share/doc/handbook/ctm.sgml
@@ -3,7 +3,7 @@
 #
 # Converted by Ollivier Robert <roberto@FreeBSD.ORG>
 #
-# $FreeBSD$
+# $Id$
 #
 # ----------------------------------------------------------------------------
 # "THE BEER-WARE LICENSE" (Revision 42):
diff --git a/share/doc/handbook/current.sgml b/share/doc/handbook/current.sgml
index 73b631ec7c7..10b5972b3f5 100644
--- a/share/doc/handbook/current.sgml
+++ b/share/doc/handbook/current.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1996/12/31 21:54:11 $
+Last updated: $Date: 1997/01/14 06:26:14 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
diff --git a/share/doc/handbook/cvsup.sgml b/share/doc/handbook/cvsup.sgml
index 6c20f059924..b8db763835e 100644
--- a/share/doc/handbook/cvsup.sgml
+++ b/share/doc/handbook/cvsup.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>CVSup<label id="cvsup"></heading>
diff --git a/share/doc/handbook/cyclades.sgml b/share/doc/handbook/cyclades.sgml
index 560aa0668bc..09365b69929 100644
--- a/share/doc/handbook/cyclades.sgml
+++ b/share/doc/handbook/cyclades.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/development.sgml b/share/doc/handbook/development.sgml
index d4419703c88..b63a2882cd0 100644
--- a/share/doc/handbook/development.sgml
+++ b/share/doc/handbook/development.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>The FreeBSD development model<label id="development"></heading>
diff --git a/share/doc/handbook/dialout.sgml b/share/doc/handbook/dialout.sgml
index ced97109b75..d5171ecf436 100644
--- a/share/doc/handbook/dialout.sgml
+++ b/share/doc/handbook/dialout.sgml
@@ -1,6 +1,6 @@
 <!-- This is an SGML document in the linuxdoc DTD of the Tutorial for
      Configuring a FreeBSD for Dialout Services.
-     $FreeBSD$
+     $Id$
 
      The FreeBSD Documentation Project
 
diff --git a/share/doc/handbook/dialup.sgml b/share/doc/handbook/dialup.sgml
index 118a5dcd706..c0e032ba1c1 100644
--- a/share/doc/handbook/dialup.sgml
+++ b/share/doc/handbook/dialup.sgml
@@ -1,6 +1,6 @@
 <!-- This is an SGML document in the linuxdoc DTD of the Tutorial for
      Configuring a FreeBSD for Dialup Services by Guy Helmer.
-     $FreeBSD$
+     $Id$
 
 <!DOCTYPE linuxdoc PUBLIC "-//Linux//DTD linuxdoc//EN">
 
diff --git a/share/doc/handbook/diskless.sgml b/share/doc/handbook/diskless.sgml
index 8adf33aab3a..ad64c3cdfb0 100644
--- a/share/doc/handbook/diskless.sgml
+++ b/share/doc/handbook/diskless.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Diskless operation<label id="diskless"></heading>
diff --git a/share/doc/handbook/dma.sgml b/share/doc/handbook/dma.sgml
index d7688a68865..989322972c6 100644
--- a/share/doc/handbook/dma.sgml
+++ b/share/doc/handbook/dma.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/eresources.sgml b/share/doc/handbook/eresources.sgml
index d5f881fb680..3de57243716 100644
--- a/share/doc/handbook/eresources.sgml
+++ b/share/doc/handbook/eresources.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt>
diff --git a/share/doc/handbook/esdi.sgml b/share/doc/handbook/esdi.sgml
index 3a69609e65a..a7ca3862609 100644
--- a/share/doc/handbook/esdi.sgml
+++ b/share/doc/handbook/esdi.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/firewalls.sgml b/share/doc/handbook/firewalls.sgml
index 7b4da549871..125b8ce8713 100644
--- a/share/doc/handbook/firewalls.sgml
+++ b/share/doc/handbook/firewalls.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Firewalls<label id="firewalls"></heading>
diff --git a/share/doc/handbook/glossary.sgml b/share/doc/handbook/glossary.sgml
index f6ef5a3dec7..80c38e1f5d1 100644
--- a/share/doc/handbook/glossary.sgml
+++ b/share/doc/handbook/glossary.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>* Glossary<label id="glossary"></heading>
diff --git a/share/doc/handbook/goals.sgml b/share/doc/handbook/goals.sgml
index 36e7cee4e14..6469469bad3 100644
--- a/share/doc/handbook/goals.sgml
+++ b/share/doc/handbook/goals.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>FreeBSD Project goals<label id="goals"></heading>
diff --git a/share/doc/handbook/handbook.sgml b/share/doc/handbook/handbook.sgml
index 81496d94038..25836bfe0cf 100644
--- a/share/doc/handbook/handbook.sgml
+++ b/share/doc/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
diff --git a/share/doc/handbook/history.sgml b/share/doc/handbook/history.sgml
index 342d79261d3..703d5bda134 100644
--- a/share/doc/handbook/history.sgml
+++ b/share/doc/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>A brief history of FreeBSD<label id="history"></heading>
diff --git a/share/doc/handbook/hw.sgml b/share/doc/handbook/hw.sgml
index daaa48e2a2f..4f9c7c1d5be 100644
--- a/share/doc/handbook/hw.sgml
+++ b/share/doc/handbook/hw.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/install.sgml b/share/doc/handbook/install.sgml
index 7fc8c7071eb..35ddfddb668 100644
--- a/share/doc/handbook/install.sgml
+++ b/share/doc/handbook/install.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/isdn.sgml b/share/doc/handbook/isdn.sgml
index 39bc4741522..f3f51bf2bab 100644
--- a/share/doc/handbook/isdn.sgml
+++ b/share/doc/handbook/isdn.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$-->
+<!-- $Id$-->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>ISDN<label id="isdn"></heading>
diff --git a/share/doc/handbook/kerberos.sgml b/share/doc/handbook/kerberos.sgml
index e0814a8fbd9..e2c264eb31f 100644
--- a/share/doc/handbook/kerberos.sgml
+++ b/share/doc/handbook/kerberos.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Kerberos<label id="kerberos"></heading>
diff --git a/share/doc/handbook/kernelconfig.sgml b/share/doc/handbook/kernelconfig.sgml
index 18ec101158b..8299696a897 100644
--- a/share/doc/handbook/kernelconfig.sgml
+++ b/share/doc/handbook/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
   <chapt><heading>Configuring the FreeBSD Kernel<label id="kernelconfig"></heading>
diff --git a/share/doc/handbook/kerneldebug.sgml b/share/doc/handbook/kerneldebug.sgml
index a11c3568fe8..8a7e4285b40 100644
--- a/share/doc/handbook/kerneldebug.sgml
+++ b/share/doc/handbook/kerneldebug.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Kernel Debugging<label id="kerneldebug"></heading>
diff --git a/share/doc/handbook/kernelopts.sgml b/share/doc/handbook/kernelopts.sgml
index f7313fbb747..7319eb69877 100644
--- a/share/doc/handbook/kernelopts.sgml
+++ b/share/doc/handbook/kernelopts.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
 
diff --git a/share/doc/handbook/linuxemu.sgml b/share/doc/handbook/linuxemu.sgml
index 543f9a9694a..dcaa1a32ca3 100644
--- a/share/doc/handbook/linuxemu.sgml
+++ b/share/doc/handbook/linuxemu.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Linux Emulation<label id="linuxemu"></heading>
diff --git a/share/doc/handbook/lists.sgml b/share/doc/handbook/lists.sgml
index 0ec377e9aae..6ff7f9e6408 100644
--- a/share/doc/handbook/lists.sgml
+++ b/share/doc/handbook/lists.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- 
diff --git a/share/doc/handbook/mail.sgml b/share/doc/handbook/mail.sgml
index c6d9ae246e0..2a076a36747 100644
--- a/share/doc/handbook/mail.sgml
+++ b/share/doc/handbook/mail.sgml
@@ -1,4 +1,4 @@
-<!--  $FreeBSD$
+<!--  $Id$
       The FreeBSD Documentation Project
 
 <!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN">
diff --git a/share/doc/handbook/memoryuse.sgml b/share/doc/handbook/memoryuse.sgml
index ca349912320..9e62d220984 100644
--- a/share/doc/handbook/memoryuse.sgml
+++ b/share/doc/handbook/memoryuse.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>PC memory utilization<label id="memoryuse"></heading>
diff --git a/share/doc/handbook/mirrors.sgml b/share/doc/handbook/mirrors.sgml
index 568c4f7c67c..9bc6082fbca 100644
--- a/share/doc/handbook/mirrors.sgml
+++ b/share/doc/handbook/mirrors.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/nfs.sgml b/share/doc/handbook/nfs.sgml
index ec4fa531b51..0be71bbb884 100644
--- a/share/doc/handbook/nfs.sgml
+++ b/share/doc/handbook/nfs.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>NFS<label id="nfs"></heading>
diff --git a/share/doc/handbook/nutshell.sgml b/share/doc/handbook/nutshell.sgml
index bd408625c7e..b76356430f3 100644
--- a/share/doc/handbook/nutshell.sgml
+++ b/share/doc/handbook/nutshell.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>FreeBSD in a nutshell<label id="nutshell"></heading>
diff --git a/share/doc/handbook/pgpkeys.sgml b/share/doc/handbook/pgpkeys.sgml
index 15325da4906..b736d70e95a 100644
--- a/share/doc/handbook/pgpkeys.sgml
+++ b/share/doc/handbook/pgpkeys.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>PGP keys<label id="pgpkeys"></heading>
diff --git a/share/doc/handbook/policies.sgml b/share/doc/handbook/policies.sgml
index 04d222578cc..6ca053b6074 100644
--- a/share/doc/handbook/policies.sgml
+++ b/share/doc/handbook/policies.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Source Tree Guidelines and Policies
diff --git a/share/doc/handbook/porting.sgml b/share/doc/handbook/porting.sgml
index fd4260fc401..d62e6ae963d 100644
--- a/share/doc/handbook/porting.sgml
+++ b/share/doc/handbook/porting.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect1><heading>Porting an existing piece of free software<label id="porting"></heading>
diff --git a/share/doc/handbook/ports.sgml b/share/doc/handbook/ports.sgml
index fa0abc87e63..3c94609016e 100644
--- a/share/doc/handbook/ports.sgml
+++ b/share/doc/handbook/ports.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>The Ports collection<label id="ports"></heading>
diff --git a/share/doc/handbook/ppp.sgml b/share/doc/handbook/ppp.sgml
index 1e2128a72c2..958fe881341 100644
--- a/share/doc/handbook/ppp.sgml
+++ b/share/doc/handbook/ppp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Setting up kernel PPP<label id="ppp"></heading>
diff --git a/share/doc/handbook/printing.sgml b/share/doc/handbook/printing.sgml
index e98ebbbe587..4dfda871c88 100644
--- a/share/doc/handbook/printing.sgml
+++ b/share/doc/handbook/printing.sgml
@@ -1,7 +1,7 @@
 <!-- This is an SGML document in the linuxdoc DTD describing
      Printing with FreeBSD.  By Sean Kelly, 1995.
 
-     $FreeBSD$
+     $Id$
 
      The FreeBSD Documentation Project
 
diff --git a/share/doc/handbook/quotas.sgml b/share/doc/handbook/quotas.sgml
index 59aa5f1cd38..5be3f06657b 100644
--- a/share/doc/handbook/quotas.sgml
+++ b/share/doc/handbook/quotas.sgml
@@ -1,7 +1,7 @@
 <!-- This is an SGML document in the linuxdoc DTD describing
      disk quotas under FreeBSD.  By Mike Pritchard, 1996.
 
-     $FreeBSD$
+     $Id$
 
      The FreeBSD Documentation Project
 
diff --git a/share/doc/handbook/relnotes.sgml b/share/doc/handbook/relnotes.sgml
index 0613e16d7eb..6c339ca9c8b 100644
--- a/share/doc/handbook/relnotes.sgml
+++ b/share/doc/handbook/relnotes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/routing.sgml b/share/doc/handbook/routing.sgml
index 26f0be11c38..4b20bf1cde3 100644
--- a/share/doc/handbook/routing.sgml
+++ b/share/doc/handbook/routing.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
 
diff --git a/share/doc/handbook/scsi.sgml b/share/doc/handbook/scsi.sgml
index c60e66aa724..a0d2ee1afcf 100644
--- a/share/doc/handbook/scsi.sgml
+++ b/share/doc/handbook/scsi.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/sections.sgml b/share/doc/handbook/sections.sgml
index 6ca7ae16feb..3c2704a6c13 100644
--- a/share/doc/handbook/sections.sgml
+++ b/share/doc/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!-- Entities containing all the pieces of the handbook are -->
diff --git a/share/doc/handbook/serial.sgml b/share/doc/handbook/serial.sgml
index 9b17357029b..90ac6ee2f47 100644
--- a/share/doc/handbook/serial.sgml
+++ b/share/doc/handbook/serial.sgml
@@ -1,6 +1,6 @@
 <!-- This is an SGML document in the linuxdoc DTD of the Tutorial for
      Configuring a FreeBSD for Dialup Services by Guy Helmer.
-     $FreeBSD$
+     $Id$
 
      The FreeBSD Documentation Project
 
diff --git a/share/doc/handbook/sio.sgml b/share/doc/handbook/sio.sgml
index 28c396cec0e..ac85b7658ec 100644
--- a/share/doc/handbook/sio.sgml
+++ b/share/doc/handbook/sio.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/skey.sgml b/share/doc/handbook/skey.sgml
index 5c7447c56b2..ec80aed45f4 100644
--- a/share/doc/handbook/skey.sgml
+++ b/share/doc/handbook/skey.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 <!--
 Copyright 1995 Massachusetts Institute of Technology
diff --git a/share/doc/handbook/slipc.sgml b/share/doc/handbook/slipc.sgml
index ce6f5bcfb62..31183f3bb6a 100644
--- a/share/doc/handbook/slipc.sgml
+++ b/share/doc/handbook/slipc.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect><heading>Setting up a SLIP client<label id="slipc"></heading>
diff --git a/share/doc/handbook/slips.sgml b/share/doc/handbook/slips.sgml
index 976c2e60e8a..b93be747bcc 100644
--- a/share/doc/handbook/slips.sgml
+++ b/share/doc/handbook/slips.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$
+<!-- $Id$
      This is an SGML version in the linuxdoc DTD of the SLIP Server
      FAQ by Guy Helmer.
 
diff --git a/share/doc/handbook/stable.sgml b/share/doc/handbook/stable.sgml
index 60265e59242..ab3655f8b45 100644
--- a/share/doc/handbook/stable.sgml
+++ b/share/doc/handbook/stable.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 
@@ -10,7 +10,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1997/01/14 06:26:47 $
+Last updated: $Date: 1997/01/18 16:43:23 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
diff --git a/share/doc/handbook/submitters.sgml b/share/doc/handbook/submitters.sgml
index d42f84ab3e1..4a474e3c488 100644
--- a/share/doc/handbook/submitters.sgml
+++ b/share/doc/handbook/submitters.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Contributing to FreeBSD<label id="submitters"></heading>
diff --git a/share/doc/handbook/sup.sgml b/share/doc/handbook/sup.sgml
index 645b70f3b5b..676ab7089f2 100644
--- a/share/doc/handbook/sup.sgml
+++ b/share/doc/handbook/sup.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 
diff --git a/share/doc/handbook/synching.sgml b/share/doc/handbook/synching.sgml
index 63dcaf38d8d..708c27594e4 100644
--- a/share/doc/handbook/synching.sgml
+++ b/share/doc/handbook/synching.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Synchronizing source trees over the Internet<label id="synching"></heading>
@@ -7,7 +7,7 @@
 
 <!--
 
-Last updated: $Date: 1996/12/31 21:54:24 $
+Last updated: $Date: 1997/01/14 06:26:49 $
 
 This document tries to describe the various ways in which a user may
 use the internet to keep development sources in synch.
diff --git a/share/doc/handbook/term.sgml b/share/doc/handbook/term.sgml
index 163df20460a..d84c2ce827d 100644
--- a/share/doc/handbook/term.sgml
+++ b/share/doc/handbook/term.sgml
@@ -1,7 +1,7 @@
 <!-- This is an SGML document in the linuxdoc DTD describing
      hardwired terminals with FreeBSD.  By Sean Kelly, (c) 1996.
 
-     $FreeBSD$
+     $Id$
 
      The FreeBSD Documentation Project
 
diff --git a/share/doc/handbook/troubleshooting.sgml b/share/doc/handbook/troubleshooting.sgml
index 85c3a816714..ffe0f2dc7ec 100644
--- a/share/doc/handbook/troubleshooting.sgml
+++ b/share/doc/handbook/troubleshooting.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <chapt><heading>Troubleshooting<label id="troubleshooting"></heading>
diff --git a/share/doc/handbook/uart.sgml b/share/doc/handbook/uart.sgml
index a93b0a2ef37..0701096c3fc 100644
--- a/share/doc/handbook/uart.sgml
+++ b/share/doc/handbook/uart.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <!--
diff --git a/share/doc/handbook/userppp.sgml b/share/doc/handbook/userppp.sgml
index d7c9079919b..91788d2319c 100644
--- a/share/doc/handbook/userppp.sgml
+++ b/share/doc/handbook/userppp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 
 <sect>Setting up user PPP<label id="userppp">
diff --git a/share/doc/iso/ucb/addr.nr b/share/doc/iso/ucb/addr.nr
index 4c77c9dc78b..92ea9fafb90 100644
--- a/share/doc/iso/ucb/addr.nr
+++ b/share/doc/iso/ucb/addr.nr
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .NC "NSAP Addresses & Routing"
 .sh 1 "OSI Address Formats"
diff --git a/share/doc/iso/wisc/addr.nr b/share/doc/iso/wisc/addr.nr
index 1a499f31b9b..e1b5fbb48be 100644
--- a/share/doc/iso/wisc/addr.nr
+++ b/share/doc/iso/wisc/addr.nr
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .NC "NSAP Addresses & Routing"
 .sh 1 "OSI Address Formats"
diff --git a/share/doc/iso/wisc/eicon.nr b/share/doc/iso/wisc/eicon.nr
index 42718e4c1fd..a99c4c5a916 100644
--- a/share/doc/iso/wisc/eicon.nr
+++ b/share/doc/iso/wisc/eicon.nr
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .sh 2 "X.25 Public Data Network Support"
 .pp
diff --git a/share/doc/iso/wisc/figs/Makefile b/share/doc/iso/wisc/figs/Makefile
index 9d54f6f00f6..2562b0b3e63 100644
--- a/share/doc/iso/wisc/figs/Makefile
+++ b/share/doc/iso/wisc/figs/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 #
 .SUFFIXES: .nr .grn
 
diff --git a/share/doc/iso/wisc/trans_design.nr b/share/doc/iso/wisc/trans_design.nr
index 32946ad2875..f0f80952c0e 100644
--- a/share/doc/iso/wisc/trans_design.nr
+++ b/share/doc/iso/wisc/trans_design.nr
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .NC "The Design of the ARGO Transport Entity"
 .sh 1 "Protocol Hooks"
diff --git a/share/doc/iso/wiscman/cons.4p b/share/doc/iso/wiscman/cons.4p
index c3f7b6a58b3..a233eac5163 100644
--- a/share/doc/iso/wiscman/cons.4p
+++ b/share/doc/iso/wiscman/cons.4p
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .TH CONS 4P "9 December 1988"
 .ds ]W Wisconsin ARGO 1.0
diff --git a/share/doc/iso/wiscman/tp.4p b/share/doc/iso/wiscman/tp.4p
index 4cb885a3bc6..e82cfefbcdf 100644
--- a/share/doc/iso/wiscman/tp.4p
+++ b/share/doc/iso/wiscman/tp.4p
@@ -1,4 +1,4 @@
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .TH TP 4P "9 December 1988"
 .ds ]W Wisconsin ARGO 1.0
diff --git a/share/doc/ja_JP.EUC/Makefile b/share/doc/ja_JP.EUC/Makefile
index bab14ce3570..ec80e0c2404 100644
--- a/share/doc/ja_JP.EUC/Makefile
+++ b/share/doc/ja_JP.EUC/Makefile
@@ -1,5 +1,5 @@
 #       From: @(#)Makefile      8.1 (Berkeley) 6/5/93
-#       $FreeBSD$
+#       $Id$
 
 SUBDIR= handbook
 
diff --git a/share/doc/ja_JP.EUC/handbook/Makefile b/share/doc/ja_JP.EUC/handbook/Makefile
index 0813e2b1a60..ea8d2a5b5c9 100644
--- a/share/doc/ja_JP.EUC/handbook/Makefile
+++ b/share/doc/ja_JP.EUC/handbook/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $Id$
 # Original revision: 1.17
 # The FreeBSD Japanese Documentation Project
 
diff --git a/share/doc/ja_JP.EUC/handbook/authors.sgml b/share/doc/ja_JP.EUC/handbook/authors.sgml
index 48d0a5262e4..cd8c098f7b2 100644
--- a/share/doc/ja_JP.EUC/handbook/authors.sgml
+++ b/share/doc/ja_JP.EUC/handbook/authors.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.59 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/basics.sgml b/share/doc/ja_JP.EUC/handbook/basics.sgml
index 878cea4ff3f..bee93d7107b 100644
--- a/share/doc/ja_JP.EUC/handbook/basics.sgml
+++ b/share/doc/ja_JP.EUC/handbook/basics.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/bibliography.sgml b/share/doc/ja_JP.EUC/handbook/bibliography.sgml
index 8b49f0e7a32..002be3d0bfa 100644
--- a/share/doc/ja_JP.EUC/handbook/bibliography.sgml
+++ b/share/doc/ja_JP.EUC/handbook/bibliography.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.15 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/boothelp.sgml b/share/doc/ja_JP.EUC/handbook/boothelp.sgml
index 3b445ef7a05..2f8748544c3 100644
--- a/share/doc/ja_JP.EUC/handbook/boothelp.sgml
+++ b/share/doc/ja_JP.EUC/handbook/boothelp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/booting.sgml b/share/doc/ja_JP.EUC/handbook/booting.sgml
index f90c576a9e2..04b6cc492df 100644
--- a/share/doc/ja_JP.EUC/handbook/booting.sgml
+++ b/share/doc/ja_JP.EUC/handbook/booting.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/contrib.sgml b/share/doc/ja_JP.EUC/handbook/contrib.sgml
index 4b2222b2ca3..8ed9d886288 100644
--- a/share/doc/ja_JP.EUC/handbook/contrib.sgml
+++ b/share/doc/ja_JP.EUC/handbook/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.216 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/crypt.sgml b/share/doc/ja_JP.EUC/handbook/crypt.sgml
index 2af144a8344..cf2f52f471e 100644
--- a/share/doc/ja_JP.EUC/handbook/crypt.sgml
+++ b/share/doc/ja_JP.EUC/handbook/crypt.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/ctm.sgml b/share/doc/ja_JP.EUC/handbook/ctm.sgml
index 8019f733e3f..4db9179d99a 100644
--- a/share/doc/ja_JP.EUC/handbook/ctm.sgml
+++ b/share/doc/ja_JP.EUC/handbook/ctm.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.14 -->
 <!--
diff --git a/share/doc/ja_JP.EUC/handbook/current.sgml b/share/doc/ja_JP.EUC/handbook/current.sgml
index 984397f5e4f..1b7bfb75633 100644
--- a/share/doc/ja_JP.EUC/handbook/current.sgml
+++ b/share/doc/ja_JP.EUC/handbook/current.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.18 -->
 
@@ -12,7 +12,7 @@
 
                         THE FREEBSD CURRENT POLICY 
 
-Last updated: $Date: 1997/01/14 06:27:17 $
+Last updated: $Date: 1997/01/15 13:16:18 $
 
 This document attempts to explain the rationale behind
 FreeBSD-current, what you should expect should you decide to run it,
diff --git a/share/doc/ja_JP.EUC/handbook/cvsup.sgml b/share/doc/ja_JP.EUC/handbook/cvsup.sgml
index df0a777d657..40ea9d66798 100644
--- a/share/doc/ja_JP.EUC/handbook/cvsup.sgml
+++ b/share/doc/ja_JP.EUC/handbook/cvsup.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/cyclades.sgml b/share/doc/ja_JP.EUC/handbook/cyclades.sgml
index b8f0f647ee8..6b121103b94 100644
--- a/share/doc/ja_JP.EUC/handbook/cyclades.sgml
+++ b/share/doc/ja_JP.EUC/handbook/cyclades.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/development.sgml b/share/doc/ja_JP.EUC/handbook/development.sgml
index b73df0db53a..01534524dfa 100644
--- a/share/doc/ja_JP.EUC/handbook/development.sgml
+++ b/share/doc/ja_JP.EUC/handbook/development.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/dialout.sgml b/share/doc/ja_JP.EUC/handbook/dialout.sgml
index 409637f2065..c2e1b603718 100644
--- a/share/doc/ja_JP.EUC/handbook/dialout.sgml
+++ b/share/doc/ja_JP.EUC/handbook/dialout.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!--  Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/dialup.sgml b/share/doc/ja_JP.EUC/handbook/dialup.sgml
index 1062b90d998..d1b2c6d5618 100644
--- a/share/doc/ja_JP.EUC/handbook/dialup.sgml
+++ b/share/doc/ja_JP.EUC/handbook/dialup.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!--  Original revision: 1.16 -->
 <!-- This is an SGML document in the linuxdoc DTD of the Tutorial for
diff --git a/share/doc/ja_JP.EUC/handbook/diskless.sgml b/share/doc/ja_JP.EUC/handbook/diskless.sgml
index fb9418808a7..966e635b5b3 100644
--- a/share/doc/ja_JP.EUC/handbook/diskless.sgml
+++ b/share/doc/ja_JP.EUC/handbook/diskless.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 <!-- 日本語訳 Y.Suzuki(yasu@hike.te.chiba-u.ac.jp)-->
diff --git a/share/doc/ja_JP.EUC/handbook/dma.sgml b/share/doc/ja_JP.EUC/handbook/dma.sgml
index 48898b481a8..4c5733f7a3d 100644
--- a/share/doc/ja_JP.EUC/handbook/dma.sgml
+++ b/share/doc/ja_JP.EUC/handbook/dma.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 <!-- 日本語訳 鈴木康修 (yasu@hike.te.chiba-u.ac.jp) -->
diff --git a/share/doc/ja_JP.EUC/handbook/eresources.sgml b/share/doc/ja_JP.EUC/handbook/eresources.sgml
index 7b6a6f15a63..5ee0e9ae69e 100644
--- a/share/doc/ja_JP.EUC/handbook/eresources.sgml
+++ b/share/doc/ja_JP.EUC/handbook/eresources.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.30 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/esdi.sgml b/share/doc/ja_JP.EUC/handbook/esdi.sgml
index bca286f33a9..9d4a903aefe 100644
--- a/share/doc/ja_JP.EUC/handbook/esdi.sgml
+++ b/share/doc/ja_JP.EUC/handbook/esdi.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/firewalls.sgml b/share/doc/ja_JP.EUC/handbook/firewalls.sgml
index 7a23678d7ff..37881c30cf7 100644
--- a/share/doc/ja_JP.EUC/handbook/firewalls.sgml
+++ b/share/doc/ja_JP.EUC/handbook/firewalls.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/glossary.sgml b/share/doc/ja_JP.EUC/handbook/glossary.sgml
index 723ae56e6cd..a1d1ea96b14 100644
--- a/share/doc/ja_JP.EUC/handbook/glossary.sgml
+++ b/share/doc/ja_JP.EUC/handbook/glossary.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/goals.sgml b/share/doc/ja_JP.EUC/handbook/goals.sgml
index 5719183960b..7672e2a8278 100644
--- a/share/doc/ja_JP.EUC/handbook/goals.sgml
+++ b/share/doc/ja_JP.EUC/handbook/goals.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.3 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/handbook.sgml b/share/doc/ja_JP.EUC/handbook/handbook.sgml
index 61b1373b883..56d8a4aa185 100644
--- a/share/doc/ja_JP.EUC/handbook/handbook.sgml
+++ b/share/doc/ja_JP.EUC/handbook/handbook.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.66 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/history.sgml b/share/doc/ja_JP.EUC/handbook/history.sgml
index f4ecd301ed8..c71829a6e66 100644
--- a/share/doc/ja_JP.EUC/handbook/history.sgml
+++ b/share/doc/ja_JP.EUC/handbook/history.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.20 -->
 <!-- 和訳: masaki@po.iijnet.or.jp + hino@nwk.cl.nec.co.jp 1996/12/19 -->
diff --git a/share/doc/ja_JP.EUC/handbook/hw.sgml b/share/doc/ja_JP.EUC/handbook/hw.sgml
index d72b0b884d5..283058b1b40 100644
--- a/share/doc/ja_JP.EUC/handbook/hw.sgml
+++ b/share/doc/ja_JP.EUC/handbook/hw.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.62 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/install.sgml b/share/doc/ja_JP.EUC/handbook/install.sgml
index d63cb73d9e9..ebfa789e1ec 100644
--- a/share/doc/ja_JP.EUC/handbook/install.sgml
+++ b/share/doc/ja_JP.EUC/handbook/install.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.50 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/isdn.sgml b/share/doc/ja_JP.EUC/handbook/isdn.sgml
index 448c1e87205..b57fce4effd 100644
--- a/share/doc/ja_JP.EUC/handbook/isdn.sgml
+++ b/share/doc/ja_JP.EUC/handbook/isdn.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/jcontrib.sgml b/share/doc/ja_JP.EUC/handbook/jcontrib.sgml
index 5a488e3a8d0..7338c23027b 100644
--- a/share/doc/ja_JP.EUC/handbook/jcontrib.sgml
+++ b/share/doc/ja_JP.EUC/handbook/jcontrib.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 
 <chapt><heading>FreeBSD Handbook 日本語化について<label id="jcontrib"></heading>
diff --git a/share/doc/ja_JP.EUC/handbook/jmembers.sgml b/share/doc/ja_JP.EUC/handbook/jmembers.sgml
index a92ef07e657..c3a2c9d9388 100644
--- a/share/doc/ja_JP.EUC/handbook/jmembers.sgml
+++ b/share/doc/ja_JP.EUC/handbook/jmembers.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 
 <!-- 
diff --git a/share/doc/ja_JP.EUC/handbook/kerberos.sgml b/share/doc/ja_JP.EUC/handbook/kerberos.sgml
index c8979f6f4d5..abdb35db43f 100644
--- a/share/doc/ja_JP.EUC/handbook/kerberos.sgml
+++ b/share/doc/ja_JP.EUC/handbook/kerberos.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/kernelconfig.sgml b/share/doc/ja_JP.EUC/handbook/kernelconfig.sgml
index 5abf85e58a3..bd87a1431b7 100644
--- a/share/doc/ja_JP.EUC/handbook/kernelconfig.sgml
+++ b/share/doc/ja_JP.EUC/handbook/kernelconfig.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
     <!-- Original revision: 1.26 -->
 <!-- <!DOCTYPE linuxdoc PUBLIC '-//FreeBSD//DTD linuxdoc//EN'> -->
diff --git a/share/doc/ja_JP.EUC/handbook/kerneldebug.sgml b/share/doc/ja_JP.EUC/handbook/kerneldebug.sgml
index 8a905141d8a..fb96b93060a 100644
--- a/share/doc/ja_JP.EUC/handbook/kerneldebug.sgml
+++ b/share/doc/ja_JP.EUC/handbook/kerneldebug.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/kernelopts.sgml b/share/doc/ja_JP.EUC/handbook/kernelopts.sgml
index eb8a3a74b9c..2e8ab007245 100644
--- a/share/doc/ja_JP.EUC/handbook/kernelopts.sgml
+++ b/share/doc/ja_JP.EUC/handbook/kernelopts.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Documentation Project -->
 <!-- Original revision: 1.6 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/linuxemu.sgml b/share/doc/ja_JP.EUC/handbook/linuxemu.sgml
index 49b8c745847..0bc945381d8 100644
--- a/share/doc/ja_JP.EUC/handbook/linuxemu.sgml
+++ b/share/doc/ja_JP.EUC/handbook/linuxemu.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/lists.sgml b/share/doc/ja_JP.EUC/handbook/lists.sgml
index 87c1b87eefe..61aaa7e3898 100644
--- a/share/doc/ja_JP.EUC/handbook/lists.sgml
+++ b/share/doc/ja_JP.EUC/handbook/lists.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.7 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/mail.sgml b/share/doc/ja_JP.EUC/handbook/mail.sgml
index 8e197bb230c..ae022276220 100644
--- a/share/doc/ja_JP.EUC/handbook/mail.sgml
+++ b/share/doc/ja_JP.EUC/handbook/mail.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/memoryuse.sgml b/share/doc/ja_JP.EUC/handbook/memoryuse.sgml
index eccf14eb67b..7ae63cc6cde 100644
--- a/share/doc/ja_JP.EUC/handbook/memoryuse.sgml
+++ b/share/doc/ja_JP.EUC/handbook/memoryuse.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/mirrors.sgml b/share/doc/ja_JP.EUC/handbook/mirrors.sgml
index dadea6bbe16..fed65d89bd6 100644
--- a/share/doc/ja_JP.EUC/handbook/mirrors.sgml
+++ b/share/doc/ja_JP.EUC/handbook/mirrors.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.47 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/nfs.sgml b/share/doc/ja_JP.EUC/handbook/nfs.sgml
index 2911f0dadbc..706d3a3d9e0 100644
--- a/share/doc/ja_JP.EUC/handbook/nfs.sgml
+++ b/share/doc/ja_JP.EUC/handbook/nfs.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/nutshell.sgml b/share/doc/ja_JP.EUC/handbook/nutshell.sgml
index d12e1735500..7349db3a67f 100644
--- a/share/doc/ja_JP.EUC/handbook/nutshell.sgml
+++ b/share/doc/ja_JP.EUC/handbook/nutshell.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/pgpkeys.sgml b/share/doc/ja_JP.EUC/handbook/pgpkeys.sgml
index be3e54a306b..d014c08eb13 100644
--- a/share/doc/ja_JP.EUC/handbook/pgpkeys.sgml
+++ b/share/doc/ja_JP.EUC/handbook/pgpkeys.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.16 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/policies.sgml b/share/doc/ja_JP.EUC/handbook/policies.sgml
index 5f1a1c7e4d9..eb8058538e7 100644
--- a/share/doc/ja_JP.EUC/handbook/policies.sgml
+++ b/share/doc/ja_JP.EUC/handbook/policies.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.10 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/porting.sgml b/share/doc/ja_JP.EUC/handbook/porting.sgml
index a5fb6d91185..22dfec65443 100644
--- a/share/doc/ja_JP.EUC/handbook/porting.sgml
+++ b/share/doc/ja_JP.EUC/handbook/porting.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.62 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/ports.sgml b/share/doc/ja_JP.EUC/handbook/ports.sgml
index 3d8ce8fce50..e0ef8d3448c 100644
--- a/share/doc/ja_JP.EUC/handbook/ports.sgml
+++ b/share/doc/ja_JP.EUC/handbook/ports.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.21 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/ppp.sgml b/share/doc/ja_JP.EUC/handbook/ppp.sgml
index 26a77417680..977dd16a079 100644
--- a/share/doc/ja_JP.EUC/handbook/ppp.sgml
+++ b/share/doc/ja_JP.EUC/handbook/ppp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.9 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/printing.sgml b/share/doc/ja_JP.EUC/handbook/printing.sgml
index b5095e2f8a9..3fda29c7552 100644
--- a/share/doc/ja_JP.EUC/handbook/printing.sgml
+++ b/share/doc/ja_JP.EUC/handbook/printing.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.17 -->
 <!-- This is an SGML document in the linuxdoc DTD describing
diff --git a/share/doc/ja_JP.EUC/handbook/quotas.sgml b/share/doc/ja_JP.EUC/handbook/quotas.sgml
index 6019f733e99..89beb154b60 100644
--- a/share/doc/ja_JP.EUC/handbook/quotas.sgml
+++ b/share/doc/ja_JP.EUC/handbook/quotas.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/relnotes.sgml b/share/doc/ja_JP.EUC/handbook/relnotes.sgml
index 53fde571b5f..d0dec2fb348 100644
--- a/share/doc/ja_JP.EUC/handbook/relnotes.sgml
+++ b/share/doc/ja_JP.EUC/handbook/relnotes.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.20 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/routing.sgml b/share/doc/ja_JP.EUC/handbook/routing.sgml
index 94c99b61a25..4696263d1cf 100644
--- a/share/doc/ja_JP.EUC/handbook/routing.sgml
+++ b/share/doc/ja_JP.EUC/handbook/routing.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/scsi.sgml b/share/doc/ja_JP.EUC/handbook/scsi.sgml
index d29a689254b..686fa390fa9 100644
--- a/share/doc/ja_JP.EUC/handbook/scsi.sgml
+++ b/share/doc/ja_JP.EUC/handbook/scsi.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.21 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/sections.sgml b/share/doc/ja_JP.EUC/handbook/sections.sgml
index 2af5db85d49..86bb8a8934c 100644
--- a/share/doc/ja_JP.EUC/handbook/sections.sgml
+++ b/share/doc/ja_JP.EUC/handbook/sections.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.21 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/serial.sgml b/share/doc/ja_JP.EUC/handbook/serial.sgml
index 80e66166f61..6c2e8ab08be 100644
--- a/share/doc/ja_JP.EUC/handbook/serial.sgml
+++ b/share/doc/ja_JP.EUC/handbook/serial.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.2 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/sio.sgml b/share/doc/ja_JP.EUC/handbook/sio.sgml
index 96ca9305775..6fed1f9a43a 100644
--- a/share/doc/ja_JP.EUC/handbook/sio.sgml
+++ b/share/doc/ja_JP.EUC/handbook/sio.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/skey.sgml b/share/doc/ja_JP.EUC/handbook/skey.sgml
index 540d6a05630..7061d034ca9 100644
--- a/share/doc/ja_JP.EUC/handbook/skey.sgml
+++ b/share/doc/ja_JP.EUC/handbook/skey.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 <!-- 和訳: hino@nwk.CL.nec.co.jp 1996/09/24 -->
diff --git a/share/doc/ja_JP.EUC/handbook/slipc.sgml b/share/doc/ja_JP.EUC/handbook/slipc.sgml
index efb0eae8c53..eb83e9d7847 100644
--- a/share/doc/ja_JP.EUC/handbook/slipc.sgml
+++ b/share/doc/ja_JP.EUC/handbook/slipc.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/slips.sgml b/share/doc/ja_JP.EUC/handbook/slips.sgml
index d56c6b758b4..9b477a01034 100644
--- a/share/doc/ja_JP.EUC/handbook/slips.sgml
+++ b/share/doc/ja_JP.EUC/handbook/slips.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.12 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/stable.sgml b/share/doc/ja_JP.EUC/handbook/stable.sgml
index a3bd1b88fc6..75d2d371561 100644
--- a/share/doc/ja_JP.EUC/handbook/stable.sgml
+++ b/share/doc/ja_JP.EUC/handbook/stable.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
@@ -11,7 +11,7 @@
 
                         THE FREEBSD STABLE POLICY 
 
-Last updated: $Date: 1997/01/15 13:16:46 $
+Last updated: $Date: 1997/01/19 17:28:19 $
 
 This document attempts to explain the rationale behind
 FreeBSD-stable, what you should expect should you decide to run it,
diff --git a/share/doc/ja_JP.EUC/handbook/submitters.sgml b/share/doc/ja_JP.EUC/handbook/submitters.sgml
index 69d6b769479..dfc5d4488b0 100644
--- a/share/doc/ja_JP.EUC/handbook/submitters.sgml
+++ b/share/doc/ja_JP.EUC/handbook/submitters.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.40 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/sup.sgml b/share/doc/ja_JP.EUC/handbook/sup.sgml
index d80243dcb59..032a7e64176 100644
--- a/share/doc/ja_JP.EUC/handbook/sup.sgml
+++ b/share/doc/ja_JP.EUC/handbook/sup.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.24 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/synching.sgml b/share/doc/ja_JP.EUC/handbook/synching.sgml
index 52140b557e6..4344cadecd9 100644
--- a/share/doc/ja_JP.EUC/handbook/synching.sgml
+++ b/share/doc/ja_JP.EUC/handbook/synching.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.8 -->
 
@@ -9,7 +9,7 @@
 
 <!--
 
-Last updated: $Date: 1997/01/14 06:27:53 $
+Last updated: $Date: 1997/01/15 13:16:49 $
 
 This document tries to describe the various ways in which a user may
 use the internet to keep development sources in synch.
diff --git a/share/doc/ja_JP.EUC/handbook/term.sgml b/share/doc/ja_JP.EUC/handbook/term.sgml
index d51941f6ed3..38097ef41cb 100644
--- a/share/doc/ja_JP.EUC/handbook/term.sgml
+++ b/share/doc/ja_JP.EUC/handbook/term.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.6 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/troubleshooting.sgml b/share/doc/ja_JP.EUC/handbook/troubleshooting.sgml
index 853ed82e50d..ea31b020095 100644
--- a/share/doc/ja_JP.EUC/handbook/troubleshooting.sgml
+++ b/share/doc/ja_JP.EUC/handbook/troubleshooting.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.5 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/uart.sgml b/share/doc/ja_JP.EUC/handbook/uart.sgml
index a399bba6d00..e2b956cdbaf 100644
--- a/share/doc/ja_JP.EUC/handbook/uart.sgml
+++ b/share/doc/ja_JP.EUC/handbook/uart.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.4 -->
 
diff --git a/share/doc/ja_JP.EUC/handbook/userppp.sgml b/share/doc/ja_JP.EUC/handbook/userppp.sgml
index edc8a14dda5..4846dde4ba4 100644
--- a/share/doc/ja_JP.EUC/handbook/userppp.sgml
+++ b/share/doc/ja_JP.EUC/handbook/userppp.sgml
@@ -1,4 +1,4 @@
-<!-- $FreeBSD$ -->
+<!-- $Id$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
 <!-- Original revision: 1.11 -->
 
diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile
index 872474ea15f..141c32d22ee 100644
--- a/share/doc/papers/Makefile
+++ b/share/doc/papers/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SUBDIR=	beyond4.3 diskperf fsinterface kernmalloc kerntune malloc memfs \
 	newvm nqnfs px relengr sysperf \
diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile
index af39a475e3f..7f9858ebcfb 100644
--- a/share/doc/papers/beyond4.3/Makefile
+++ b/share/doc/papers/beyond4.3/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.2 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 SRCS=	beyond43.ms
diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile
index bb79a9e852e..2a34acc418c 100644
--- a/share/doc/papers/contents/Makefile
+++ b/share/doc/papers/contents/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	contents
diff --git a/share/doc/papers/contents/contents.ms b/share/doc/papers/contents/contents.ms
index bf96340481c..d305ea93109 100644
--- a/share/doc/papers/contents/contents.ms
+++ b/share/doc/papers/contents/contents.ms
@@ -21,7 +21,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .OH '''Papers Contents'
 .EH 'Papers Contents'''
diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile
index b6d315f9d14..1b9ccd32348 100644
--- a/share/doc/papers/diskperf/Makefile
+++ b/share/doc/papers/diskperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	diskperf
diff --git a/share/doc/papers/diskperf/conclusions.ms b/share/doc/papers/diskperf/conclusions.ms
index 2abdcc353fd..9c39a509121 100644
--- a/share/doc/papers/diskperf/conclusions.ms
+++ b/share/doc/papers/diskperf/conclusions.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)conclusions.ms	6.2 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .ds RH Conclusions
 .NH
diff --git a/share/doc/papers/diskperf/tests.ms b/share/doc/papers/diskperf/tests.ms
index e65b5d253e1..e5074084132 100644
--- a/share/doc/papers/diskperf/tests.ms
+++ b/share/doc/papers/diskperf/tests.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tests.ms	6.2 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .ds RH Tests
 .NH
diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile
index 287544bd99d..3eccadd88ab 100644
--- a/share/doc/papers/fsinterface/Makefile
+++ b/share/doc/papers/fsinterface/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	fsinterface
diff --git a/share/doc/papers/fsinterface/fsinterface.ms b/share/doc/papers/fsinterface/fsinterface.ms
index e8462fc741b..043d7cba21b 100644
--- a/share/doc/papers/fsinterface/fsinterface.ms
+++ b/share/doc/papers/fsinterface/fsinterface.ms
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)fsinterface.ms	1.4 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .if \nv .rm CM
 .de UX
diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile
index 2ed1159f940..7c97c8224a0 100644
--- a/share/doc/papers/kernmalloc/Makefile
+++ b/share/doc/papers/kernmalloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	kernmalloc
diff --git a/share/doc/papers/kernmalloc/kernmalloc.t b/share/doc/papers/kernmalloc/kernmalloc.t
index 8e3a780fdb8..0b8bb0815fa 100644
--- a/share/doc/papers/kernmalloc/kernmalloc.t
+++ b/share/doc/papers/kernmalloc/kernmalloc.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)kernmalloc.t	5.1 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .\" reference a system routine name
 .de RN
diff --git a/share/doc/papers/kerntune/1.t b/share/doc/papers/kerntune/1.t
index 196a80a979b..88adf40b5d6 100644
--- a/share/doc/papers/kerntune/1.t
+++ b/share/doc/papers/kerntune/1.t
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	1.2 (Berkeley) 11/8/90
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .ds RH Introduction
 .NH 1
diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile
index f7cc030ae8a..097493f93f7 100644
--- a/share/doc/papers/kerntune/Makefile
+++ b/share/doc/papers/kerntune/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.5 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	kerntune
diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile
index 7e81ca1ca28..db5022d978b 100644
--- a/share/doc/papers/malloc/Makefile
+++ b/share/doc/papers/malloc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	6.3 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	malloc
diff --git a/share/doc/papers/malloc/abs.ms b/share/doc/papers/malloc/abs.ms
index b92c2d14930..041467fa97a 100644
--- a/share/doc/papers/malloc/abs.ms
+++ b/share/doc/papers/malloc/abs.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .if n .ND
 .TL
diff --git a/share/doc/papers/malloc/alternatives.ms b/share/doc/papers/malloc/alternatives.ms
index 36acdeecb1d..f644635b444 100644
--- a/share/doc/papers/malloc/alternatives.ms
+++ b/share/doc/papers/malloc/alternatives.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Alternative implementations
 .NH
diff --git a/share/doc/papers/malloc/conclusion.ms b/share/doc/papers/malloc/conclusion.ms
index 1643c9018c0..1cf28c61fe4 100644
--- a/share/doc/papers/malloc/conclusion.ms
+++ b/share/doc/papers/malloc/conclusion.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Conclusion and experience.
 .NH
diff --git a/share/doc/papers/malloc/implementation.ms b/share/doc/papers/malloc/implementation.ms
index 7dbb10f2a32..19d465b1c81 100644
--- a/share/doc/papers/malloc/implementation.ms
+++ b/share/doc/papers/malloc/implementation.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Implementation
 .NH
diff --git a/share/doc/papers/malloc/intro.ms b/share/doc/papers/malloc/intro.ms
index 49f6acd42af..6880827af6e 100644
--- a/share/doc/papers/malloc/intro.ms
+++ b/share/doc/papers/malloc/intro.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Introduction
 .NH
diff --git a/share/doc/papers/malloc/kernel.ms b/share/doc/papers/malloc/kernel.ms
index 50f654f0795..e6dd0fbad26 100644
--- a/share/doc/papers/malloc/kernel.ms
+++ b/share/doc/papers/malloc/kernel.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH The kernel and memory
 .NH
diff --git a/share/doc/papers/malloc/malloc.ms b/share/doc/papers/malloc/malloc.ms
index ced8957748c..29203d3654e 100644
--- a/share/doc/papers/malloc/malloc.ms
+++ b/share/doc/papers/malloc/malloc.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Malloc and free
 .NH
diff --git a/share/doc/papers/malloc/performance.ms b/share/doc/papers/malloc/performance.ms
index 997a5a80cf7..0792dedc338 100644
--- a/share/doc/papers/malloc/performance.ms
+++ b/share/doc/papers/malloc/performance.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH Performance
 .NH
diff --git a/share/doc/papers/malloc/problems.ms b/share/doc/papers/malloc/problems.ms
index cc8f55182b9..112e1da81f6 100644
--- a/share/doc/papers/malloc/problems.ms
+++ b/share/doc/papers/malloc/problems.ms
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $FreeBSD$
+.\" $Id$
 .\"
 .ds RH The problems
 .NH
diff --git a/share/doc/papers/memfs/Makefile b/share/doc/papers/memfs/Makefile
index 581af35daef..82c3365ea40 100644
--- a/share/doc/papers/memfs/Makefile
+++ b/share/doc/papers/memfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.8 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	memfs
diff --git a/share/doc/papers/newvm/1.t b/share/doc/papers/newvm/1.t
index 7b66674085a..2e166fe9474 100644
--- a/share/doc/papers/newvm/1.t
+++ b/share/doc/papers/newvm/1.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.t	5.1 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .NH
 Motivations for a New Virtual Memory System
diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile
index 3d1fb09cf06..2bddf9d415f 100644
--- a/share/doc/papers/newvm/Makefile
+++ b/share/doc/papers/newvm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.4 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	newvm
diff --git a/share/doc/papers/newvm/a.t b/share/doc/papers/newvm/a.t
index 5a9bac4494e..41e5ff7fad3 100644
--- a/share/doc/papers/newvm/a.t
+++ b/share/doc/papers/newvm/a.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)a.t	5.1 (Berkeley) 4/16/91
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .sp 2
 .ne 2i
diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile
index 5733e20c953..316cdd79fc0 100644
--- a/share/doc/papers/nqnfs/Makefile
+++ b/share/doc/papers/nqnfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 4/20/94
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	nqnfs
diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile
index 0bd4323a0e2..d068a078926 100644
--- a/share/doc/papers/px/Makefile
+++ b/share/doc/papers/px/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.3 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	px
diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile
index c12f9f6d443..da1b8bf6600 100644
--- a/share/doc/papers/relengr/Makefile
+++ b/share/doc/papers/relengr/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	releng
diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile
index 531cc94cef5..ae567bce547 100644
--- a/share/doc/papers/sysperf/Makefile
+++ b/share/doc/papers/sysperf/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	1.6 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	papers
 DOC=	sysperf
diff --git a/share/doc/psd/05.sysman/1.2.t b/share/doc/psd/05.sysman/1.2.t
index 2d5f2533155..1a77f773c4f 100644
--- a/share/doc/psd/05.sysman/1.2.t
+++ b/share/doc/psd/05.sysman/1.2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)1.2.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .sh "Memory management\(dg
 .NH 3
diff --git a/share/doc/psd/05.sysman/2.3.t b/share/doc/psd/05.sysman/2.3.t
index 001ab1f4bb4..8cb60a08847 100644
--- a/share/doc/psd/05.sysman/2.3.t
+++ b/share/doc/psd/05.sysman/2.3.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.3.t	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .sh "Interprocess communications
 .NH 3
diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile
index 1d6153da532..6881a28cf71 100644
--- a/share/doc/psd/05.sysman/Makefile
+++ b/share/doc/psd/05.sysman/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/05.sysman
 SRCS=	0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \
diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile
index f44af918c02..0fad5f7396e 100644
--- a/share/doc/psd/12.make/Makefile
+++ b/share/doc/psd/12.make/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/12.make
 SRCS=	tutorial.ms
diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile
index 3e48696794e..4a2c680e115 100644
--- a/share/doc/psd/18.gprof/Makefile
+++ b/share/doc/psd/18.gprof/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/18.gprof
 SRCS=	header.me abstract.me intro.me profiling.me gathering.me \
diff --git a/share/doc/psd/19.curses/Makefile b/share/doc/psd/19.curses/Makefile
index 8fb69a67c5a..c2e775132c1 100644
--- a/share/doc/psd/19.curses/Makefile
+++ b/share/doc/psd/19.curses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/19.curses
 SRCS=	Master
diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile
index b4e3e99326b..2c8befd5e68 100644
--- a/share/doc/psd/20.ipctut/Makefile
+++ b/share/doc/psd/20.ipctut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/20.ipctut
 SRCS=	tutor.me
diff --git a/share/doc/psd/21.ipc/5.t b/share/doc/psd/21.ipc/5.t
index 58275d02265..25fd4e5bef4 100644
--- a/share/doc/psd/21.ipc/5.t
+++ b/share/doc/psd/21.ipc/5.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)5.t	8.1 (Berkeley) 8/14/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .\".ds RH "Advanced Topics
 .bp
diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile
index d3cfb083436..c825d14f3b6 100644
--- a/share/doc/psd/21.ipc/Makefile
+++ b/share/doc/psd/21.ipc/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/21.ipc
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t
diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile
index bd8f0afa5d5..6bf3fb638b5 100644
--- a/share/doc/psd/22.rpcgen/Makefile
+++ b/share/doc/psd/22.rpcgen/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/22.rpcgen
 SRCS=	rpcgen.ms
diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile
index 0455a1f5bab..78a0bcea719 100644
--- a/share/doc/psd/23.rpc/Makefile
+++ b/share/doc/psd/23.rpc/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/23.rpc
 SRCS=	rpc.prog.ms
diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile
index b65f68a5471..dbff9a145e2 100644
--- a/share/doc/psd/24.xdr/Makefile
+++ b/share/doc/psd/24.xdr/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/24.xdr
 SRCS=	xdr.nts.ms
diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile
index 6b9262f7e49..28bf75670c0 100644
--- a/share/doc/psd/25.xdrrfc/Makefile
+++ b/share/doc/psd/25.xdrrfc/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/25.xdrrfc
 SRCS=	xdr.rfc.ms
diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile
index 2e522746839..88107dea503 100644
--- a/share/doc/psd/26.rpcrfc/Makefile
+++ b/share/doc/psd/26.rpcrfc/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/26.rpcrfc
 SRCS=	rpc.rfc.ms
diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile
index b77ad7f9bde..bcdc4274e13 100644
--- a/share/doc/psd/27.nfsrpc/Makefile
+++ b/share/doc/psd/27.nfsrpc/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd/27.nfsrfc
 SRCS=	nfs.rfc.ms
diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile
index 0ec83980a53..dbeac7af1e2 100644
--- a/share/doc/psd/Makefile
+++ b/share/doc/psd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 # The following modules do not build/install:
 # 10.gdb, 13.rcs
diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile
index cf05eb92179..421308f3e4e 100644
--- a/share/doc/psd/contents/Makefile
+++ b/share/doc/psd/contents/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd
 SRCS=	contents.ms
diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile
index 4ff7d6d0de0..9762851e7b2 100644
--- a/share/doc/psd/title/Makefile
+++ b/share/doc/psd/title/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	psd
 SRCS=	Title
diff --git a/share/doc/smm/01.setup/2.t b/share/doc/smm/01.setup/2.t
index e076ac1f1d7..bf1ddfb58c9 100644
--- a/share/doc/smm/01.setup/2.t
+++ b/share/doc/smm/01.setup/2.t
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)2.t	8.1 (Berkeley) 7/27/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .ds lq ``
 .ds rq ''
diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile
index 80164cbf08a..0aabf0636ef 100644
--- a/share/doc/smm/01.setup/Makefile
+++ b/share/doc/smm/01.setup/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 7/27/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/01.setup
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile
index ba6b8e6724c..53ccfdb6b7c 100644
--- a/share/doc/smm/02.config/Makefile
+++ b/share/doc/smm/02.config/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/02.config
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t
diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile
index d49d6affe8f..055f7b85d80 100644
--- a/share/doc/smm/03.fsck/Makefile
+++ b/share/doc/smm/03.fsck/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/03.fsck
 SRCS=	0.t 1.t 2.t 3.t 4.t
diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile
index 3832e70585b..f97818a9d66 100644
--- a/share/doc/smm/04.quotas/Makefile
+++ b/share/doc/smm/04.quotas/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/04.quotas
 SRCS=	quotas.ms
diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile
index d88dea5dca2..cbe4794c649 100644
--- a/share/doc/smm/05.fastfs/Makefile
+++ b/share/doc/smm/05.fastfs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/05.fastfs
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t
diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile
index 3965603372f..ff8f631a9da 100644
--- a/share/doc/smm/06.nfs/Makefile
+++ b/share/doc/smm/06.nfs/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/06.nfs
 SRCS=	0.t 1.t 2.t ref.t
diff --git a/share/doc/smm/07.lpd/Makefile b/share/doc/smm/07.lpd/Makefile
index 977fceb2d3f..bab42d6baff 100644
--- a/share/doc/smm/07.lpd/Makefile
+++ b/share/doc/smm/07.lpd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/07.lpd
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t
diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile
index 4053561ca6c..eecdd0db509 100644
--- a/share/doc/smm/08.sendmailop/Makefile
+++ b/share/doc/smm/08.sendmailop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/08.sendmailop
 SRCS=	op.me
diff --git a/share/doc/smm/09.sendmail/Makefile b/share/doc/smm/09.sendmail/Makefile
index 8feb3ba8931..77622cc0e8a 100644
--- a/share/doc/smm/09.sendmail/Makefile
+++ b/share/doc/smm/09.sendmail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 2/28/94
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/09.sendmail
 SRCS=	intro.me
diff --git a/share/doc/smm/10.named/Makefile b/share/doc/smm/10.named/Makefile
index 433d446548f..4c31e138bb1 100644
--- a/share/doc/smm/10.named/Makefile
+++ b/share/doc/smm/10.named/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 SRCDIR=	${.CURDIR}/../../../../contrib/bind/doc/bog
 
diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile
index eabcbdb910f..56f510610c1 100644
--- a/share/doc/smm/11.timedop/Makefile
+++ b/share/doc/smm/11.timedop/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/11.timedop
 SRCS=	timed.ms
diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile
index bd10cd4e851..eb903b441f0 100644
--- a/share/doc/smm/12.timed/Makefile
+++ b/share/doc/smm/12.timed/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/12.timed
 SRCS=	timed.ms
diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile
index 4c5cd153b16..a8cbbae69f2 100644
--- a/share/doc/smm/18.net/Makefile
+++ b/share/doc/smm/18.net/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm/18.net
 SRCS=	0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t
diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile
index fd9f0351e9d..e8a500fe7bc 100644
--- a/share/doc/smm/Makefile
+++ b/share/doc/smm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$FreeBSD$
+#	$Id$
 
 # The following modules do not describe FreeBSD:
 # 14.uucpimpl, 15.uucpnet
diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile
index fb1822ddb1a..24d90896cb2 100644
--- a/share/doc/smm/contents/Makefile
+++ b/share/doc/smm/contents/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm
 SRCS=	contents.ms
diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile
index 7dd3b7ac390..98d12be9d03 100644
--- a/share/doc/smm/title/Makefile
+++ b/share/doc/smm/title/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	smm
 SRCS=	Title
diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile
index d5e2f625567..b2d3187d858 100644
--- a/share/doc/usd/04.csh/Makefile
+++ b/share/doc/usd/04.csh/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g
diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile
index 97896ac8a33..c87560bebcc 100644
--- a/share/doc/usd/07.mail/Makefile
+++ b/share/doc/usd/07.mail/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/07.mail
 SRCS=	mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \
diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile
index f9dcf36d706..1eed74e04ae 100644
--- a/share/doc/usd/10.exref/Makefile
+++ b/share/doc/usd/10.exref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/10.exref
 SRCS=	ex.rm
diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile
index 025587d151c..199fc681cb7 100644
--- a/share/doc/usd/11.vitut/Makefile
+++ b/share/doc/usd/11.vitut/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/11.edit
 SRCS=	edittut.ms
diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile
index fae19567956..d6d02b6e878 100644
--- a/share/doc/usd/12.vi/Makefile
+++ b/share/doc/usd/12.vi/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/12.vi
 SRCS=	vi.in vi.chars
diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile
index 179bc9bd7bd..c8caeda7779 100644
--- a/share/doc/usd/13.viref/Makefile
+++ b/share/doc/usd/13.viref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.16 (Berkeley) 8/15/94
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/13.viref
 SRCS=	vi.ref
diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile
index b4228c6e21f..3a5456a8977 100644
--- a/share/doc/usd/18.msdiffs/Makefile
+++ b/share/doc/usd/18.msdiffs/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/18.msdiffs
 SRCS=	ms.diffs
diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile
index c248ab98f4c..780c2b7669e 100644
--- a/share/doc/usd/19.memacros/Makefile
+++ b/share/doc/usd/19.memacros/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/19.memacros
 SRCS=	intro.me
diff --git a/share/doc/usd/19.memacros/intro.me b/share/doc/usd/19.memacros/intro.me
index d2ff079ebc1..b6b67969916 100644
--- a/share/doc/usd/19.memacros/intro.me
+++ b/share/doc/usd/19.memacros/intro.me
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)intro.me	8.1 (Berkeley) 6/8/93
-.\"	$FreeBSD$
+.\"	$Id$
 .\"
 .UC 7
 .ll 6.5i
diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile
index f284692f510..8833858ff52 100644
--- a/share/doc/usd/20.meref/Makefile
+++ b/share/doc/usd/20.meref/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd/20.meref
 SRCS=	ref.me
diff --git a/share/doc/usd/30.rogue/Makefile b/share/doc/usd/30.rogue/Makefile
index b6107bf8836..96daba8225a 100644
--- a/share/doc/usd/30.rogue/Makefile
+++ b/share/doc/usd/30.rogue/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/30.rogue
diff --git a/share/doc/usd/31.trek/Makefile b/share/doc/usd/31.trek/Makefile
index c0451fb99d8..439664e7b7c 100644
--- a/share/doc/usd/31.trek/Makefile
+++ b/share/doc/usd/31.trek/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/8/93
-#	$FreeBSD$
+#	$Id$
 
 .if exists(${.CURDIR}/../../../../games)
 VOLUME=	usd/31.trek
diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile
index ffa8984836a..4e7ec19bba2 100644
--- a/share/doc/usd/Makefile
+++ b/share/doc/usd/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 4/20/94
-#	$FreeBSD$
+#	$Id$
 
 # The following modules are encumbered:
 # 01.begin 02.learn 03.shell 05.dc 06.bc 09.edtut 10.edadv 15.sed 16.awk
diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile
index 72524bbdb28..b7bc9c0cb0f 100644
--- a/share/doc/usd/contents/Makefile
+++ b/share/doc/usd/contents/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd
 SRCS=	contents.ms
diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile
index 8f880c1849f..96df227f126 100644
--- a/share/doc/usd/title/Makefile
+++ b/share/doc/usd/title/Makefile
@@ -1,4 +1,4 @@
-#	$FreeBSD$
+#	$Id$
 
 VOLUME=	usd
 SRCS=	Title