doc: note the use of LC_COLLATE in comm, join and uniq

* doc/coreutils.texi (uniq invocation): Simplify the
text to remove the inconsequential mentioning of order,
while implying that LC_COLLATE can alter equality comparisons.
* src/comm.c (usage): Mention LC_COLLATE is significant.
* src/join.c (usage): Ditto.
* src/uniq.c (usage): Ditto. Also improve the summary.
Suggestion from Andries Brouwer

diff --git a/doc/coreutils.texi b/doc/coreutils.texi
index 918f44e5af1c5bc12b4aebc7a6382c00211f059f..b96fdb20291856db1d530aead257195cf8c58492 100644 (file)
--- a/doc/coreutils.texi
+++ b/doc/coreutils.texi
@@ -4406,8 +4406,8 @@ duplicate lines, perhaps you want to use @code{sort -u}.
 @xref{sort invocation}.
 
 @vindex LC_COLLATE
-Comparisons use the character collating sequence specified by the
-@env{LC_COLLATE} locale category.
+Comparisons honor the rules specified by the @env{LC_COLLATE}
+locale category.
 
 If no @var{output} file is specified, @command{uniq} writes to standard
 output.

diff --git a/src/comm.c b/src/comm.c
index c60936f4b4f38a8ca8af610a0adb440d5423bfb0..3c5b09ad4d9f48ad0b06b9e9baf1f0ed6873d837 100644 (file)
--- a/src/comm.c
+++ b/src/comm.c
@@ -129,6 +129,10 @@ and column three contains lines common to both files.\n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);
       fputs (VERSION_OPTION_DESCRIPTION, stdout);
+      fputs (_("\
+\n\
+Note, comparisons honor the rules specified by `LC_COLLATE'.\n\
+"), stdout);
       emit_bug_reporting_address ();
     }
   exit (status);

diff --git a/src/join.c b/src/join.c
index 992a357b1775a1838ae5aa7f13169acb2e9cc630..c71669893f21bb351e05b72d917ed422ff03ffc6 100644 (file)
--- a/src/join.c
+++ b/src/join.c
@@ -204,6 +204,7 @@ separated by CHAR.\n\
 \n\
 Important: FILE1 and FILE2 must be sorted on the join fields.\n\
 E.g., use `sort -k 1b,1' if `join' has no options.\n\
+Note, comparisons honor the rules specified by `LC_COLLATE'.\n\
 If the input is not sorted and some lines cannot be joined, a\n\
 warning message will be given.\n\
 "), stdout);

diff --git a/src/uniq.c b/src/uniq.c
index a3e0fb7b5ec1bffee2969e0618fd2c57491fa36a..249b24ab3277081c21234618e5f8aed0c3672c19 100644 (file)
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -135,8 +135,10 @@ Usage: %s [OPTION]... [INPUT [OUTPUT]]\n\
 "),
              program_name);
       fputs (_("\
-Discard all but one of successive identical lines from INPUT (or\n\
-standard input), writing to OUTPUT (or standard output).\n\
+Filter adjacent matching lines from INPUT (or standard input),\n\
+writing to OUTPUT (or standard output).\n\
+\n\
+With no options, matching lines are merged to the first occurrence.\n\
 \n\
 "), stdout);
      fputs (_("\
@@ -170,6 +172,7 @@ characters.  Fields are skipped before chars.\n\
 \n\
 Note: 'uniq' does not detect repeated lines unless they are adjacent.\n\
 You may want to sort the input first, or use `sort -u' without `uniq'.\n\
+Also, comparisons honor the rules specified by `LC_COLLATE'.\n\
 "), stdout);
       emit_bug_reporting_address ();
     }