nagachika	2014-07-04 00:46:17 +0900 (Fri, 04 Jul 2014)

  New Revision: 46677

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

  Log:
    merge revision(s) r46099: [Backport #9814]
    
    * enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
      Patch by Erik Hollembeak [Bug #9814]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/enumerator.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46676)
+++ ruby_2_1/ChangeLog	(revision 46677)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Jul  4 00:46:03 2014  Zachary Scott  <e@z...>
+
+	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
+	  Patch by Erik Hollembeak [Bug #9814]
+
 Fri Jul  4 00:44:43 2014  Zachary Scott  <e@z...>
 
 	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
Index: ruby_2_1/enumerator.c
===================================================================
--- ruby_2_1/enumerator.c	(revision 46676)
+++ ruby_2_1/enumerator.c	(revision 46677)
@@ -838,7 +838,7 @@ enumerator_peek_values_m(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/enumerator.c#L838
  *   p e.peek   #=> 2
  *   p e.next   #=> 2
  *   p e.next   #=> 3
- *   p e.next   #raises StopIteration
+ *   p e.peek   #raises StopIteration
  *
  */
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46676)
+++ ruby_2_1/version.h	(revision 46677)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-07-04"
-#define RUBY_PATCHLEVEL 165
+#define RUBY_PATCHLEVEL 166
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46099


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