This commit was manufactured by cvs2svn to create tag

'RELENG_3_3_0_RELEASE'.

COPYRIGHT

@@ -1,4 +1,4 @@
-#	$Id:$
+# $FreeBSD$
 #	@(#)COPYRIGHT	8.2 (Berkeley) 3/21/94
 
 All of the documentation and software included in the 4.4BSD and 4.4BSD-Lite
@@ -63,3 +63,35 @@ The views and conclusions contained in the software and documentation are
 those of the authors and should not be interpreted as representing official
 policies, either expressed or implied, of the Regents of the University
 of California.
+
+
+NOTE: The copyright of UC Berkeley's Berkeley Software Distribution ("BSD")
+source has been updated.  The copyright addendum may be found at
+ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change and is
+included below.
+
+July 22, 1999
+
+To All Licensees, Distributors of Any Version of BSD:
+
+As you know, certain of the Berkeley Software Distribution ("BSD") source
+code files require that further distributions of products containing all or
+portions of the software, acknowledge within their advertising materials
+that such products contain software developed by UC Berkeley and its
+contributors.
+
+Specifically, the provision reads:
+
+"     * 3. All advertising materials mentioning features or use of this software
+      *    must display the following acknowledgement:
+      *    This product includes software developed by the University of
+      *    California, Berkeley and its contributors."
+
+Effective immediately, licensees and distributors are no longer required to
+include the acknowledgement within advertising materials.  Accordingly, the
+foregoing paragraph of those BSD Unix files containing it is hereby deleted
+in its entirety.
+
+William Hoskins
+Director, Office of Technology Licensing
+University of California, Berkeley

Makefile

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile,v 1.221 1998/10/17 15:25:26 bde Exp $
+# $FreeBSD$
 #
 # The user-driven targets are:
 #
@@ -8,6 +8,7 @@
 # installworld        - Install everything built by "buildworld".
 # world               - buildworld + installworld.
 # update              - Convenient way to update your source tree (cvs).
+# upgrade             - Upgrade a.out (2.2.x/3.0) system to the new ELF way
 # most                - Build user commands, no libraries or include files.
 # installmost         - Install user commands, no libraries or include files.
 # aout-to-elf         - Upgrade an system from a.out to elf format (see below).
@@ -51,7 +52,7 @@
 # or 3.0. If OBJFORMAT is set as an environment variable or in /etc/make.conf,
 # this overrides /etc/objformat.
 #
-# Unless -DNOAOUT is specified, a `make world' with OBJFORMAT=elf will
+# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will
 # update the legacy support for aout. This includes all libraries, ld.so
 # and boot objects. This part of build should be regarded as
 # deprecated and you should _not_ expect to be able to do this past the
@@ -63,25 +64,19 @@
 #           Upgrading an i386 system from a.out to elf format
 #
 #
-# The aout->elf transition build is performed by doing a `make aout-to-elf'
-# or a `make aout-to-elf-build' followed by a `make aout-to-elf-install'.
+# The aout->elf transition build is performed by doing a `make upgrade' (or
+# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed
+# by a `make aout-to-elf-install', depending on user preference.
 # You need to have at least 320 Mb of free space for the object tree.
 #
 # The upgrade process checks the installed release. If this is 3.0-CURRENT,
 # it is assumed that your kernel contains all the syscalls required by the
 # current sources.
 #
-# For installed systems where `uname -r' reports something other than
-# 3.0-CURRENT, the upgrade process expects to build a kernel using the
-# kernel configuration file sys/i386/conf/GENERICupgrade. This file is
-# defaulted to the GENERIC kernel configuration file on the assumption that
-# it will be suitable for most systems. Before performing the upgrade,
-# replace sys/i386/conf/GENERICupgrade with your own version if your
-# hardware requires a different configuration.
-#
 # The upgrade procedure will stop and ask for confirmation to proceed
 # several times. On each occasion, you can type Ctrl-C to abort the
-# upgrade.
+# upgrade.  Optionally, you can also start it with NOCONFIRM=yes and skip
+# the confirmation steps.
 #
 # At the end of the upgrade procedure, /etc/objformat is created or
 # updated to contain OBJFORMAT=elf. From then on, you're elf by default.
@@ -102,7 +97,7 @@ TGTS =	afterdistribute all buildworld checkdpadd clean cleandepend cleandir \
 #
 ${TGTS} : upgrade_checks
 	@cd ${.CURDIR}; \
-		make -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET}
+		${MAKE} -f Makefile.inc0 -m ${.CURDIR}/share/mk ${.TARGET}
 
 # Set a reasonable default
 .MAIN:	all
@@ -116,7 +111,7 @@ ${TGTS} : upgrade_checks
 # the system to current.
 #
 upgrade_checks :
-	@cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else make -f Makefile.upgrade make; fi;
+	@cd ${.CURDIR}; if `make -m ${.CURDIR}/share/mk test > /dev/null 2>&1`; then ok=1; else ${MAKE} -f Makefile.upgrade make; fi;
 
 #
 # A simple test target used as part of the test to see if make supports
@@ -134,6 +129,9 @@ UPGRADE =	aout-to-elf aout-to-elf-build aout-to-elf-install \
 #
 # Handle the upgrade targets, using the source relative mk files.
 #
+
+upgrade:	aout-to-elf
+
 ${UPGRADE} : upgrade_checks
 	@cd ${.CURDIR}; \
-		make -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}
+		${MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}

Makefile.inc0

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $
+# $FreeBSD$
 #
 # This makefile ensures that the object directory is set according to the
 # object format to avoid mixing aout and elf formatted files during the
@@ -59,6 +59,7 @@ LEGACY_ENV=	PATH=${ELFTMPPATH} OBJFORMAT=aout NOTOOLS=1 TOOLROOT=${ELFTMP} \
 		MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout
 XMAKE=		${ELFTMP}/usr/bin/${MAKE}
 
+STARTTIME!= LC_TIME=C date
 #
 # world
 #
@@ -68,7 +69,7 @@ XMAKE=		${ELFTMP}/usr/bin/${MAKE}
 #
 world:
 	@echo "--------------------------------------------------------------"
-	@echo ">>> ${OBJFORMAT} make world started on `LC_TIME=C date`"
+	@echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
 .if target(pre-world)
 	@echo
@@ -78,11 +79,11 @@ world:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} pre-world
 .endif
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
 .endif
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} -B installworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-install
 .endif
 .if target(post-world)
@@ -94,6 +95,7 @@ world:
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
+	@echo ">>> ${OBJFORMAT} make world started on ${STARTTIME}"
 	@echo ">>> ${OBJFORMAT} make world completed on `LC_TIME=C date`"
 	@echo "--------------------------------------------------------------"
 
@@ -105,7 +107,7 @@ world:
 #
 buildworld	:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
 .endif
 
@@ -117,6 +119,6 @@ buildworld	:
 #
 installworld	:
 	@cd ${.CURDIR}; ${MK_ENV} ${MAKE} installworld
-.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
+.if	${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
 	@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} -DNOMAN -DNOINFO legacy-install
 .endif

Makefile.inc1

