nagachika	2013-09-13 23:18:33 +0900 (Fri, 13 Sep 2013)

  New Revision: 42935

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

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

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/enumerator.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42934)
+++ ruby_2_0_0/ChangeLog	(revision 42935)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Sep 13 23:16:12 2013  Zachary Scott  <e@z...>
+
+	* 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@a...>
 
 	* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
Index: ruby_2_0_0/enumerator.c
===================================================================
--- ruby_2_0_0/enumerator.c	(revision 42934)
+++ ruby_2_0_0/enumerator.c	(revision 42935)
@@ -1347,8 +1347,8 @@ lazy_set_method(VALUE lazy, VALUE args, https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/enumerator.c#L1347
  *
  * 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
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42934)
+++ ruby_2_0_0/version.h	(revision 42935)
@@ -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-09-13"
-#define RUBY_PATCHLEVEL 310
+#define RUBY_PATCHLEVEL 311
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 9

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


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