summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/expn.yo6
-rw-r--r--LICENCE12
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 65f18c2f2..3ea29b6b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 31436: Doc/Zsh/expn.yo: KSH_GLOB syntax does not
+	support recursive directories.
+
 2013-05-29  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 31433: Completion/Unix/Command/_gzip: zcat -f doesn't
diff --git a/Doc/Zsh/expn.yo b/Doc/Zsh/expn.yo
index 89d5c06ef..e8d1ed297 100644
--- a/Doc/Zsh/expn.yo
+++ b/Doc/Zsh/expn.yo
@@ -1957,10 +1957,12 @@ item(tt(@LPAR())...tt(RPAR()))(
 Match the pattern in the parentheses.  (Like `tt(LPAR())...tt(RPAR())'.)
 )
 item(tt(*LPAR())...tt(RPAR()))(
-Match any number of occurrences.  (Like `tt(LPAR())...tt(RPAR()#)'.)
+Match any number of occurrences.  (Like `tt(LPAR())...tt(RPAR()#)',
+except that recursive directory searching is not supported.)
 )
 item(tt(PLUS()LPAR())...tt(RPAR()))(
-Match at least one occurrence.  (Like `tt(LPAR())...tt(RPAR()##)'.)
+Match at least one occurrence.  (Like `tt(LPAR())...tt(RPAR()##)',
+except that recursive directory searching is not supported..)
 )
 item(tt(?LPAR())...tt(RPAR()))(
 Match zero or one occurrence.  (Like `tt(LPAR()|)...tt(RPAR())'.)
diff --git a/LICENCE b/LICENCE
index 6e2f11401..fc87fe780 100644
--- a/LICENCE
+++ b/LICENCE
@@ -1,3 +1,15 @@
+Unless otherwise noted in the header of specific files, files in this
+distribution have the licence shown below.
+
+However, note that certain shell functions are licensed under versions
+of the GNU Public Licence.  Anyone distributing the shell as a binary
+including those files needs to take account of this.  Search shell
+functions for "Copyright" for specific copyright information.
+None of the core functions are affected by this, so those files
+may simply be omitted.
+
+--
+
 The Z Shell is copyright (c) 1992-2009 Paul Falstad, Richard Coleman,
 Zoltán Hidvégi, Andrew Main, Peter Stephenson, Sven Wischnowsky, and
 others.  All rights reserved.  Individual authors, whether or not