summaryrefslogtreecommitdiff
path: root/bin/df
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2009-06-04 14:59:27 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2009-06-04 14:59:27 +0000
commit579dccee5db7200c46c13de61f9ebf7c6b116e33 (patch)
tree8ff1a0799817a1208303a8a131075a123d77a791 /bin/df
parent057aeb005eeedfb693f2ad9bf4c17fe41c3bc4f6 (diff)
- 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
Diffstat (limited to 'bin/df')
-rw-r--r--bin/df/df.112
1 files changed, 10 insertions, 2 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