summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--doc/Makefile.am5
-rw-r--r--doc/coreutils.texi8
3 files changed, 10 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index f1b383e39..83b8ed9a1 100644
--- a/NEWS
+++ b/NEWS
@@ -41,6 +41,8 @@ GNU coreutils NEWS -*- outline -*-
du: -H (initially equivalent to --si) is now equivalent to
--dereference-args, and thus works as POSIX requires
+ shred: now does 3 overwrite passes by default rather than 25.
+
ls -l now marks SELinux-only files with the less obtrusive '.',
rather than '+'. A file with any other combination of MAC and ACL
is still marked with a '+'.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index cba333226..f6f98afa5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -29,10 +29,13 @@ EXTRA_DIST = perm.texi getdate.texi constants.texi fdl.texi
# old systems.
AM_MAKEINFOFLAGS = --no-split
-constants.texi: $(top_srcdir)/src/tail.c
+constants.texi: $(top_srcdir)/src/tail.c $(top_srcdir)/src/shred.c
LC_ALL=C \
sed -n -e 's/^#define \(DEFAULT_MAX[_A-Z]*\) \(.*\)/@set \1 \2/p' \
$(top_srcdir)/src/tail.c > t-$@
+ LC_ALL=C \
+ sed -n -e 's/.*\(DEFAULT_PASSES\)[ =]* \([0-9]*\).*/@set SHRED_\1 \2/p'\
+ $(top_srcdir)/src/shred.c >> t-$@
mv t-$@ $@
MAINTAINERCLEANFILES = constants.texi
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index d8df10760..d8b90876d 100644
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8445,10 +8445,10 @@ Override file permissions if necessary to allow overwriting.
@opindex -n @var{number}
@opindex --iterations=@var{number}
@cindex iterations, selecting the number of
-By default, @command{shred} uses 25 passes of overwrite. This is enough
-for all of the useful overwrite patterns to be used at least once.
-You can reduce this to save time, or increase it if you have a lot of
-time to waste.
+By default, @command{shred} uses @value{SHRED_DEFAULT_PASSES} passes of
+overwrite. You can reduce this to save time, or increase it if you think it's
+appropriate. After 25 passes all of the internal overwrite patterns will have
+been used at least once.
@item --random-source=@var{file}
@opindex --random-source