summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-24 15:12:30 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-24 15:12:30 +0000
commit9f110100be6555e5a8f33171a53602a201af9a83 (patch)
tree9eda6bb574f0462dea1d0ecde6a7530ab6683907
parent80a83ca64f59d26c14c20e9250bf394722b2e396 (diff)
merge revision(s) 41593:
* array.c: Return value in Array overview example found by @PragTob [Fix GH-336] https://github.com/ruby/ruby/pull/336 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6cbb195501..576044e0b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 25 00:12:19 2013 Zachary Scott <zachary@zacharyscott.net>
+
+ * array.c: Return value in Array overview example found by @PragTob
+ [Fix GH-336] https://github.com/ruby/ruby/pull/336
+
Tue Jun 25 00:11:46 2013 Zachary Scott <zachary@zacharyscott.net>
* array.c (rb_ary_zip): typo by @PragTob [Fix GH-337]
diff --git a/array.c b/array.c
index 091e0cf0a1..6d4256a947 100644
--- a/array.c
+++ b/array.c
@@ -5415,7 +5415,7 @@ rb_ary_drop_while(VALUE ary)
*
* arr = [1, 2, 3, 4, 5, 6]
* arr.select { |a| a > 3 } #=> [4, 5, 6]
- * arr.reject { |a| a < 3 } #=> [4, 5, 6]
+ * arr.reject { |a| a < 3 } #=> [3, 4, 5, 6]
* arr.drop_while { |a| a < 4 } #=> [4, 5, 6]
* arr #=> [1, 2, 3, 4, 5, 6]
*
diff --git a/version.h b/version.h
index c88488997f..237f545e4a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-25"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6