restore the traditional behavior of -f implying -a; apparently Keith Bostic

forgot to restore it when the -f flag was put back on 2nd of September 1989,
after being removed on 16th of August as a consequence of issues getting it
working over NFS, so deviation from traditional UNIX behavior in all BSDs
looks like an historical accident; as a side effect, this change accommodates
behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1'').

joint work with jmc@ (who found the inaccuracy in our implementation),
schwarze@ (who provided a detailed tracking of historical facts) and millert@

ok millert@, schwarze@

1 files changed, 4 insertions, 4 deletions

diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 4a500d8420b..73e3a5575b0 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.69 2014/03/31 07:06:20 jmc Exp $
+.\"	$OpenBSD: ls.1,v 1.70 2014/03/31 20:54:37 sobrado Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -121,6 +121,8 @@ and a vertical bar
 after each that is a FIFO.
 .It Fl f
 Output is not sorted.
+This option turns on
+.Fl a .
 .It Fl g
 List in long format as in
 .Fl l ,
@@ -476,10 +478,8 @@ utility is compliant with the
 .St -p1003.1-2008
 specification,
 except behaviour for the
-.Fl f
-and
 .Fl o
-flags differs.
+flag differs.
 .Pp
 The flags
 .Op Fl hT ,