merges r30654 from trunk into ruby_1_9_2.

--
* string.c (=~): documentation fix; the return value is nil when
  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cdaf70ba5..8ac2bf1d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (=~): documentation fix; the return value is nil when
+	  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
+
 Tue Jan 25 08:28:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_resize): get rid of out-of-bound access.
diff --git a/string.c b/string.c
index 33ee903e49..5c88353e75 100644
--- a/string.c
+++ b/string.c
@@ -2539,7 +2539,7 @@ rb_str_rindex_m(int argc, VALUE *argv, VALUE str)
  *  against <i>str</i>,and returns the position the match starts, or
  *  <code>nil</code> if there is no match. Otherwise, invokes
  *  <i>obj.=~</i>, passing <i>str</i> as an argument. The default
- *  <code>=~</code> in <code>Object</code> returns <code>false</code>.
+ *  <code>=~</code> in <code>Object</code> returns <code>nil</code>.
  *
  *     "cat o' 9 tails" =~ /\d/   #=> 7
  *     "cat o' 9 tails" =~ 9      #=> nil
diff --git a/version.h b/version.h
index 5d4717aa84..3cf2e615c3 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1