nagachika	2013-04-25 00:39:32 +0900 (Thu, 25 Apr 2013)

  New Revision: 40445

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

  Log:
    merge revision(s) 40434:
    
    * string.c: Document String#setbyte return value by @gjmurakami-10gen
      [Fixes GH-294]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/string.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40444)
+++ ruby_2_0_0/ChangeLog	(revision 40445)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Apr 25 00:39:16 2013  Zachary Scott  <zachary@z...>
+
+	* string.c: Document String#setbyte return value by @gjmurakami-10gen
+	  [Fixes GH-294]
+
 Thu Apr 25 00:38:06 2013  Zachary Scott  <zachary@z...>
 
 	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
Index: ruby_2_0_0/string.c
===================================================================
--- ruby_2_0_0/string.c	(revision 40444)
+++ ruby_2_0_0/string.c	(revision 40445)
@@ -4090,9 +4090,9 @@ rb_str_getbyte(VALUE str, VALUE index) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/string.c#L4090
 
 /*
  *  call-seq:
- *     str.setbyte(index, int) -> int
+ *     str.setbyte(index, integer) -> integer
  *
- *  modifies the <i>index</i>th byte as <i>int</i>.
+ *  modifies the <i>index</i>th byte as <i>integer</i>.
  */
 static VALUE
 rb_str_setbyte(VALUE str, VALUE index, VALUE value)
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40444)
+++ ruby_2_0_0/version.h	(revision 40445)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-04-25"
-#define RUBY_PATCHLEVEL 164
+#define RUBY_PATCHLEVEL 165
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40434


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