@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.58 1999/01/07 13:09:15 eivind Exp $
+# $FreeBSD$
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -189,7 +189,7 @@ COMPILER_ENV=	BISON_SIMPLE=${TOOLROOT}/usr/share/misc/bison.simple \
 BMAKEENV=	PATH=${TMPPATH} ${COMPILER_ENV} NOEXTRADEPEND=t \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec:/usr/libexec
 XMAKEENV=	PATH=${STRICTTMPPATH} ${COMPILER_ENV} \
-		PERL5LIB=${DESTDIR}/usr/libdata/perl/5.00502 \
+		PERL5LIB=${DESTDIR}/usr/libdata/perl/5.00503 \
 		OBJFORMAT_PATH=${TOOLROOT}/usr/libexec \
 		CFLAGS="-nostdinc ${CFLAGS}"	# XXX -nostdlib
 
@@ -226,7 +226,7 @@ buildworld: check-objformat
 	@echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
 	@echo "--------------------------------------------------------------"
 	mkdir -p ${WORLDTMP}
-	chflags -R noschg ${WORLDTMP}/
+	-chflags -R noschg ${WORLDTMP}/
 	rm -rf ${WORLDTMP}
 .endif
 .if !defined(NOTOOLS)
@@ -363,13 +363,15 @@ reinstall:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Re-scanning the shared libraries.."
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; /sbin/ldconfig -R
+	-cd ${.CURDIR}; /sbin/ldconfig -R
 .endif
+.if !defined(NOMAN)
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> Rebuilding man page indexes"
+	@echo ">>> Rebuilding man page indices"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}/share/man; ${MAKE} makedb
+.endif
 
 #
 # update
@@ -567,6 +569,7 @@ includes:
 	cd ${.CURDIR}/lib/libss;		${MAKE} -B hdrs beforeinstall
 	cd ${.CURDIR}/lib/libutil;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libvgl;		${MAKE} beforeinstall
+	cd ${.CURDIR}/lib/libwrap;		${MAKE} beforeinstall
 	cd ${.CURDIR}/lib/libz;			${MAKE} beforeinstall
 	cd ${.CURDIR}/usr.bin/f2c;		${MAKE} beforeinstall
 	cd ${.CURDIR}/usr.bin/lex;		${MAKE} beforeinstall

Makefile.upgrade

@@ -1,10 +1,15 @@
 #
-#	$Id: Makefile.upgrade,v 1.8 1999/01/07 06:30:14 peter Exp $
+# $FreeBSD$
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
 #
 
+#
+# Make sure the PATH is set correctly
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 #
 # Build things relative to the user's preferred object directory,
 # defaulting to /usr/obj if not defined.
@@ -39,15 +44,23 @@ make	:
 # with them (in case the installed kernel is an older version), then 
 # install the elf world.
 #
-aout-to-elf aout-to-elf-install :				\
+aout-to-elf aout-to-elf-install :	/var/db/update.cfg	\
 		${MAKEOBJDIRPREFIX}/do_aout_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_elf_buildworld		\
 		${MAKEOBJDIRPREFIX}/do_move_aout_libs		\
 		${MAKEOBJDIRPREFIX}/do_aout_installworld	\
-		${MAKEOBJDIRPREFIX}/do_aout_kernel		\
 		${MAKEOBJDIRPREFIX}/do_elf_installworld		\
+		${MAKEOBJDIRPREFIX}/do_elf_kernel		\
 		${MAKEOBJDIRPREFIX}/do_set_objformat		\
