[Findutils-patches] [PATCH] fix comment/changelog typos

[Jim Meyering]

Here's a patch to fix some typos.

I made this change manually, because the tool proposed three
alternatives:

diff --git a/m4/nullsort.m4 b/m4/nullsort.m4
index 5f592f7..10a1a93 100644
--- a/m4/nullsort.m4
+++ b/m4/nullsort.m4
@@ -13,7 +13,7 @@ else
         # sort thinks there is more than one input line there.   We have
         # to make sort -c do its thing with the input lines in the wrong
         # order to determine that (we can't do it in one shot because
-        # if sort returns nonzero we cant tell that it wasn't just
+        # if sort returns nonzero we can't tell that it wasn't just
         # complaining about this unknown -z option.
         if $SORT -z -c < "${srcdir:-.}/m4/order-bad.bin" 2>/dev/null >/dev/null
         then

Then noticed "dum" being changed to "dumb", but only in two
exception lists.  There, just removing the non-word is better.

Finally, using http://github.com/lyda/misspell-check and
some perl to massage its diagnostics into sed commands:

git ls-files|grep -v '\.po$'|misspellings -f -|perl -nl \
  -e '/^(.*?)\[(\d+)\]: (\w+) -> "(.*?)"$/ or next;' \
  -e '($file,$n,$l,$r)=($1,$2,$3,$4); $q="'\''"; $r=~s/$q/$q\\$q$q/g;'\
  -e 'print "sed -i $q${n}s!$l!$r!$q $file"'|bash


>From edf76262937c363e6d329693570e250a24338018 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Mon, 4 Jun 2012 12:30:52 +0200
Subject: [PATCH] fix comment/changelog typos

