From: Pádraig Brady <P@draigBrady.com>
Date: Sun, 1 Sep 2013 17:40:26 +0000 (+0100)
Subject: maint: update out of date confusing comments
X-Git-Tag: v8.22~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0603ff3784c353cf096a02b825f76fd3a08ac756;p=thirdparty%2Fcoreutils.git

maint: update out of date confusing comments

* src/copy.c (copy_internal): Change mention of the removed --reply=no
option, to the similar in this context --no-clobber.
* src/sort.c: SI and IEC suffixes can now be mixed when --human-numeric.
---

diff --git a/src/copy.c b/src/copy.c
index f0cebb1b1a..f66ab46465 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -1762,7 +1762,7 @@ copy_internal (char const *src_name, char const *dst_name,
              returning early, and hence not copying/moving the file.
              This may be due to an interactive 'negative' reply to the
              prompt about the existing file.  It may also be due to the
-             use of the --reply=no option.
+             use of the --no-clobber option.
 
              cp and mv treat -i and -f differently.  */
           if (x->move_mode)
diff --git a/src/sort.c b/src/sort.c
index 062b5f946f..bb4e3136ed 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -221,7 +221,7 @@ struct keyfield
   bool general_numeric;		/* Flag for general, numeric comparison.
                                    Handle numbers in exponential notation. */
   bool human_numeric;		/* Flag for sorting by human readable
-                                   units with either SI xor IEC prefixes. */
+                                   units with either SI or IEC prefixes. */
   bool month;			/* Flag for comparison by month name. */
   bool reverse;			/* Reverse the sense of comparison. */
   bool version;			/* sort by version number */