merge revision(s) 42379: [Backport #8904]

nagachika · nagachika · commit 4dbca94e9ecc · 2013-09-13T14:18:33.000Z
* enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle Patch by @kachick [Fixes GH-372] #372 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 13 23:16:12 2013  Zachary Scott  <e@zzak.io>
+
+	* 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  <ko1@atdot.net>
 
 	* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1347,8 +1347,8 @@ lazy_set_method(VALUE lazy, VALUE args, VALUE (*size_fn)(ANYARGS))`
`1347`	`1347`	`*`
`1348`	`1348`	`* Returns a lazy enumerator, whose methods map/collect,`
`1349`	`1349`	`* flat_map/collect_concat, select/find_all, reject, grep, zip, take,`
`1350`		`- * take_while, drop, drop_while, and cycle enumerate values only on an`
`1351`		`- * as-needed basis. However, if a block is given to zip or cycle, values`
	`1350`	`+ * take_while, drop, and drop_while enumerate values only on an`
	`1351`	`+ * as-needed basis. However, if a block is given to zip, values`
`1352`	`1352`	`* are enumerated immediately.`
`1353`	`1353`	`*`
`1354`	`1354`	`* === Example`