-		${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+		${MAKEOBJDIRPREFIX}/do_reboot
+
+# front-load all the information we're going to need.
+/var/db/update.cfg:
+	@if [ -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	    env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 1 /var/db/update.cfg; \
+	else \
+	    echo "Your source tree must not be fully populated; unable to find upgrade script"; echo "in ${.CURDIR}/tools/tools/upgrade/doupgrade.sh."; exit 1; \
+	fi
 
 #
 # Just do the build parts of the transition build.
@@ -68,7 +81,7 @@ ${MAKEOBJDIRPREFIX}/do_aout_buildworld :
 	@echo "--------------------------------------------------------------"
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
 		OBJFORMAT=aout REALLY_WANT_DEPRECIATED_AOUT=yes \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_buildworld
 
 #
@@ -88,7 +101,8 @@ ${MAKEOBJDIRPREFIX}/do_elf_buildworld :
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \
 		PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \
 		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
+		X11BASE=/nonexistent \
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk buildworld
 	@touch ${MAKEOBJDIRPREFIX}/do_elf_buildworld
 
 #
@@ -157,15 +171,6 @@ ${MAKEOBJDIRPREFIX}/do_move_aout_libs move-aout-libs :
 # elf world will be updated.
 #
 ${MAKEOBJDIRPREFIX}/do_aout_installworld :
-.if !defined(NOCONFIRM)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are about to update the installed system (or the system"
-	@echo " that your DESTDIR points to). You can type Ctrl-C to abort"
-	@echo " now or press return to start the first phase of the update."
-	@echo "--------------------------------------------------------------"
-	@/bin/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
-.endif
 .if	${INSTALLEDVERSION} < 300003
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -174,51 +179,18 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 	@cp /bin/sh ${MAKEOBJDIRPREFIX}
 	@cp /sbin/reboot ${MAKEOBJDIRPREFIX}
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Doing an aout installworld using the aout tools in the aout"
-	@echo " obj tree."
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
-		PATH=${AOUTTMPPATH} OBJFORMAT=aout NOTOOLS=1 \
-		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_installworld
 
 #
-# The installed kernel may not match the world that is installed, so build
-# a generic kernel, but don't install it. The user can decide if the kernel
-# needs to be installed. Perhaps we should install it in the root
-# directory as an obscure name just in case a reboot is required?
+# Build and install a new kernel, as well as the boot blocks necessary to
+# boot it.
 #
-${MAKEOBJDIRPREFIX}/do_aout_kernel :
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are already running 3.0, so a kernel build"
-	@echo " is probably not required."
-	@echo "--------------------------------------------------------------"
-.else
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Building a generic kernel using the new aout tools"
-	@echo "--------------------------------------------------------------"
-.if	exists(${.CURDIR}/sys/compile/GENERICupgrade)
-	@rm -rf ${.CURDIR}/sys/compile/GENERICupgrade
-.endif
-.if	!exists(${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade)
-	-cp ${.CURDIR}/sys/${MACHINE}/conf/GENERIC \
-		${.CURDIR}/sys/${MACHINE}/conf/GENERICupgrade
-.endif
-	@cd ${.CURDIR}/sys/${MACHINE}/conf; config GENERICupgrade
-	@-cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; \
-		OBJFORMAT=aout make KERNFORMAT=aout depend && \
-		OBJFORMAT=aout make KERNFORMAT=aout all
-.endif
-	@touch ${MAKEOBJDIRPREFIX}/do_aout_kernel
+${MAKEOBJDIRPREFIX}/do_elf_kernel :
+	@if [ -f /var/db/update.cfg -a -f ${.CURDIR}/tools/tools/upgrade/doupgrade.sh ]; then \
+	     env MACHINE=${MACHINE} CURDIR=${.CURDIR} sh ${.CURDIR}/tools/tools/upgrade/doupgrade.sh 2 /var/db/update.cfg; \
+	fi
+	@touch ${MAKEOBJDIRPREFIX}/do_elf_kernel
+	@rm -f /var/db/update.cfg
 
 #
 # Install the elf world overwriting just about all the previously installed
@@ -245,7 +217,10 @@ ${MAKEOBJDIRPREFIX}/do_elf_installworld :
 	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/elf \
 		PATH=${AOUTTMPPATH} OBJFORMAT=elf NOTOOLS=1 \
 		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
+		${MAKE} -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
+	@if [ ! -f /etc/pam.conf ]; then cp ${.CURDIR}/etc/pam.conf /etc; fi
+	@if [ ! -f /etc/auth.conf ]; then cp ${.CURDIR}/etc/auth.conf /etc; fi
+	@if [ ! -f /etc/login.conf ]; then cp ${.CURDIR}/etc/login.conf /etc; fi
 	@touch ${MAKEOBJDIRPREFIX}/do_elf_installworld
 
 #
@@ -261,42 +236,20 @@ ${MAKEOBJDIRPREFIX}/do_set_objformat	:
 	@touch ${MAKEOBJDIRPREFIX}/do_set_objformat
 
 #
-# If not already running a current kernel, install the GENERICupgrade kernel
-# and reboot.
-#
-${MAKEOBJDIRPREFIX}/do_install_kernel_reboot	:
-.if	${INSTALLEDVERSION} >= 300003
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
-	@echo
-	@echo " You should reboot your system now."
-	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
-.else
+# Time to reboot!
+${MAKEOBJDIRPREFIX}/do_reboot	:
 .if !defined(NOCONFIRM)
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo " Your system has been updated to run elf by default!"
+	@echo " Your system has now been fully updated to elf!"
 	@echo
-	@echo " Since you are running ${INSTALLEDNAME}, the kernel must"
-	@echo " be installed before the system is rebooted. You can type"
-	@echo " Ctrl-C to abort the kernel installation (at your own risk),"
-	@echo " or press return for the kernel to be installed and the"
-	@echo " system rebooted."
+	@echo " It's now time to reboot from your new ELF kernel."
+	@echo " You can type Ctrl-C to abort this (at your own risk)"
+	@echo " or press return to reboot the system."
 	@echo "--------------------------------------------------------------"
 	@${MAKEOBJDIRPREFIX}/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Installing a new GENERICupgrade kernel"
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}/sys/compile/GENERICupgrade; make install
-	@echo
-	@echo "--------------------------------------------------------------"
 	@echo " Rebooting......."
 	@echo "--------------------------------------------------------------"
-	@touch ${MAKEOBJDIRPREFIX}/do_install_kernel_reboot
+	@touch ${MAKEOBJDIRPREFIX}/do_reboot
 	@-${MAKEOBJDIRPREFIX}/reboot
-.endif
-

README

@@ -1,5 +1,6 @@
 This is the top level of the FreeBSD source directory.  This file
-was last revised on: $Id: README,v 1.13 1998/09/13 09:38:34 markm Exp $
+was last revised on:
+$FreeBSD$
 
 For copyright information, please see the file COPYRIGHT in this
 directory (additional copyright information also exists for some

UPDATING

@@ -1,11 +1,52 @@
 Updating Information for FreeBSD current users
 
-This file is maintainted by [email protected].  Please send new entries
-in it to him.  It contains a list, in reverse chronologocal order, of
-major breakages in tracking -current.  Not all things will be listed
-here, and it only starts on Novemeber 18, 1998.  If you have an
-earlier version of FreeBSD, you are on your own to get to November 18,
-1998.
+This file is maintained by [email protected].  Please send new entries
+directly to him.  See end of file for further details.
+
+19990510:
+	Previously, one would define "NOAOUT" to keep from building
+	the legacy a.out bits.  Now one would define "WANT_AOUT" to
+	build them.
+
+19990507:
+	New devstat API requires recompilation of libdevstat, systat,
+	iostat, vmstat and rpc.rstatd.  A new kernel is also required.
+	make world + building a kernel should do all of this.  Any
+	ports that use devstat need to be recompiled as well.
+
+19990424:
+	The 'nlpt' driver has changed names to become the 'lpt' driver.
+	See ppbus(4) or http://www.freebsd.org/~nsouch/ppbus.html
+	for proper configuration details.
+
+19990209:
+	New devstat API requires recompilation of libdevstat, systat,
+	iostat, vmstat and rpc.rstatd.  A new kernel is also required.
+	make world + building a kernel should do all of this.  Any
+	ports that use devstat need to be recompiled as well.
+
+19990125:
+	Linux threads options has gone away (they are now standard in
+	the FreeBSD kernel).  A recompile of all libkvm using programs
+	is in order (or better yet a make world).
+
+19990122:
+	On or about this date there was a small window when the boot
+	blocks had some minor problems which seemed to force one to
+	edit /etc/fstab.  This has been corrected, if you are seeing this
+	problem, please rebuild and reinstall your boot blocks.
+
+19990121:
+	Vinum has changed.  The "vinum read" command has changed.  For
+	updates, please see
+
+http://www.freebsd.org/cgi/getmsg.cgi?fetch=800363+0+current/freebsd-current
+
+	for details.  
+
+19990120:
+	Stable branch created.  You might want to consider using this
+	branch.  It is tagged with RELENG_3.
 
 19990119:
 	More work on the syscons driver has been committed.  Since
@@ -85,4 +126,12 @@ earlier version of FreeBSD, you are on your own to get to November 18,
 	to silence warnings from authentication programs (login, etc).
 	See src/etc/pam.conf for a sample.
 
-$Id: UPDATING,v 1.13 1999/01/17 17:39:32 imp Exp $
+This file contains a list, in reverse chronologocal order, of major
+breakages in tracking -stable.  Not all things will be listed here,
+and it only starts on Novemeber 18, 1998.  If you have an earlier
+version of FreeBSD, you are on your own to get to November 18, 1998.
+
+Please filter your entries through Warner ([email protected]) so that
+the style, formatting, etc of this file can be maintained.
+
+$FreeBSD$

bin/Makefile

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.13 1998/08/15 12:27:23 jb Exp $
+# $FreeBSD$
 
 SUBDIR= cat \
 	chio \

bin/Makefile.inc

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile.inc,v 1.9 1997/02/22 14:01:23 peter Exp $
+# $FreeBSD$
 
 BINDIR?=	/bin
 CFLAGS+=	-Wall -Wformat

bin/cat/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	cat
 

bin/cat/cat.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)cat.1	8.3 (Berkeley) 5/2/95
-.\"	$Id: cat.1,v 1.7 1998/05/06 06:49:13 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 2, 1995
 .Dt CAT 1
@@ -91,7 +91,7 @@ characters (with the high bit set) are printed as
 .Ql M-
 (for meta) followed by the character for the low 7 bits.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.

bin/cat/cat.c

@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #endif
 static const char rcsid[] =
-	"$Id: cat.c,v 1.12 1998/09/11 05:48:06 imp Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/chflags/Makefile

@@ -1,10 +0,0 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/6/93
-
-NOSHARED?=yes
-
-PROG=	chflags
-CFLAGS+=-Wall
-SRCS=	chflags.c stat_flags.c
-.PATH:	${.CURDIR}/../../bin/ls
-
-.include <bsd.prog.mk>

bin/chflags/chflags.1

@@ -1,137 +0,0 @@
-.\" Copyright (c) 1989, 1990, 1993, 1994
-.\"	The Regents of the University of California.  All rights reserved.
-.\"
-.\" This code is derived from software contributed to Berkeley by
-.\" the Institute of Electrical and Electronics Engineers, Inc.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
-.\"    may be used to endorse or promote products derived from this software
-.\"    without specific prior written permission.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-.\" SUCH DAMAGE.
-.\"
-.\"	@(#)chflags.1	8.2 (Berkeley) 3/31/94
-.\"	$Id$
-.\"
-.Dd March 31, 1994
-.Dt CHFLAGS 1
-.Os
-.Sh NAME
-.Nm chflags
-.Nd change file flags
-.Sh SYNOPSIS
-.Nm chflags
-.Oo
-.Fl R
-.Op Fl H | Fl L | Fl P
-.Oc
-.Ar flags
-.Ar file ...
-.Sh DESCRIPTION
-The
-.Nm chflags
-utility modifies the file flags of the listed files
-as specified by the
-.Ar flags
-operand.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl H
-If the
-.Fl R
-option is specified, symbolic links on the command line are followed.
-(Symbolic links encountered in the tree traversal are not followed.)
-.It Fl L
-If the
-.Fl R
-option is specified, all symbolic links are followed.
-.It Fl P
-If the
-.Fl R
-option is specified, no symbolic links are followed.
-.It Fl R
-Change the file flags for the file hierarchies rooted
-in the files instead of just the files themselves.
-.El
-.Pp
-Flags are a comma separated list of keywords.
-The following keywords are currently defined:
-.Bd -literal -offset indent compact
-arch	set the archived flag (super-user only)
-dump	set the dump flag
-sappnd	set the system append-only flag (super-user only)
-schg	set the system immutable flag (super-user only)
-sunlnk	set the system undeletable flag (super-user only)
-uappnd	set the user append-only flag (owner or super-user only)
-uchg	set the user immutable flag (owner or super-user only)
-uunlnk	set the user undeletable flag (owner or super-user only)
-archived, sappend, schange, simmutable, uappend, uchange, uimmutable,
-sunlink, uunlink
-	aliases for the above
-.Ed
-.Pp
-Putting the letters
-.Dq no
-before an option causes the flag to be turned off.
-For example:
-.Bd -literal -offset indent compact
-nodump	the file should never be dumped
-.Ed
-.Pp
-Symbolic links do not have flags, so unless the
-.Fl H
-or
-.Fl L
-option is set,
-.Nm chflags
-on a symbolic link always succeeds and has no effect.
-The
-.Fl H ,
-.Fl L
-and
-.Fl P
-options are ignored unless the
-.Fl R
-option is specified.
-In addition, these options override each other and the
-command's actions are determined by the last one specified.
-.Pp
-You can use "ls -lo" to see the flags of existing files.
-.Pp
-The
-.Nm chflags
-utility exits 0 on success, and >0 if an error occurs.
-.Sh SEE ALSO
-.Xr ls 1 ,
-.Xr chflags 2 ,
-.Xr stat 2 ,
-.Xr fts 3 ,
-.Xr symlink 7
-.Sh HISTORY
-The
-.Nm chflags
-command first appeared in
-.Bx 4.4 .

bin/chflags/chflags.c

@@ -1,180 +0,0 @@
-/*
- * Copyright (c) 1992, 1993, 1994
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-static const char sccsid[] = "@(#)chflags.c	8.5 (Berkeley) 4/1/94";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <err.h>
-#include <errno.h>
-#include <fts.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-u_long	string_to_flags __P((char **, u_long *, u_long *));
-void	usage __P((void));
-
-int
-main(argc, argv)
-	int argc;
-	char *argv[];
-{
-	FTS *ftsp;
-	FTSENT *p;
-	u_long clear, set;
-	long val;
-	int Hflag, Lflag, Pflag, Rflag, ch, fts_options, oct, rval;
-	char *flags, *ep;
-
-	Hflag = Lflag = Pflag = Rflag = 0;
-	while ((ch = getopt(argc, argv, "HLPR")) != -1)
-		switch (ch) {
-		case 'H':
-			Hflag = 1;
-			Lflag = Pflag = 0;
-			break;
-		case 'L':
-			Lflag = 1;
-			Hflag = Pflag = 0;
-			break;
-		case 'P':
-			Pflag = 1;
-			Hflag = Lflag = 0;
-			break;
-		case 'R':
-			Rflag = 1;
-			break;
-		case '?':
-		default:
-			usage();
-		}
-	argv += optind;
-	argc -= optind;
-
-	if (argc < 2)
-		usage();
-
-	fts_options = FTS_PHYSICAL;
-	if (Rflag) {
-		if (Hflag)
-			fts_options |= FTS_COMFOLLOW;
-		if (Lflag) {
-			fts_options &= ~FTS_PHYSICAL;
-			fts_options |= FTS_LOGICAL;
-		}
-	}
-
-	flags = *argv;
-	if (*flags >= '0' && *flags <= '7') {
-		errno = 0;
-		val = strtol(flags, &ep, 8);
-		if (val < 0)
-			errno = ERANGE;
-		if (errno)
-                        err(1, "invalid flags: %s", flags);
-                if (*ep)
-                        errx(1, "invalid flags: %s", flags);
-		set = val;
-                oct = 1;
-	} else {
-		if (string_to_flags(&flags, &set, &clear))
-                        errx(1, "invalid flag: %s", flags);
-		clear = ~clear;
-		oct = 0;
-	}
-
-	if ((ftsp = fts_open(++argv, fts_options , 0)) == NULL)
-		err(1, NULL);
-
-	for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
-		switch (p->fts_info) {
-		case FTS_D:
-			if (Rflag)		/* Change it at FTS_DP. */
-				continue;
-			fts_set(ftsp, p, FTS_SKIP);
-			break;
-		case FTS_DNR:			/* Warn, chflag, continue. */
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			break;
-		case FTS_ERR:			/* Warn, continue. */
-		case FTS_NS:
-			warnx("%s: %s", p->fts_path, strerror(p->fts_errno));
-			rval = 1;
-			continue;
-		case FTS_SL:			/* Ignore. */
-		case FTS_SLNONE:
-			/*
-			 * The only symlinks that end up here are ones that
-			 * don't point to anything and ones that we found
-			 * doing a physical walk.
-			 */
-			continue;
-		default:
-			break;
-		}
-		if (oct) {
-			if (!chflags(p->fts_accpath, set))
-				continue;
-		} else {
-			p->fts_statp->st_flags |= set;
-			p->fts_statp->st_flags &= clear;
-			if (!chflags(p->fts_accpath, p->fts_statp->st_flags))
-				continue;
-		}
-		warn("%s", p->fts_path);
-		rval = 1;
-	}
-	if (errno)
-		err(1, "fts_read");
-	exit(rval);
-}
-
-void
-usage()
-{
-	(void)fprintf(stderr,
-	    "usage: chflags [-R [-H | -L | -P]] flags file ...\n");
-	exit(1);
-}

