From 37a0443eb842cf3d2c9de0e5647b0094a0dcf0bd Mon Sep 17 00:00:00 2001
From: Jason McIntyre <jmc@cvs.openbsd.org>
Date: Mon, 29 Sep 2008 16:42:42 +0000
Subject: more updates on which args do and do not mix (doc only, this time):

- list -f in the -cStu "exclusive group" (we already document that -f
overrides these options)
- note that our implementation of -f differs from posix
- -k and -u do not override each other: those options are not used together

ok sobrado
---
 bin/ls/ls.1 | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'bin/ls/ls.1')

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 914f3a5d014..18ff219fe5a 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.53 2008/09/04 15:44:41 jmc Exp $
+.\"	$OpenBSD: ls.1,v 1.54 2008/09/29 16:42:41 jmc Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -33,7 +33,7 @@
 .\"
 .\"     @(#)ls.1	8.7 (Berkeley) 7/29/94
 .\"
-.Dd $Mdocdate: September 4 2008 $
+.Dd $Mdocdate: September 29 2008 $
 .Dt LS 1
 .Os
 .Sh NAME
@@ -246,14 +246,13 @@ the following mutually exclusive options:
 .Fl n ,
 and
 .Fl x ;
+and
 .Fl c ,
+.Fl f ,
 .Fl S ,
 .Fl t ,
 and
-.Fl u ;
-.Fl k
-and
-.Fl h .
+.Fl u .
 Where more than one option is specified from the same
 mutually exclusive group,
 the last option given overrides the others,
@@ -261,9 +260,6 @@ except that
 .Fl l
 always overrides
 .Fl g ;
-.Fl k
-always overides
-.Fl h ;
 and
 .Fl f
 always overrides
@@ -509,8 +505,10 @@ flag has been changed in order to be compatible with the
 specification.
 .Pp
 Behaviour for the
+.Fl f
+and
 .Fl o
-flag differs between this implementation and
+flags differs between this implementation and
 .St -p1003.1-2004 .
 .Sh HISTORY
 An
-- 
cgit v1.2.3