summaryrefslogtreecommitdiff
path: root/bin/ls
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-01-10 15:36:18 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-01-10 15:36:18 +0000
commitc0ca0565dc444e84458d8397d56c50fd5f2e69a6 (patch)
tree32ba75a6241194f8d62195c11594d1f172627bac /bin/ls
parent4f1b83eb275a9bc760466bc4acf3d006a464cff7 (diff)
-l outputs total always, not just to terminals (netbsd -r 1.50);
-l output is one per line (like -1); -x also inhibits one per line output;
Diffstat (limited to 'bin/ls')
-rw-r--r--bin/ls/ls.110
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 58cd4798e2a..20420f1fef4 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ls.1,v 1.42 2004/09/16 20:48:35 millert Exp $
+.\" $OpenBSD: ls.1,v 1.43 2005/01/10 15:36:17 jmc Exp $
.\" $NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -146,8 +146,9 @@ environment variable.
(The lowercase letter
.Dq ell. )
List in long format (see below).
-If the output is to a terminal, a total sum of all file
+A total sum of all file
sizes is output on a line before the long listing.
+Output is one entry per line.
.It Fl m
Stream output format; list files across the page, separated by commas.
.It Fl n
@@ -222,9 +223,10 @@ By default,
.Nm
lists one entry per line to standard
output; the exceptions are to terminals or when the
-.Fl C
+.Fl C ,
+.Fl m ,
or
-.Fl m
+.Fl x
options are specified.
.Pp
File information is displayed with one or more