From 57c8196ef6848962145a70dcc465c239a9998eea Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Fri, 21 Nov 2014 16:20:03 +0000
Subject: doc: mention how to avoid newlines impacting ls -1

* src/ls.c (usage): Mention the -b and -q options
in the -1 description.
* doc/coreutils.texi (ls invocation): Likewise.
---
 doc/coreutils.texi | 3 ++-
 src/ls.c           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index f089e435c..db24a75dd 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -7547,7 +7547,8 @@ These options affect the appearance of the overall output.
 @opindex --format
 @opindex single-column @r{output of files}
 List one file per line.  This is the default for @command{ls} when standard
-output is not a terminal.
+output is not a terminal.  See also the @option{-b} and @option{-q} options
+to suppress direct output of newline characters within a file name.
 
 @item -C
 @itemx --format=vertical
diff --git a/src/ls.c b/src/ls.c
index 8b5b2cf74..5bae06fbe 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -4929,7 +4929,8 @@ Sort entries alphabetically if none of -cftuvSUX nor --sort is specified.\n\
   -x                         list entries by lines instead of by columns\n\
   -X                         sort alphabetically by entry extension\n\
   -Z, --context              print any security context of each file\n\
-  -1                         list one file per line\n\
+  -1                         list one file per line.  Avoid '\\n' with -q or -b\
+\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
-- 
cgit v1.2.3-70-g09d2