From: Pádraig Brady Date: Mon, 20 Dec 2010 07:49:07 +0000 (+0000) Subject: maint: fix a typo in sort --parallel help message X-Git-Tag: v8.8~8 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41159f9604ac101746032f304ade13f52c48f65f;p=thirdparty%2Fcoreutils.git 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 --- diff --git a/.mailmap b/.mailmap index 5a07abda31..d4fcef5c28 100644 --- a/.mailmap +++ b/.mailmap @@ -9,3 +9,4 @@ Evan Hunt Evan Hunt Pádraig Brady + diff --git a/THANKS b/THANKS index b17f4bfb86..9060c2f8a4 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 6cc0588967..f193e04a08 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);