bin/chio/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1997/09/12 15:00:06 jkh Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 CFLAGS+=-I${.CURDIR}/../../sys

bin/chio/chio.1

@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: chio.1,v 1.7 1998/09/15 07:48:51 gibbs Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 14, 1998
 .Dt CHIO 1

bin/chio/defs.h

@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <[email protected]>

bin/chio/pathnames.h

@@ -1,4 +1,4 @@
-/*	$Id: $	*/
+/* $FreeBSD$	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe <[email protected]>

bin/chmod/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	chmod
 

bin/chmod/chmod.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
-.\"	$Id: chmod.1,v 1.9 1998/05/06 06:50:06 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd March 31, 1994
 .Dt CHMOD 1
@@ -44,6 +44,7 @@
 .Sh SYNOPSIS
 .Nm chmod
 .Oo
+.Fl f
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
@@ -75,6 +76,11 @@ option is specified, no symbolic links are followed.
 .It Fl R
 Change the modes of the file hierarchies rooted in the files
 instead of just the files themselves.
+.It Fl f
+Do not display a diagnostic message if
+.Nm
+could not modify the mode for
+.Va file .
 .El
 .Pp
 Symbolic links do not have modes, so unless the
@@ -97,7 +103,7 @@ command's actions are determined by the last one specified.
 .Pp
 Only the owner of a file or the super-user is permitted to change
 the mode of a file.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
@@ -118,7 +124,7 @@ system supports this feature: see
 and the 
 .Ar suiddir
 option to
-.Xr mount 1 .
+.Xr mount 8 .
 .It Li 2000
 (the set-group-ID-on-execution bit)  Executable files with this bit set 
 will run with effective gid set to the gid of the file owner.  
@@ -304,7 +310,6 @@ option for the naughty bits.
 .Sh SEE ALSO
 .Xr chflags 1 ,
 .Xr install 1 ,
-.Xr mount 1 ,
 .Xr chmod 2 ,
 .Xr stat 2 ,
 .Xr umask 2 ,
@@ -312,6 +317,7 @@ option for the naughty bits.
 .Xr setmode 3 ,
 .Xr symlink 7 ,
 .Xr chown 8 ,
+.Xr mount 8 ,
 .Xr sticky 8
 .Sh STANDARDS
 The

bin/chmod/chmod.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: chmod.c,v 1.11 1998/05/13 07:22:11 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -92,7 +92,7 @@ main(argc, argv)
 		case 'R':
 			Rflag = 1;
 			break;
-		case 'f':		/* XXX: undocumented. */
+		case 'f':
 			fflag = 1;
 			break;
 		case 'h':
