maint: fix incorrect spellings etc

* NEWS: Use a standard version specification.
* doc/coreutils.texi: Fix incorrect grammar.
* src/df.c: Update a stale comment.
* src/copy.c: Fix incorrect spellings.
* src/factor.c: Likewise.
* src/ls.c: Likewise.
* src/pr.c: Likewise.
* src/relpath.c: Likewise.
* src/shred.c: Likewise.
* src/sort.c: Likewise.
* src/split.c: Likewise.
* src/stdbuf.c: Likewise.
* tests/misc/seq-precision.sh: Likewise.

diff --git a/NEWS b/NEWS
index 298814613c4a247b48df60d7203c40e2899415e7..524c1916e6d375f7a3876c91445e051a0d5d0a84 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ GNU coreutils NEWS                                    -*- outline -*-
   [bug introduced in coreutils-8.10]
 
   ls no longer prematurely wraps lines when printing short file names.
-  [bug introduced in 5.1.0]
+  [bug introduced in coreutils-5.1.0]
 
   shred again uses defined patterns for all iteration counts.
   [bug introduced in coreutils-5.93]

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 64b6206d7a7a5bada572dc2644b0f466f6b1915e..33be4d8ac39a73ae673282beefabfe20f10949b2 100644 (file)
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -8667,7 +8667,7 @@ otherwise the cache is dropped for the processed
 portion of the file.  Also when count=0
 failure to discard the cache is diagnosed
 and reflected in the exit status.
-Here as some usage examples:
+Here are some usage examples:
 
 @example
 # Advise to drop cache for whole file

diff --git a/src/copy.c b/src/copy.c
index 6771bb53b7bf50b0fb3ef37f7a5d186ec7edba94..d1644e7fff91890f7d66272c1b3413afcf370482 100644 (file)
--- a/src/copy.c
+++ b/src/copy.c
@@ -1819,7 +1819,7 @@ should_dereference (const struct cp_options *x, bool command_line_arg)
 /* Copy the file SRC_NAME to the file DST_NAME.  The files may be of
    any type.  NEW_DST should be true if the file DST_NAME cannot
    exist because its parent directory was just created; NEW_DST should
-   be false if DST_NAME might already exist.  A nonnull PARENT describes the
+   be false if DST_NAME might already exist.  A non-null PARENT describes the
    parent directory.  ANCESTORS points to a linked, null terminated list of
    devices and inodes of parent directories of SRC_NAME.  COMMAND_LINE_ARG
    is true iff SRC_NAME was specified on the command line.
@@ -2375,7 +2375,7 @@ copy_internal (char const *src_name, char const *dst_name,
          If this happens to you, please do the following and send the output
          to the bug-reporting address (e.g., in the output of cp --help):
            touch k; perl -e 'rename "k","/tmp/k" or print "$!(",$!+0,")\n"'
-         where your current directory is on one partion and /tmp is the other.
+         where your current directory is on one partition and /tmp is the other.
          Also, please try to find the E* errno macro name corresponding to
          the diagnostic and parenthesized integer, and include that in your
          e-mail.  One way to do that is to run a command like this

diff --git a/src/df.c b/src/df.c
index 250a570b40a281448812f99f7c55eb69eefd1a25..c1c1e683178f843febeb167224fe8ad2a1122a4f 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -15,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.
-   --human-readable and --megabyte options added by lm@sgi.com.
+   --human-readable option added by lm@sgi.com.
    --si and large file support added by eggert@twinsun.com.  */
 
 #include <config.h>

diff --git a/src/factor.c b/src/factor.c
index ee578bfe5de84777b2c3d3eaa7e6c110a4333331..b195c05450ed43ec03fe1cbef968ce175397bb98 100644 (file)
--- a/src/factor.c
+++ b/src/factor.c
@@ -37,7 +37,7 @@
 
     Using GMP is optional.  Define HAVE_GMP to make this code include GMP
     factoring code.  The GMP factoring code is based on GMP's demos/factorize.c
-    (last synched 2012-09-07).  The GMP-based factoring code will stay in GMP
+    (last synced 2012-09-07).  The GMP-based factoring code will stay in GMP
     factoring code even if numbers get small enough for using the two-word
     code.
 

diff --git a/src/ls.c b/src/ls.c
index 2ae548d996b236660c6cea10293a31c674c21f01..52750b0b16630acbc86306639af277a1ea150cc3 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -945,7 +945,7 @@ static size_t dired_pos;
       }                                                                        \
     while (0)
 
-/* With --dired, store pairs of beginning and ending indices of filenames.  */
+/* With --dired, store pairs of beginning and ending indices of file names.  */
 static struct obstack dired_obstack;
 
 /* With --dired, store pairs of beginning and ending indices of any
@@ -2156,7 +2156,7 @@ get_funky_string (char **dest, const char **src, bool equals_end,
               state = ST_END;  /* End of string */
               break;
             case '\\':
-              state = ST_BACKSLASH; /* Backslash scape sequence */
+              state = ST_BACKSLASH; /* Backslash escape sequence */
               ++p;
               break;
             case '^':
