aboutsummaryrefslogtreecommitdiff
path: root/src/xz
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-04-12 11:59:49 +0300
committerLasse Collin <lasse.collin@tukaani.org>2011-04-12 12:03:31 +0300
commit1125611b9b8d4a209b6a73d2c76e1b39c065972a (patch)
treea4e8cf19c4e542efa45bf57f706623aa6c7c54e1 /src/xz
parentliblzma: Document lzma_easy_(enc|dec)oder_memusage() better too. (diff)
downloadxz-1125611b9b8d4a209b6a73d2c76e1b39c065972a.tar.xz
Remove doubled words from documentation and comments.
Spot candidates by running these commands: git ls-files |xargs perl -0777 -n \ -e 'while (/\b(then?|[iao]n|i[fst]|but|f?or|at|and|[dt]o)\s+\1\b/gims)' \ -e '{$n=($` =~ tr/\n/\n/ + 1); ($v=$&)=~s/\n/\\n/g; print "$ARGV:$n:$v\n"}' Thanks to Jim Meyering for the original patch.
Diffstat (limited to '')
-rw-r--r--src/xz/file_io.c2
-rw-r--r--src/xz/xz.12
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xz/file_io.c b/src/xz/file_io.c
index 09edcca6..f9b7f305 100644
--- a/src/xz/file_io.c
+++ b/src/xz/file_io.c
@@ -53,7 +53,7 @@ static bool io_write_buf(file_pair *pair, const uint8_t *buf, size_t size);
extern void
io_init(void)
{
- // Make sure that stdin, stdout, and and stderr are connected to
+ // Make sure that stdin, stdout, and stderr are connected to
// a valid file descriptor. Exit immediately with exit code ERROR
// if we cannot make the file descriptors valid. Maybe we should
// print an error message, but our stderr could be screwed anyway.
diff --git a/src/xz/xz.1 b/src/xz/xz.1
index cba1d077..f1c9135d 100644
--- a/src/xz/xz.1
+++ b/src/xz/xz.1
@@ -866,7 +866,7 @@ This is equivalent to specifying \fB\-\-memlimit\-compress=\fIlimit
\fB\-\-memlimit\-decompress=\fIlimit\fR.
.TP
.B \-\-no\-adjust
-Display an error and exit if the compression settings exceed the
+Display an error and exit if the compression settings exceed
the memory usage limit.
The default is to adjust the settings downwards so
that the memory usage limit is not exceeded.