@@ -203,6 +203,6 @@ void
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: chmod [-R [-H | -L | -P]] mode file ...\n");
+	    "usage: chmod [-f -R [-H | -L | -P]] mode file ...\n");
 	exit(1);
 }

bin/cp/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.4 1997/02/22 14:01:32 peter Exp $
+# $FreeBSD$
 
 PROG=	cp
 SRCS=	cp.c utils.c

bin/cp/cp.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)cp.1	8.3 (Berkeley) 4/18/94
-.\"	$Id: cp.1,v 1.10 1998/05/06 06:50:19 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd April 18, 1994
 .Dt CP 1
@@ -197,9 +197,10 @@ options are ignored unless the
 option is specified.
 In addition, these options override each other and the
 command's actions are determined by the last one specified.
-.Pp
-.Nm Cp
-exits 0 on success, >0 if an error occurred.
+.Sh DIAGNOSTICS
+The
+.Nm
+utility exits 0 on success, and >0 if an error occurs.
 .Sh COMPATIBILITY
 Historic versions of the
 .Nm

bin/cp/cp.c

@@ -45,7 +45,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)cp.c	8.2 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: cp.c,v 1.16 1998/05/13 07:25:14 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 /*
@@ -286,7 +286,7 @@ copy(argv, type, fts_options)
 			 * is the case where the target exists.
 			 *
 			 * Also, check for "..".  This is for correct path
-			 * concatentation for paths ending in "..", e.g.
+			 * concatenation for paths ending in "..", e.g.
 			 *	cp -R .. /tmp
 			 * Paths ending in ".." are changed to ".".  This is
 			 * tricky, but seems the easiest way to fix the problem.

bin/cp/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/1/94
- *	$Id$
+ * $FreeBSD$
  */
 
 typedef struct {

bin/cp/utils.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)utils.c	8.3 (Berkeley) 4/1/94";
 #endif
 static const char rcsid[] =
-	"$Id: utils.c,v 1.20 1998/06/10 06:29:23 peter Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -171,7 +171,7 @@ copy_file(entp, dne)
 	/*
 	 * Don't remove the target even after an error.  The target might
 	 * not be a regular file, or its attributes might be important,
-	 * or its contents might be irreplacable.  It would only be safe
+	 * or its contents might be irreplaceable.  It would only be safe
 	 * to remove it if we created it and its length is 0.
 	 */
 

bin/csh/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.8 1997/08/07 21:42:01 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile

bin/csh/USD.doc/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 8/14/93
-#	$Id$
+# $FreeBSD$
 
 DIR=	usd/04.csh
 SRCS=	tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g

bin/csh/USD.doc/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.1	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .EH 'USD:4-%''An Introduction to the C shell'
 .OH 'An Introduction to the C shell''USD:4-%'

bin/csh/USD.doc/csh.2

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.2	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 1
 .NH

bin/csh/USD.doc/csh.3

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.3	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 2
 .NH

bin/csh/USD.doc/csh.4

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.4	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .nr H1 3
 .NH

bin/csh/USD.doc/csh.a

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.a	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Appendix \- Special characters

bin/csh/USD.doc/csh.g

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)csh.g	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .SH
 Glossary

bin/csh/USD.doc/tabs

@@ -30,6 +30,6 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tabs	8.1 (Berkeley) 6/8/93
-.\"	$Id$
+.\" $FreeBSD$
 .\"
 .ta 5n 10n 15n 20n 25n 30n 35n 40n 45n 50n 55n 60n 65n 70n 75n 80n

bin/csh/alloc.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)alloc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: alloc.c,v 1.8 1998/05/06 06:50:37 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/char.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)char.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: char.c,v 1.4 1997/02/22 14:01:37 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/char.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)char.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <ctype.h>

bin/csh/const.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)const.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: const.c,v 1.6 1997/02/22 14:01:39 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/csh.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)csh.1	8.2 (Berkeley) 1/21/94
-.\"	$Id: csh.1,v 1.10 1998/05/06 06:50:38 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 21, 1994
 .Dt CSH 1
@@ -2167,7 +2167,7 @@ and user name completion (see
 and a C-like syntax.
 There are now many shells that also have these mechanisms, plus
 a few more (and maybe some bugs too), which are available through the
-usenet.
+Usenet.
 .Sh BUGS
 When a command is restarted from a stop,
 the shell prints the directory it started in if this is different

bin/csh/csh.c

@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)csh.c	8.2 (Berkeley) 10/12/93";
 #else
 static const char rcsid[] =
