From: Joey Hess <joey@gnu.kitenet.net>
Date: Sat, 25 Jul 2009 08:02:56 +0000 (+0200)
Subject: update
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ddc5db2ce6e03ff7d7ff394b9285ff62d504b02;p=moreutils

update
---

diff --git a/debian/changelog b/debian/changelog
index 6d128e0..c8b8176 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 moreutils (0.37) UNRELEASED; urgency=low
 
   * parallel: Clarify man page regarding CPUs. Closes: #536597
+  * parallel: Add -n option. Thanks, Pierre Habouzit. Closes: #537992
+    (As a side effect, fixes a segfault if -- was omitted.)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 15 Jul 2009 10:13:28 -0400
 
diff --git a/parallel.docbook b/parallel.docbook
index 6da57bb..232a69c 100644
--- a/parallel.docbook
+++ b/parallel.docbook
@@ -87,8 +87,9 @@ Written by Joey Hess
 		<varlistentry>
 			<term><option>-n</option></term>
 			<listitem>
-				<para>Number of arguments to pass to one command at
-                                  once. Incompatible with -i</para>
+				<para>Number of arguments to pass to a
+				command at a time. Default is 1.
+				Incompatible with -i</para>
 			</listitem>
 		</varlistentry>
 		
@@ -106,7 +107,7 @@ Written by Joey Hess
 	</para>
 
 	<para>This runs three subshells that each print a message, delay,
-		and print another message. If yours system has multiple
+		and print another message. If your system has multiple
 		CPUs, parallel will run some of the jobs in parallel,
 		which should be clear from the order the messages are
 		output.