summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Doc/Zsh/contrib.yo7
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c93f8a3e9..9650a5754 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-08 Barton E. Schaefer <schaefer@zsh.org>
+
+ * unposted, see users/17062: Doc/Zsh/contrib.yo: Briefly describe
+ option semantic differences from xargs to zargs. (Merged with
+ PWS edits.)
+
2012-05-08 Peter Stephenson <pws@csr.com>
* 30469: Src/builtin.c: allow reverse listing of history using
@@ -16284,5 +16290,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5649 $
+* $Revision: 1.5650 $
*****************************************************
diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo
index 2a22d23ab..ea96d5dbc 100644
--- a/Doc/Zsh/contrib.yo
+++ b/Doc/Zsh/contrib.yo
@@ -3501,6 +3501,13 @@ example(zargs -e.. -- **/*(.) .. ls -l)
This is a good choice in that example because no plain file can be named
`tt(..)', but the best end-marker depends on the circumstances.
+The options tt(-i), tt(-I), tt(-l), tt(-L), and tt(-n) differ slightly
+from their usage in tt(xargs). There are no input lines for tt(zargs) to
+count, so tt(-l) and tt(-L) count through the var(input) list, and tt(-n)
+counts the number of arguments passed to each execution of var(command),
+em(including) any var(arg) list. Also, any time tt(-i) or tt(-I) is used,
+each var(input) is processed separately as if by `tt(-L) tt(1)'.
+
For details of the other tt(zargs) options, see zmanref(xargs) (but note
the difference in function between tt(zargs) and tt(xargs)) or run
tt(zargs) with the tt(-)tt(-help) option.