-	"$Id: csh.c,v 1.12 1997/12/10 22:18:21 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -1223,7 +1223,7 @@ gethdir(home)
 
 /*
  * When didfds is set, we do I/O from 0, 1, 2 otherwise from 15, 16, 17
- * We also check if the shell has already changed the decriptor to point to
+ * We also check if the shell has already changed the descriptor to point to
  * 0, 1, 2 when didfds is set.
  */
 #define DESC(a) (*((int *) (a)) - (didfds && *((int *) a) >= FSHIN ? FSHIN : 0))

bin/csh/csh.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)csh.h	8.1 (Berkeley) 5/31/93
- *	$Id: csh.h,v 1.5 1997/08/07 21:42:04 steve Exp $
+ * $FreeBSD$
  */
 
 /*
@@ -306,7 +306,7 @@ Char   *lap;
  *
  * Each command is parsed to a tree of command structures and
  * flags are set bottom up during this process, to be propagated down
- * as needed during the semantics/exeuction pass (sh.sem.c).
+ * as needed during the semantics/execution pass (sh.sem.c).
  */
 struct command {
     short   t_dtyp;		/* Type of node 		 */
@@ -535,7 +535,7 @@ Char  **evalvec;
 Char   *evalp;
 
 /* word_chars is set by default to WORD_CHARS but can be overridden by
-   the worchars variable--if unset, reverts to WORD_CHARS */
+   the wordchars variable--if unset, reverts to WORD_CHARS */
 
 Char   *word_chars;
 

bin/csh/dir.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dir.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dir.c,v 1.8 1998/06/09 03:38:37 imp Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/dir.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*

bin/csh/dol.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)dol.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: dol.c,v 1.7 1998/05/06 06:50:39 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/err.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)err.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: err.c,v 1.7 1998/05/06 06:50:41 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -327,7 +327,7 @@ seterror(id, va_alist)
  *		  in bname
  *
  * This routine always resets or exits.  The flag haderr
- * is set so the routine who catches the unwind can propogate
+ * is set so the routine who catches the unwind can propagate
  * it if they want.
  *
  * Note that any open files at the point of error will eventually

bin/csh/exec.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exec.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exec.c,v 1.9 1998/02/28 10:49:54 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/exp.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)exp.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: exp.c,v 1.6 1998/05/06 06:50:44 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id: extern.h,v 1.4 1997/02/22 14:01:53 peter Exp $
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>

bin/csh/file.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)file.c	8.2 (Berkeley) 3/19/94";
 #else
 static const char rcsid[] =
-	"$Id: file.c,v 1.8 1998/02/01 17:11:01 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/func.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)func.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: func.c,v 1.10 1998/02/28 10:49:56 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -1396,7 +1396,7 @@ dosuspend(v, t)
 /* This is the dreaded EVAL built-in.
  *   If you don't fiddle with file descriptors, and reset didfds,
  *   this command will either ignore redirection inside or outside
- *   its aguments, e.g. eval "date >x"  vs.  eval "date" >x
+ *   its arguments, e.g. eval "date >x"  vs.  eval "date" >x
  *   The stuff here seems to work, but I did it by trial and error rather
  *   than really knowing what was going on.  If tpgrp is zero, we are
  *   probably a background eval, e.g. "eval date &", and we want to

bin/csh/glob.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)glob.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: glob.c,v 1.10 1997/08/08 00:54:03 steve Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/hist.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)hist.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: hist.c,v 1.7 1998/05/06 06:50:50 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/init.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: init.c,v 1.4 1997/02/22 14:02:00 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/lex.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)lex.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: lex.c,v 1.9 1998/05/06 06:50:52 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -1179,7 +1179,7 @@ gethent(sc)
 	case '-':
 	    back = 1;
 	    c = getC(0);
-	    /* FALLSTHROUGH */
+	    /* FALLTHROUGH */
 
 	default:
 	    if (any("(=~", c)) {

bin/csh/misc.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: misc.c,v 1.7 1998/05/06 06:50:53 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/parse.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: parse.c,v 1.7 1998/05/06 06:50:56 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/pathnames.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
- *	$Id: pathnames.h,v 1.4 1997/02/22 14:02:05 peter Exp $
+ * $FreeBSD$
  */
 
 #define	_PATH_BIN		"/bin"

bin/csh/proc.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)proc.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: proc.c,v 1.8 1998/02/28 10:49:59 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -76,7 +76,7 @@ static void	 okpcntl __P((void));
  * pchild - called at interrupt level by the SIGCHLD signal
  *	indicating that at least one child has terminated or stopped
  *	thus at least one wait system call will definitely return a
- *	childs status.  Top level routines (like pwait) must be sure
+ *	child's status.  Top level routines (like pwait) must be sure
  *	to mask interrupts when playing with the proclist data structures!
  */
 /* ARGUSED */

bin/csh/proc.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)proc.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 /*

bin/csh/sem.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)sem.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: sem.c,v 1.7 1998/02/28 10:50:00 jraynard Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -471,7 +471,7 @@ int i;
  * If more than one word is generated, then update the command vector.
  *
  * This is done differently in all the shells:
- * 1. in the bourne shell and ksh globbing is not performed
+ * 1. in the Bourne shell and ksh globbing is not performed
  * 2. Bash/csh say ambiguous
  * 3. zsh does i/o to/from all the files
  * 4. itcsh concatenates the words.

bin/csh/set.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)set.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: set.c,v 1.9 1998/05/06 06:51:04 charnier Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -163,7 +163,7 @@ doset(v, t)
 	    cp = Strsave(value(vp));	/* get the old value back */
 
 	    /*
-	     * convert to cononical pathname (possibly resolving symlinks)
+	     * convert to canonical pathname (possibly resolving symlinks)
 	     */
 	    cp = dcanon(cp, cp);
 
@@ -745,7 +745,7 @@ balance(p, f, d)
 		break;
 	    case 1:		/* was already right heavy */
 		switch (p->v_right->v_bal) {
-		case 1:	/* sigle rotate */
+		case 1:	/* single rotate */
 		    pp->v_link[ff] = rleft(p);
 		    p->v_left->v_bal = 0;
 		    p->v_bal = 0;
@@ -783,7 +783,7 @@ balance(p, f, d)
 		    p->v_right->v_bal = 0;
 		    p->v_bal = 0;
 		    break;
-		case 0:	/* signle rotate */
+		case 0:	/* single rotate */
 		    pp->v_link[ff] = rright(p);
 		    p->v_right->v_bal = -1;
 		    p->v_bal = 1;

bin/csh/str.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)str.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: str.c,v 1.5 1997/02/22 14:02:09 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/csh/time.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)time.c	8.1 (Berkeley) 5/31/93";
 #else
 static const char rcsid[] =
-	"$Id: time.c,v 1.7 1997/02/22 14:02:09 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -219,7 +219,7 @@ prusage(r0, r1, e, b)
 		(void) fprintf(cshout, "%ld", r1->ru_oublock - r0->ru_oublock);
 		break;
 
-	    case 'r':		/* socket messages recieved */
+	    case 'r':		/* socket messages received */
 		(void) fprintf(cshout, "%ld", r1->ru_msgrcv - r0->ru_msgrcv);
 		break;
 
