From 33e861ba3945aaf7fea2b740259d7409e57193bb Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 11 Jun 2010 04:21:07 +0000
Subject: [PATCH] merges r28158 from trunk into ruby_1_9_2. -- Clarification of
 what '*' matches.  Patch by John Wells <john.wells at greatworx.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 dir.c     | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2f45eabb17..853b08465a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  5 06:20:57 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* dir.c: Clarification of what '*' matches.  Patch by John Wells
+	  <john.wells at greatworx.com>
+
 Thu Jun  3 00:58:45 2010  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/dl/lib/dl/cparser.rb (parse_ctype): add backwards compatibility
diff --git a/dir.c b/dir.c
index fa7cdd03ea..cab0cdcc07 100644
--- a/dir.c
+++ b/dir.c
@@ -1741,7 +1741,10 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *                          <code>\*c\*</code> will match all files that
  *                          have <code>c</code> in them (including at
  *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
+ *                          <code>/ .* /x</code> in regexp. Note, this
+ *                          will not match Unix-like hidden files (dotfiles).
+ *                          In order to include those in the match results,
+ *                          you must use something like "{*,.*}".
  *  <code>**</code>::       Matches directories recursively.
  *  <code>?</code>::        Matches any one character. Equivalent to
  *                          <code>/.{1}/</code> in regexp.