summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2010-12-20 07:49:07 +0000
committerPádraig Brady <P@draigBrady.com>2010-12-20 10:56:04 +0000
commit41159f9604ac101746032f304ade13f52c48f65f (patch)
tree25a1fbee47a960a33169e69a1fa04d32eeb9ed5c
parent4a423bedea5f1f14b477f7e27505b7d685623a3a (diff)
downloadcoreutils-41159f9604ac101746032f304ade13f52c48f65f.tar.xz
maint: fix a typo in sort --parallel help message
Also fix up Chen Guo's contacts * src/sort.c (usage): Add a missing "of" * THANKS: Add Chen Guo * .mailmap: Add Chen Guo's UCLA address
-rw-r--r--.mailmap1
-rw-r--r--THANKS1
-rw-r--r--src/sort.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 5a07abda3..d4fcef5c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,4 @@ Evan Hunt <ethanol@armory.com> Evan Hunt <jim@meyering.net>
<P@draigBrady.com> <P@draigBrady.com (trivial change)>
Pádraig Brady <p@draigbrady.com> <p@draigBrady.com>
<chen.guo.0625@gmail.com> <chenguo4@yahoo.com>
+<chen.guo.0625@gmail.com> <chenguo4@ucla.edu>
diff --git a/THANKS b/THANKS
index b17f4bfb8..9060c2f8a 100644
--- a/THANKS
+++ b/THANKS
@@ -106,6 +106,7 @@ Carlos Canau Carlos.Canau@relay.puug.pt
Charles Karney karney@pppl.gov
Charles Randall crandall@matchlogic.com
Chas. Owens chas.owens@gmail.com
+Chen Guo chen.guo.0625@gmail.com
Chip Salzenberg chip@valinux.com
Chris Clayton chris2553@googlemail.com
Chris Faylor cgf@cygnus.com
diff --git a/src/sort.c b/src/sort.c
index 6cc058896..f193e04a0 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -459,7 +459,7 @@ Other options:\n\
-t, --field-separator=SEP use SEP instead of non-blank to blank transition\n\
-T, --temporary-directory=DIR use DIR for temporaries, not $TMPDIR or %s;\n\
multiple options specify multiple directories\n\
- --parallel=N change the number sorts run concurrently to N\n\
+ --parallel=N change the number of sorts run concurrently to N\n\
-u, --unique with -c, check for strict ordering;\n\
without -c, output only the first of an equal run\n\
"), DEFAULT_TMPDIR);