@@ -227,7 +227,7 @@ prusage(r0, r1, e, b)
 		(void) fprintf(cshout, "%ld", r1->ru_msgsnd - r0->ru_msgsnd);
 		break;
 
-	    case 'k':		/* number of signals recieved */
+	    case 'k':		/* number of signals received */
 		(void) fprintf(cshout, "%ld", r1->ru_nsignals-r0->ru_nsignals);
 		break;
 

bin/date/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.6 1997/08/09 22:34:01 brian Exp $
+# $FreeBSD$
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c

bin/date/date.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)date.1	8.3 (Berkeley) 4/28/95
-.\"	$Id: date.1,v 1.25 1998/05/13 07:56:44 phk Exp $
+.\" $FreeBSD$
 .\"
 .Dd November 17, 1993
 .Dt DATE 1
@@ -47,7 +47,7 @@
 .Op Fl d Ar dst
 .Op Fl r Ar seconds
 .Op Fl t Ar minutes_west
-.Op Fl v Ns Ar [+|-]val Ns Op ymwdHM
+.Op Fl v Ns Ar [+|-]val Ns Op ymwdHMS
 .Ar ...
 .Op Fl f Ar fmt Ar date | [[[[yy]mm]dd]HH]MM[\&.ss]
 .Op Cm + Ns Ar format
@@ -108,8 +108,8 @@ Display or set the date in
 .Tn UCT
 (universal) time.
 .It Fl v
-Adjust the minute, hour, month day, week day, month or year according to
-.Ar val .
+Adjust the second, minute, hour, month day, week day, month or year according to
+.Ar val .  
 If
 .Ar val
 is preceded with a plus or minus sign, the date is adjusted forwards
@@ -117,10 +117,10 @@ or backwards according to the remaining string, otherwise the relevant
 part of the date is set.  The date can be adjusted as many times as
 required using these flags.  Flags are processed in the order given.
 .Pp
-Minutes are in the range 0-59, hours are in the range 1-12, month days
-are in the range 1-31, week days are in the range 0-6 (Sun-Sat), months
-are in the range 1-12 (Jan-Dec) and years are in the range 80-38 or
-1980-2038.
+Seconds are in the range 0-59, minutes are in the range 0-59, hours are
+in the range 1-12, month days are in the range 1-31, week days are in the
+range 0-6 (Sun-Sat), months are in the range 1-12 (Jan-Dec) and years are
+in the range 80-38 or 1980-2038.
 .Pp
 If
 .Ar val
@@ -129,9 +129,10 @@ is numeric, one of either
 .Ar m ,
 .Ar w ,
 .Ar d ,
-.Ar H
-or
+.Ar H ,
 .Ar M
+or
+.Ar S
 must be used to specify which part of the date is to be adjusted.
 .Pp
 The week day or month may be specified using a name rather than a
@@ -277,7 +278,9 @@ a record of the user setting the time
 .%A S. Zatti
 .Re
 .Sh DIAGNOSTICS
-Exit status is 0 on success, 1 if unable to set the date, and 2
+The
+.Nm
+utility exits 0 on success, 1 if unable to set the date, and 2
 if able to set the local date, but unable to set it globally.
 .Pp
 Occasionally, when

bin/date/date.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: date.c,v 1.25 1998/05/13 07:31:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -185,8 +185,7 @@ setthetime(fmt, p)
 		if (t == NULL) {
 			fprintf(stderr, "Failed conversion of ``%s''"
 				" using format ``%s''\n", p, fmt);
-			lt = localtime(&tval);
-			return;
+			badformat();
 		} else if (*t != '\0')
 			fprintf(stderr, "Warning: Ignoring %ld extraneous"
 				" characters in date string (%s)\n",
@@ -278,7 +277,7 @@ usage()
 {
 	(void)fprintf(stderr, "%s\n%s\n",
 	    "usage: date [-nu] [-d dst] [-r seconds] [-t west] "
-	    "[-v[+|-]val[ymwdHM]] ... ",
+	    "[-v[+|-]val[ymwdHMS]] ... ",
 	    "            [-f fmt date | [[[[yy]mm]dd]HH]MM[.ss]] [+format]");
 	exit(1);
 }

bin/date/extern.h

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.1 (Berkeley) 5/31/93
- *	$Id$
+ * $FreeBSD$
  */
 
 int	netsettime __P((time_t));

bin/date/netdate.c

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)netdate.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: netdate.c,v 1.9 1998/05/06 06:51:18 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/date/vary.c

@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <time.h>
@@ -332,6 +332,43 @@ adjmin(struct tm *t, char type, int val)
   return mktime(t) != -1;
 }
 
+static int
+adjsec(struct tm *t, char type, int val)
+{
+  if (val < 0)
+    return 0;
+
+  switch (type) {
+    case '+':
+      if (!adjmin(t, '+', (t->tm_sec + val) / 60))
+        return 0;
+      val %= 60;
+      t->tm_sec += val;
+      if (t->tm_sec > 59)
+        t->tm_sec -= 60;
+      break;
+
+    case '-':
+      if (!adjmin(t, '-', val / 60))
+        return 0;
+      val %= 60;
+      if (val > t->tm_sec) {
+        if (!adjmin(t, '-', 1))
+          return 0;
+        val -= 60;
+      }
+      t->tm_sec -= val;
+      break;
+
+    default:
+      if (val > 59)
+        return 0;
+      t->tm_sec = val;
+  }
+
+  return mktime(t) != -1;
+}
+
 const struct vary *
 vary_apply(const struct vary *v, struct tm *t)
 {
@@ -370,6 +407,10 @@ vary_apply(const struct vary *v, struct tm *t)
       which = arg[len-1];
       
       switch (which) {
+        case 'S':
+          if (!adjsec(t, type, val))
+            return v;
+          break;
         case 'M':
           if (!adjmin(t, type, val))
             return v;

bin/date/vary.h

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ * $FreeBSD$
  */
 
 struct vary {

bin/dd/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id: Makefile,v 1.5 1998/01/07 22:31:17 joerg Exp $
+# $FreeBSD$
 
 PROG=	dd
 SRCS=	args.c conv.c conv_tab.c dd.c misc.c position.c

bin/dd/args.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)args.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: args.c,v 1.12 1998/05/06 06:51:29 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -328,7 +328,7 @@ c_conv(a, b)
  *	4) A positive decimal number followed by a m (mult by 512).
  *	5) A positive decimal number followed by a w (mult by sizeof int)
  *	6) Two or more positive decimal numbers (with/without k,b or w).
- *	   seperated by x (also * for backwards compatibility), specifying
+ *	   separated by x (also * for backwards compatibility), specifying
  *	   the product of the indicated values.
  */
 static u_long

bin/dd/conv.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: conv.c,v 1.9 1998/05/06 06:51:30 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/dd/conv_tab.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)conv_tab.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id: conv_tab.c,v 1.7 1998/05/06 06:51:32 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>

bin/dd/dd.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: dd.1,v 1.7 1998/05/06 06:51:35 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd January 13, 1994
 .Dt DD 1
