- sync the descriptions of -h and -k

- note that the last -h or -k specified takes precedence

the latter part based on a diff from Daniel Dickman, with text from ls.1
ok otto millert

2 files changed, 27 insertions, 19 deletions

diff --git a/bin/df/df.1 b/bin/df/df.1
index 579984dd6ea..36770c259ef 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: df.1,v 1.42 2009/02/08 17:15:09 jmc Exp $
+.\"	$OpenBSD: df.1,v 1.43 2009/06/04 14:59:26 jmc Exp $
 .\"	$NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)df.1	8.2 (Berkeley) 1/13/92
 .\"
-.Dd $Mdocdate: February 8 2009 $
+.Dd $Mdocdate: June 4 2009 $
 .Dt DF 1
 .Os
 .Sh NAME
@@ -117,6 +117,14 @@ the specified type, a warning is issued and no information is given on
 that file system.
 .El
 .Pp
+It is not an error to specify more than one of
+the mutually exclusive options
+.Fl h
+and
+.Fl k .
+Where more than one of these options is specified,
+the last option given overrides the others.
+.Pp
 .Ex -std df
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index f4747b1257a..83d4a5f0c6b 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: du.1,v 1.24 2009/02/08 17:15:09 jmc Exp $
+.\"	$OpenBSD: du.1,v 1.25 2009/06/04 14:59:26 jmc Exp $
 .\"	$NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	@(#)du.1	8.2 (Berkeley) 4/1/94
 .\"
-.Dd $Mdocdate: February 8 2009 $
+.Dd $Mdocdate: June 4 2009 $
 .Dt DU 1
 .Os
 .Sh NAME
@@ -65,23 +65,15 @@ Display the grand total after all the arguments have been processed.
 Symbolic links on the command line are followed.
 (Symbolic links encountered in the tree traversal are not followed.)
 .It Fl h
-Display numbers in a human readable form.
-Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte in order to
-reduce the number of digits to four or less.
-This overrides the
-.Fl k
-option.
+"Human-readable" output.
+Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte, Petabyte, Exabyte in order to reduce the number of
+digits to four or less.
 .It Fl k
-By default,
-.Nm
-displays the number of blocks as returned by the
-.Xr stat 2
-system call, i.e., 512-byte blocks.
-If the
+By default, all sizes are reported in 512-byte block counts.
+The
 .Fl k
-flag is specified, the number displayed is the number of 1024-byte
-blocks.
-Partial numbers of blocks are rounded up.
+option causes the numbers to be reported in kilobyte counts.
 .It Fl L
 All symbolic links are followed.
 .It Fl P
@@ -96,6 +88,14 @@ Display only the grand total for the specified files.
 File system mount points are not traversed.
 .El
 .Pp
+It is not an error to specify more than one of
+the mutually exclusive options
+.Fl h
+and
+.Fl k .
+Where more than one of these options is specified,
+the last option given overrides the others.
+.Pp
 .Nm
 counts the storage used by symbolic links and not the files they
 reference unless the