From d22db6cc4e07855a306e9087ef2ddf6dfaa26e35 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 21 Jun 2009 09:13:48 +0000
Subject: merges r23657 from trunk into ruby_1_9_1. -- * dir.c (dir_s_glob):
 fixed rdoc.  a patch from Joseph Pecoraro at   [ruby-core:23767].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 dir.c     | 2 +-
 version.h | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c600988cba..1364068d6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun  9 15:13:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_s_glob): fixed rdoc.  a patch from Joseph Pecoraro a
+	  [ruby-core:23767].
+
 Tue Jun  9 10:58:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, win32/Makefile.sub (RMALL): need for distclean-rdoc.
diff --git a/dir.c b/dir.c
index 4754b75aef..5a46f1bfc2 100644
--- a/dir.c
+++ b/dir.c
@@ -1635,7 +1635,7 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *                          match all files beginning with
  *                          <code>c</code>; <code>*c</code> will match
  *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
+ *                          <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.
diff --git a/version.h b/version.h
index d955f8a653..16d42a7c0b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 169
+#define RUBY_PATCHLEVEL 170
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-- 
cgit v1.2.3