From 4dbca94e9ecc96cf5ee14f200eaaa5178b6eccbf Mon Sep 17 00:00:00 2001 From: nagachika Date: Fri, 13 Sep 2013 14:18:33 +0000 Subject: [PATCH] merge revision(s) 42379: [Backport #8904] * enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle Patch by @kachick [Fixes GH-372] https://github.com/ruby/ruby/pull/372 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ enumerator.c | 4 ++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13ae0ac16f..298b6fabc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Sep 13 23:16:12 2013 Zachary Scott + + * enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle + Patch by @kachick [Fixes GH-372] + https://github.com/ruby/ruby/pull/372 + Fri Sep 13 22:40:28 2013 Koichi Sasada * vm_insnhelper.c (vm_search_super_method): use ci->argc instead of diff --git a/enumerator.c b/enumerator.c index 63b033fc2f..a273359115 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1347,8 +1347,8 @@ lazy_set_method(VALUE lazy, VALUE args, VALUE (*size_fn)(ANYARGS)) * * Returns a lazy enumerator, whose methods map/collect, * flat_map/collect_concat, select/find_all, reject, grep, zip, take, - * take_while, drop, drop_while, and cycle enumerate values only on an - * as-needed basis. However, if a block is given to zip or cycle, values + * take_while, drop, and drop_while enumerate values only on an + * as-needed basis. However, if a block is given to zip, values * are enumerated immediately. * * === Example diff --git a/version.h b/version.h index 89f1cb33cb..69c33068d0 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-09-13" -#define RUBY_PATCHLEVEL 310 +#define RUBY_PATCHLEVEL 311 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 9