@@ -329,10 +329,10 @@ be written to the standard error output
 in the same format as the standard completion message and
 .Nm
 will exit.
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
-utility exits 0 on success or >0 if an error occurred.
+utility exits 0 on success or >0 if an error occurs.
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,

bin/dd/dd.c

@@ -46,7 +46,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)dd.c	8.5 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: dd.c,v 1.14 1998/05/06 06:51:39 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/dd/dd.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dd.h	8.3 (Berkeley) 4/2/94
- *	$Id: dd.h,v 1.7 1997/10/11 20:09:05 joerg Exp $
+ * $FreeBSD$
  */
 
 /* Input/output stream state. */

bin/dd/extern.h

@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.3 (Berkeley) 4/2/94
- *	$Id$
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>

bin/dd/misc.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: misc.c,v 1.14 1998/05/13 07:33:50 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>

bin/dd/position.c

@@ -40,7 +40,7 @@
 static char sccsid[] = "@(#)position.c	8.3 (Berkeley) 4/2/94";
 #endif
 static const char rcsid[] =
-	"$Id: position.c,v 1.7 1998/05/06 06:51:42 charnier Exp $";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>

bin/df/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/08/07 21:30:59 steve Exp $
+# $FreeBSD$
 #	@(#)Makefile	8.3 (Berkeley) 5/8/95
 
 PROG=	df

bin/df/df.1

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
-.\"	$Id: df.1,v 1.12 1998/05/13 07:35:44 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd May 8, 1995
 .Dt DF 1
@@ -50,7 +50,7 @@ displays statistics about the amount of free disk space on the specified
 or on the filesystem of which
 .Ar file
 is a part.
-Values are displayed in 512-byte per block block counts.
+Values are displayed in 512-byte per block counts.
 If neither a file or a filesystem operand is specified,
 statistics for all mounted filesystems are displayed
 (subject to the
@@ -95,12 +95,9 @@ lists all filesystems except those of type
 and
 .Tn MFS .
 The
-.Xr sysctl 8
+.Xr lsvfs 1
 command can be used to find out the types of filesystems
-that are available on the system:
-.Bd -literal -offset indent
-sysctl vfs
-.Ed
+that are available on the system.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
@@ -116,6 +113,7 @@ and
 .Fl t
 flags are ignored if a file or filesystem is specified.
 .Sh SEE ALSO
+.Xr lsvfs 1 ,
 .Xr quota 1 ,
 .Xr fstatfs 2 ,
 .Xr getfsstat 2 ,
@@ -123,8 +121,7 @@ flags are ignored if a file or filesystem is specified.
 .Xr getmntinfo 3 ,
 .Xr fstab 5 ,
 .Xr mount 8 ,
-.Xr quot 8 ,
-.Xr sysctl 8
+.Xr quot 8
 .Sh HISTORY
 A
 .Nm

bin/df/df.c

@@ -47,7 +47,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #else
 static const char rcsid[] =
-	"$Id: df.c,v 1.19 1997/10/13 09:36:05 joerg Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/domainname/Makefile

@@ -1,4 +1,4 @@
-#	$Id$
+# $FreeBSD$
 
 PROG=	domainname
 

bin/domainname/domainname.1

@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
-.\"	$Id: domainname.1,v 1.5 1997/06/03 06:19:04 charnier Exp $
+.\" $FreeBSD$
 .\"
 .Dd September 18, 1994
 .Dt DOMAINNAME 1
-.Os "FreeBSD 2.0"
+.Os FreeBSD 2.0
 .Sh NAME
 .Nm domainname
 .Nd set or print name of current YP/NIS domain

bin/domainname/domainname.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char const sccsid[] = "From: @(#)hostname.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>

bin/echo/Makefile

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
-#	$Id$
+# $FreeBSD$
 
 PROG=	echo
 

bin/echo/echo.1

@@ -33,7 +33,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)echo.1	8.1 (Berkeley) 7/22/93
-.\"	$Id: echo.1,v 1.5 1997/02/22 14:03:05 peter Exp $
+.\" $FreeBSD$
 .\"
 .Dd July 22, 1993
 .Dt ECHO 1
@@ -59,7 +59,7 @@ Do not print the trailing newline character.  This may also be
 achieved by appending `\ec' to the end of the string, as is done
 by iBCS2 compatible systems.
 .El
-.Pp
+.Sh DIAGNOSTICS
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.

bin/echo/echo.c

@@ -42,7 +42,7 @@ static char const copyright[] =
 static char sccsid[] = "@(#)echo.c	8.1 (Berkeley) 5/31/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+  "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>

bin/ed/Makefile

@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1997/02/22 14:03:08 peter Exp $
+# $FreeBSD$
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c

bin/ed/POSIX

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 This version of ed(1) is not strictly POSIX compliant, as described in
 the POSIX 1003.2 document.  The following is a summary of the omissions,

bin/ed/README

@@ -1,4 +1,4 @@
-$Id$
+$FreeBSD$
 
 ed is an 8-bit-clean, POSIX-compliant line editor.  It should work with
 any regular expression package that conforms to the POSIX interface

bin/ed/buf.c

@@ -1,4 +1,4 @@
-/* buf.c: This file contains the scratch-file buffer rountines for the
+/* buf.c: This file contains the scratch-file buffer routines for the
    ed line editor. */
 /*-
  * Copyright (c) 1993 Andrew Moore, Talke Studio.
@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)buf.c,v 1.4 1994/02/01 00:34:35 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: buf.c,v 1.14 1997/10/09 11:05:16 eivind Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/ed/cbc.c

@@ -42,7 +42,7 @@
 static char * const rcsid = "@(#)cbc.c,v 1.2 1994/02/01 00:34:36 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: cbc.c,v 1.9 1997/02/22 14:03:12 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 
@@ -124,7 +124,7 @@ init_des_cipher()
 	/* initialize the initialization vector */
 	MEMZERO(ivec, 8);
 
-	/* intialize the padding vector */
+	/* initialize the padding vector */
 	srand((unsigned) time((time_t *) 0));
 	for (i = 0; i < 8; i++)
 		CHAR(pvec, i) = (char) (rand()/RAND_DIV);

bin/ed/ed.1

@@ -1,4 +1,4 @@
-.\"	$Id: ed.1,v 1.13 1998/05/13 07:41:13 charnier Exp $
+.\" $FreeBSD$
 .Dd May 21, 1993
 .Dt ED 1
 .Os

bin/ed/ed.h

@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp
- *	$Id: ed.h,v 1.11 1997/12/10 22:18:23 eivind Exp $
+ * $FreeBSD$
  */
 
 #include <sys/param.h>		/* for MAXPATHLEN */

bin/ed/glbl.c

@@ -31,7 +31,7 @@
 static char * const rcsid = "@(#)glob.c,v 1.1 1994/02/01 00:34:40 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: glbl.c,v 1.7 1997/02/22 14:03:15 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */
 

bin/ed/io.c

@@ -30,7 +30,7 @@
 static char * const rcsid = "@(#)io.c,v 1.1 1994/02/01 00:34:41 alm Exp";
 #else
 static char * const rcsid =
-	"$Id: io.c,v 1.8 1997/02/22 14:03:16 peter Exp $";
+  "$FreeBSD$";
 #endif
 #endif /* not lint */