@@ -3478,7 +3478,7 @@ cmp_name (struct fileinfo const *a, struct fileinfo const *b,
 }
 
 /* Compare file extensions.  Files with no extension are 'smallest'.
-   If extensions are the same, compare by filenames instead.  */
+   If extensions are the same, compare by file names instead.  */
 
 static inline int
 cmp_extension (struct fileinfo const *a, struct fileinfo const *b,

diff --git a/src/pr.c b/src/pr.c
index c54857bb66c7ab7d6c9cd0cac70b3e0c7fda0bb2..5a71f2ae4c4fc09af16d09714f8a4ae7a62064a8 100644 (file)
--- a/src/pr.c
+++ b/src/pr.c
@@ -468,7 +468,7 @@ static size_t buff_allocated;
    we do column balancing on the last page. */
 static int *line_vector;
 
-/* Array of horizonal positions.
+/* Array of horizontal positions.
    For each line in line_vector, end_vector[line] is the horizontal
    position we are in after printing that line.  We keep track of this
    so that we know how much we need to pad to prepare for the next

diff --git a/src/relpath.c b/src/relpath.c
index 5ba4b9c1092d2e49e5703debbd3e1a10b4ccf15c..44b17388823724991000eb56d93abeb9ceeac1f2 100644 (file)
--- a/src/relpath.c
+++ b/src/relpath.c
@@ -83,7 +83,7 @@ buffer_or_output (const char* str, char **pbuf, size_t *plen)
 }
 
 /* Output the relative representation if possible.
-   If BUF is non NULL, write to that buffer rather than to stdout.  */
+   If BUF is non-NULL, write to that buffer rather than to stdout.  */
 bool
 relpath (const char *can_fname, const char *can_reldir, char *buf, size_t len)
 {

diff --git a/src/shred.c b/src/shred.c
index 08e212a23dfa5b7d037b1cef8bfdab4117e3185e..a7cfc6b784b3f1a4731fdef34dc04bc5b00fb054 100644 (file)
--- a/src/shred.c
+++ b/src/shred.c
@@ -431,7 +431,7 @@ dopass (int fd, struct stat const *st, char const *qname, off_t *sizep,
         unsigned long int k, unsigned long int n)
 {
   off_t size = *sizep;
-  off_t offset;                        /* Current file posiiton */
+  off_t offset;                        /* Current file position */
   time_t thresh IF_LINT ( = 0);        /* Time to maybe print next status update */
   time_t now = 0;              /* Current time */
   size_t lim;                  /* Amount of data to try writing */

diff --git a/src/sort.c b/src/sort.c
index 399b9644d527da5b4e6d5ff4ce11ee14aadb28ec..cf29727de3990949f58c0c6b30e3464dda86761a 100644 (file)
--- a/src/sort.c
+++ b/src/sort.c
@@ -238,7 +238,7 @@ struct month
 struct merge_node
 {
   struct line *lo;              /* Lines to merge from LO child node. */
-  struct line *hi;              /* Lines to merge from HI child ndoe. */
+  struct line *hi;              /* Lines to merge from HI child node. */
   struct line *end_lo;          /* End of available lines from LO. */
   struct line *end_hi;          /* End of available lines from HI. */
   struct line **dest;           /* Pointer to destination of merge. */
@@ -678,7 +678,7 @@ struct sortfile
   /* The file's name.  */
   char const *name;
 
-  /* Nonnull if this is a temporary file, in which case NAME == TEMP->name.  */
+  /* Non-null if this is a temporary file, in which case NAME == TEMP->name.  */
   struct tempnode *temp;
 };
 
@@ -2736,7 +2736,7 @@ compare (struct line const *a, struct line const *b)
 }
 
 /* Write LINE to output stream FP; the output file's name is
-   OUTPUT_FILE if OUTPUT_FILE is nonnull, and is the standard output
+   OUTPUT_FILE if OUTPUT_FILE is non-null, and is the standard output
    otherwise.  If debugging is enabled and FP is standard output,
    append some debugging information.  */
 

diff --git a/src/split.c b/src/split.c
index 301f4baa6411225afeb518c36d7e56781f496776..ef61c69330c2ff4a79bc58a8dc1683f0d2c8e1ba 100644 (file)
--- a/src/split.c
+++ b/src/split.c
@@ -1285,7 +1285,7 @@ main (int argc, char **argv)
           if (split_type != type_undef)
             FAIL_ONLY_ONE_WAY ();
           split_type = type_bytes;
-          /* Limit to OFF_T_MAX, becaue if input is a pipe, we could get more
+          /* Limit to OFF_T_MAX, because if input is a pipe, we could get more
              data than is possible to write to a single file, so indicate that
              immediately rather than having possibly future invocations fail. */
           n_units = xdectoumax (optarg, 1, OFF_T_MAX, multipliers,

diff --git a/src/stdbuf.c b/src/stdbuf.c
index 116619d7a913f9f6917d3570f29a4b97db23e5d1..31061e785f1ce288520cb87cd5f7eb55f8d3436e 100644 (file)
--- a/src/stdbuf.c
+++ b/src/stdbuf.c
@@ -381,7 +381,7 @@ main (int argc, char **argv)
      stdbuf is running from.  */
   set_program_path (program_name);
   if (!program_path)
-    program_path = xstrdup (PKGLIBDIR);  /* Need to init to non NULL.  */
+    program_path = xstrdup (PKGLIBDIR);  /* Need to init to non-NULL.  */
   set_LD_PRELOAD ();
   free (program_path);
 

diff --git a/tests/misc/seq-precision.sh b/tests/misc/seq-precision.sh
index b8382ca19c816cec8c7725f656f4be8348a57909..62464d673157b0369835e15233ff310a376ae274 100755 (executable)
--- a/tests/misc/seq-precision.sh
+++ b/tests/misc/seq-precision.sh
@@ -25,7 +25,7 @@ seq 999999 inf | head -n2 > out || fail=1
 printf "%s\n" 999999 1000000 > exp || framework_failure_
 compare exp out || fail=1
 
-# Excercise buffer handling in non floating point output
+# Exercise buffer handling in non floating point output
 for i in $(seq 100); do
   n1="$(printf '%*s' $i '' | tr ' ' 9)"
   n2="1$(echo $n1 | tr 9 0)"