summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--cfg.mk2
-rw-r--r--src/expr.c2
-rw-r--r--src/ptx.c2
-rw-r--r--src/shred.c2
-rw-r--r--src/sort.c4
6 files changed, 7 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 88593ab65..a71f8327f 100644
--- a/NEWS
+++ b/NEWS
@@ -1488,7 +1488,7 @@ GNU coreutils NEWS -*- outline -*-
"rm --interactive=never F" no longer prompts for an unwritable F
- "rm -rf D" would emit an misleading diagnostic when failing to
+ "rm -rf D" would emit a misleading diagnostic when failing to
remove a symbolic link within the unwritable directory, D.
Introduced in coreutils-6.0. Similarly, when a cross-partition
"mv" fails because the source directory is unwritable, it now gives
diff --git a/cfg.mk b/cfg.mk
index 15cf98c16..c7515c731 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -27,7 +27,7 @@ bootstrap-tools = autoconf,automake,gnulib,bison
# Now that we have better tests, make this the default.
export VERBOSE = yes
-old_NEWS_hash = 46d641b97ad45383bd3479f77b706742
+old_NEWS_hash = 792b8dca00fe03568653f7ca2d096d9d
# Add an exemption for sc_makefile_at_at_check.
_makefile_at_at_check_exceptions = ' && !/^cu_install_program =/'
diff --git a/src/expr.c b/src/expr.c
index 2be8b1dbb..ce65ecf46 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -483,7 +483,7 @@ toarith (VALUE *v)
}
}
-/* Extract a size_t value from a integer value I.
+/* Extract a size_t value from an integer value I.
If the value is negative, return SIZE_MAX.
If the value is too large, return SIZE_MAX - 1. */
static size_t
diff --git a/src/ptx.c b/src/ptx.c
index 3ee14ffb1..7ac6e8f63 100644
--- a/src/ptx.c
+++ b/src/ptx.c
@@ -797,7 +797,7 @@ find_occurs_in_text (void)
context_start = cursor;
- /* If a end of line or end of sentence sequence is defined and
+ /* If an end of line or end of sentence sequence is defined and
non-empty, `next_context_start' will be recomputed to be the end of
each line or sentence, before each one is processed. If no such
sequence, then `next_context_start' is set at the end of the whole
diff --git a/src/shred.c b/src/shred.c
index 27747919f..d8b33e780 100644
--- a/src/shred.c
+++ b/src/shred.c
@@ -781,7 +781,7 @@ do_wipefd (int fd, char const *qname, struct randint_source *s,
}
/* If we know that we can't possibly shred the file, give up now.
- Otherwise, we may go into a infinite loop writing data before we
+ Otherwise, we may go into an infinite loop writing data before we
find that we can't rewind the device. */
if ((S_ISCHR (st.st_mode) && isatty (fd))
|| S_ISFIFO (st.st_mode)
diff --git a/src/sort.c b/src/sort.c
index e10159a9b..084addf49 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -112,7 +112,7 @@ struct rlimit { size_t rlim_cur; };
/* Heuristic value for the number of lines for which it is worth creating
a subthread, during an internal merge sort. I.e., it is a small number
of "average" lines for which sorting via two threads is faster than
- sorting via one on an "average" system. On an dual-core 2.0 GHz i686
+ sorting via one on an "average" system. On a dual-core 2.0 GHz i686
system with 3GB of RAM and 2MB of L2 cache, a file containing 128K
lines of gensort -a output is sorted slightly faster with --parallel=2
than with --parallel=1. By contrast, using --parallel=1 is about 10%
@@ -2029,7 +2029,7 @@ compare_random (char *restrict texta, size_t lena,
char *restrict textb, size_t lenb)
{
/* XFRM_DIFF records the equivalent of memcmp on the transformed
- data. This is used to break ties if there is an checksum
+ data. This is used to break ties if there is a checksum
collision, and this is good enough given the astronomically low
probability of a collision. */
int xfrm_diff = 0;