First, change "cant" to "can't" manually in m4/nullsort.m4,
since "cant" had 3 replacement options.  Then remove "dum"
from the LocalWords lists in doc/*.texi.  It was not used.
Finally, perform the remaining changes mechanically using
http://github.com/lyda/misspell-check and
some perl to massage its diagnostics into sed -i commands:

git ls-files|grep -v '\.po$'|misspellings -f -|perl -nl \
  -e '/^(.*?)\[(\d+)\]: (\w+) -> "(.*?)"$/ or next;' \
  -e '($file,$n,$l,$r)=($1,$2,$3,$4); $q="'\''"; $r=~s/$q/$q\\$q$q/g;'\
  -e 'print "sed -i $q${n}s!$l!$r!$q $file"'|bash
---
 ChangeLog                                     | 28 +++++++++++++--------------
 NEWS                                          |  2 +-
 TODO                                          |  2 +-
 doc/find-maint.texi                           |  4 ++--
 doc/find.texi                                 |  2 +-
 find/defs.h                                   |  2 +-
 find/print.c                                  |  2 +-
 find/testsuite/find.gnu/exec-one-rtn-fail.exp |  2 +-
 locate/locate.c                               |  2 +-
 m4/nullsort.m4                                |  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8455352..7f240a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,7 @@
        * find/print.c (parse_octal_escape): Instead of updating a const
        char* pointer to indicate how many characters from the input we
        consumed, update a size_t value.
-       (insert_fprintf): Change function defintion to match updated
+       (insert_fprintf): Change function definition to match updated
        prototype.  Eliminate fmt_inpos.  Introduce a `readpos' offset
        variable which takes the previous role of fmt_inpos.

@@ -271,7 +271,7 @@
        %(, %{ and %[, which are all rejected.
        * find/testsuite/Makefile.am (EXTRA_DIST_EXP): Add
        find.gnu/printf-reserved.exp.
-       * doc/find.texi (Reserved and Unkown Directives): Document this.
+       * doc/find.texi (Reserved and Unknown Directives): Document this.
        * find/find.1: Document this.
        * NEWS: Mention this change.

@@ -2892,7 +2892,7 @@

 2009-04-13  Andreas Metzler <address@hidden>

-       Fix Savannah bug# 26092: find.1 still marks -iwholename as prefered
+       Fix Savannah bug# 26092: find.1 still marks -iwholename as preferred
        * find/find.1 (-iwholename): Indicate that this option is no
        longer preferred over -ipath.

@@ -3059,7 +3059,7 @@
        * po/sl.po: Updated Slovenian translation.
        * po/sv.po: Updated Swedish translation.
        * po/tr.po: Updated Turkish translation.
-       * po/uk.po: Updated Ukranian translation.
+       * po/uk.po: Updated Ukrainian translation.
        * po/vi.po: Updated Vietnamese translation.
        * NEWS: Mention these updates.

@@ -3394,7 +3394,7 @@
        (UNUSUAL FILENAMES): Describe how LC_CTYPE affects -printf %p,
        -print, -fprint.
        (STANDARDS CONFORMANCE): -ok and -okdir now obey the system's
-       defintion of yes/no if POSIXLY_CORRECT is set.  In any case,
+       definition of yes/no if POSIXLY_CORRECT is set.  In any case,
        LC_CTYPE and LC_COLLATE may have some effect.  Point out that
        the setting of LC_MESSAGES deternmines what pattern is used to
        interpret the user's response to -ok/-okdir.
@@ -3937,7 +3937,7 @@
 2007-08-18  Eric Blake  <address@hidden>

        Fix Savannah bug #20751.
-       * lib/listfile.c (list_file): Accomodate gnulib change of 3 Jul
+       * lib/listfile.c (list_file): Accommodate gnulib change of 3 Jul
        2006.
        * NEWS: Document this.
        Reported by Nigel Stepp.
@@ -4885,7 +4885,7 @@

        * find/defs.h (pred_open) Rename to pred_openparen to avoid
        problems with the macrtos which build the parser tabnles on
-       platforms where 'open' is in fact a macro whcih expands to
+       platforms where 'open' is in fact a macro which expands to
        open64.   The problem was that token pasting put pred_open64 into
        the parser table, but the function was still defined as
        parse_open.   This fixes Savannah bug #19371.
@@ -5035,7 +5035,7 @@

 2007-04-20  Maxim V. Dziumanenko <address@hidden>

-       * po/uk.po: New Ukranian translation.
+       * po/uk.po: New Ukrainian translation.
        * configure.in: Added "uk" for Ukranian.

 2007-04-19  Peter Breitenlohner <address@hidden> (tiny change)
@@ -5225,7 +5225,7 @@
 2007-04-09  James Youngman  <address@hidden>

        * doc/find.texi: Change fully-specified @node directives to
-       single-argument @node directives in order to accomodate the
+       single-argument @node directives in order to accommodate the
        inclusion of getdate.texi.

        * doc/find.texi: Document -newerXY.
@@ -5589,7 +5589,7 @@
          find/testsuite/find.gnu/perm000.xo: -perm /000 is now quivalent
          to -perm -000, as dscussed in Savannah bug #14748.  The warning
          message we issue when the user does this now explains that the
-         defintion changed as we promised it would in 2005.
+         definition changed as we promised it would in 2005.

        * xargs/xargs.c (read_line): Correctly handle quoted empty
        arguments occurring first or last on a line (by adding an empty
@@ -6122,7 +6122,7 @@

        * find/fstype.c:
        Savannah bug #14921: when a Linux bind filesystem is in use, find
-       would expand '-printf %F' to 'none' if a bind mount targetted the same
+       would expand '-printf %F' to 'none' if a bind mount targeted the same
        filesystem as the one containing the file to be described.

        * NEWS: Updated to describe recent changes
@@ -6604,7 +6604,7 @@
        from Andreas Metzler)

        * INSTALL, depcomp, doc/texinfo.tex, install-sh, missing, mkinstalldirs:
-       Updated auxilliary files from the automake-1.9 distribution
+       Updated auxiliary files from the automake-1.9 distribution

        * configure.in:
        Introduce new Automake conditional, CROSS_COMPILING, true when we are 
corss compiling
@@ -8763,7 +8763,7 @@
        Debian bug #176201.

        * xargs/xargs.c:
-       Fixed Debian bug #176201, "xargs enviroment size limited to 20k", by
+       Fixed Debian bug #176201, "xargs environment size limited to 20k", by
        reading a patch offered by Bob Proulx and implementing something
        substantially similar myself.

@@ -10404,7 +10404,7 @@
        * wait.h: New file taken from xargs.c.

        * xargs.c: Make limits.h vs. sys/param.h conditional on
-       LIMITS_MISSING instead of USG, to accomodate SVR2.
+       LIMITS_MISSING instead of USG, to accommodate SVR2.

 1990-11-08  David J. MacKenzie  <address@hidden>

diff --git a/NEWS b/NEWS
index d8435fd..5b4881b 100644
--- a/NEWS
+++ b/NEWS
@@ -790,7 +790,7 @@ with a space

 ** Translations

-Findutils 4.3.4 includes a translation for the Ukranian language.
+Findutils 4.3.4 includes a translation for the Ukrainian language.


 * Major changes in release 4.3.3, 2007-04-15
diff --git a/TODO b/TODO
index aff56d4..1f694c3 100644
--- a/TODO
+++ b/TODO
@@ -17,7 +17,7 @@ Perhaps a better description in texi pages as well.
 * Add option for find to sort output in lexical order for use for updatedb
 address@hidden (Olivier) made the following suggestion:

-As I was running thru the code looking for the bug I wondered why the updatedb
+As I was running through the code looking for the bug I wondered why the 
updatedb
 has to use sort...
 why not add an option to find that sorts the output in lexical order?
 my point is:
diff --git a/doc/find-maint.texi b/doc/find-maint.texi
index 0ee7e72..8fa6c1e 100644
--- a/doc/find-maint.texi
+++ b/doc/find-maint.texi
@@ -839,7 +839,7 @@ traditional ("old") format that locate uses on other Unix 
systems.

 When locate reads filenames from a LOCATE02 database (the default
 format), the buffer into which data is read is automatically extended
-to accomodate the length of the filenames.
+to accommodate the length of the filenames.

 This automatic buffer extension does not happen for old-format
 databases.  Instead a 1026-byte buffer is used.  When a longer
@@ -1178,7 +1178,7 @@ Release} field of these bugs appropriately and make sure 
the
 @comment LocalWords: POSIXLY fls fprintf strftime locale's EDT GMT AP
 @comment LocalWords: EST diff perl backquotes sprintf Falstad Oct cron
 @comment LocalWords: eg vmunix mkdir afs allexec allwrite ARG bigram
address@hidden LocalWords: bigrams cd chmod comp crc CVS dbfile dum eof
address@hidden LocalWords: bigrams cd chmod comp crc CVS dbfile eof
 @comment LocalWords: fileserver filesystem fn frcode Ghazi Hnewc iXX
 @comment LocalWords: joeuser Kaveh localpaths localuser LOGNAME
 @comment LocalWords: Meyering mv netpaths netuser nonblank nonblanks
diff --git a/doc/find.texi b/doc/find.texi
index 0be7292..cc02822 100644
--- a/doc/find.texi
+++ b/doc/find.texi
@@ -5649,7 +5649,7 @@ Expressions}, for more information on expressions.
 @comment LocalWords: POSIXLY fls fprintf strftime locale's EDT GMT AP
 @comment LocalWords: EST diff perl backquotes sprintf Falstad Oct cron
 @comment LocalWords: eg vmunix mkdir afs allexec allwrite ARG bigram
address@hidden LocalWords: bigrams cd chmod comp crc CVS dbfile dum eof
address@hidden LocalWords: bigrams cd chmod comp crc CVS dbfile eof
 @comment LocalWords: fileserver filesystem fn frcode Ghazi Hnewc iXX
 @comment LocalWords: joeuser Kaveh localpaths localuser LOGNAME
 @comment LocalWords: Meyering mv netpaths netuser nonblank nonblanks
diff --git a/find/defs.h b/find/defs.h
index 6e11174..ca7d604 100644
--- a/find/defs.h
+++ b/find/defs.h
@@ -637,7 +637,7 @@ struct state
   /* The file being operated on, relative to the current directory.
      Used for stat, readlink, remove, and opendir.  */
   char *rel_pathname;
