yugui	2011-01-28 11:25:56 +0900 (Fri, 28 Jan 2011)

  New Revision: 30696

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30696

  Log:
    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]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/string.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30695)
+++ ruby_1_9_2/ChangeLog	(revision 30696)
@@ -1,3 +1,8 @@
+Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* string.c (rb_str_resize): get rid of out-of-bound access.
Index: ruby_1_9_2/string.c
===================================================================
--- ruby_1_9_2/string.c	(revision 30695)
+++ ruby_1_9_2/string.c	(revision 30696)
@@ -2539,7 +2539,7 @@
  *  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
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30695)
+++ ruby_1_9_2/version.h	(revision 30696)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/