From 8a166df9c3bd493e4fb186030be2384e495b2b47 Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sat, 14 Dec 1996 05:56:03 +0000
Subject: [PATCH] Merge Lite2 mods, cleanup man page, and -Wall cleaning.

---
 bin/df/df.1 | 12 ++++++------
 bin/df/df.c |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/df/df.1 b/bin/df/df.1
index 658a1bf8df3..87655a6fbf0 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)df.1	8.2 (Berkeley) 1/13/94
-.\"	$Id: df.1,v 1.4 1996/08/29 18:05:48 wosch Exp $
+.\"     @(#)df.1	8.3 (Berkeley) 5/8/95
+.\"	$Id: df.1,v 1.5 1996/12/11 10:01:49 jkh Exp $
 .\"
-.Dd January 13, 1994
+.Dd May 8, 1995
 .Dt DF 1
 .Os BSD 4
 .Sh NAME
@@ -44,7 +44,7 @@
 .Op Fl t Ar type
 .Op Ar file | Ar filesystem ...
 .Sh DESCRIPTION
-.Nm Df
+.Nm
 displays statistics about the amount of free disk space on the specified
 .Ar filesystem
 or on the filesystem of which
@@ -86,7 +86,7 @@ local (ufs, mfs, lfs, msdos, cd9660),
 and misc (fdesc, portal, kernfs, procfs).
 The names isofs, iso9660fs, cdfs, and cd9660 are aliases to each other
 all of them refering to the same type of file system.
-The string ``no'' may be prepending to a type to get its complement
+The string ``no'' may be prepended to a type to get its complement
 (e.g. ``nonfs'' to get non-NFS filesystems).  The first
 .Fl t
 option overrides the default, additional such options will add to
@@ -96,7 +96,7 @@ or
 ``df -t local -t nomfs''
 will display statistics for UFS and LFS filesystems.
 .El
-.Sh ENVIRONMENTAL VARIABLES
+.Sh ENVIRONMENT VARIABLES
 .Bl -tag -width BLOCKSIZE
 .It Ev BLOCKSIZE
 If the environmental variable
diff --git a/bin/df/df.c b/bin/df/df.c
index cb0c26e0ae7..20cf37da7fb 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -35,17 +35,17 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: df.c,v 1.8 1996/01/14 18:55:09 bde Exp $
+ *	$Id: df.c,v 1.9 1996/12/11 10:01:56 jkh Exp $
  */
 
 #ifndef lint
-static char copyright[] =
+static char const copyright[] =
 "@(#) Copyright (c) 1980, 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)df.c	8.7 (Berkeley) 4/2/94";
+static char const sccsid[] = "@(#)df.c	8.9 (Berkeley) 5/8/95";
 #endif /* not lint */
 
 #include <sys/param.h>