-  /* The directory fd to which rel_pathname is relative.  Thsi is relevant
+  /* The directory fd to which rel_pathname is relative.  This is relevant
    * when we're navigating the hierarchy with fts() and using FTS_CWDFD.
    */
   int cwd_dir_fd;
diff --git a/find/print.c b/find/print.c
index e307d95..025cd7d 100644
--- a/find/print.c
+++ b/find/print.c
@@ -608,7 +608,7 @@ format_date (struct timespec ts, int kind)

   /* human_readable() assumes we pass a buffer which is at least as
    * long as LONGEST_HUMAN_READABLE.  We use an assertion here to
-   * ensure that no nasty unsigned overflow happend in our calculation
+   * ensure that no nasty unsigned overflow happened in our calculation
    * of the size of buf.  Do the assertion here rather than in the
    * code for %@ so that we find the problem quickly if it exists.  If
    * you want to submit a patch to move this into the if statement, go
diff --git a/find/testsuite/find.gnu/exec-one-rtn-fail.exp 
b/find/testsuite/find.gnu/exec-one-rtn-fail.exp
index 91ec226..b761d1d 100644
--- a/find/testsuite/find.gnu/exec-one-rtn-fail.exp
+++ b/find/testsuite/find.gnu/exec-one-rtn-fail.exp
@@ -1,4 +1,4 @@
 # If -exec \; fails, it should return false.   The return
-# value of find shoudl stil; be 0, unless another error has
+# value of find should stil; be 0, unless another error has
 # happened.
 find_start p { /tmp -exec false \; -o \( -printf "yep\n" -quit \) }
diff --git a/locate/locate.c b/locate/locate.c
index db90ce2..64ad4fa 100644
--- a/locate/locate.c
+++ b/locate/locate.c
@@ -144,7 +144,7 @@ static const char warn_name_units[] = N_("days");
 enum visit_result
   {
     VISIT_CONTINUE = 1,  /* please call the next visitor */
-    VISIT_ACCEPTED = 2,  /* accepted, call no futher callbacks for this file */
+    VISIT_ACCEPTED = 2,  /* accepted, call no further callbacks for this file 
*/
     VISIT_REJECTED = 4,  /* rejected, process next file. */
     VISIT_ABORT    = 8   /* rejected, process no more files. */
   };
diff --git a/m4/nullsort.m4 b/m4/nullsort.m4
index 5f592f7..10a1a93 100644
--- a/m4/nullsort.m4
+++ b/m4/nullsort.m4
@@ -13,7 +13,7 @@ else
         # sort thinks there is more than one input line there.   We have
         # to make sort -c do its thing with the input lines in the wrong
         # order to determine that (we can't do it in one shot because
-        # if sort returns nonzero we cant tell that it wasn't just
+        # if sort returns nonzero we can't tell that it wasn't just
         # complaining about this unknown -z option.
         if $SORT -z -c < "${srcdir:-.}/m4/order-bad.bin" 2>/dev/null >/dev/null
         then
--
1.7.11.rc1