usa	2014-07-07 12:52:52 +0900 (Mon, 07 Jul 2014)

  New Revision: 46745

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

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

  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 46744)
+++ ruby_2_0_0/ChangeLog	(revision 46745)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Jul  7 12:52:44 2014  Zachary Scott  <e@z...>
+
+	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
+	  Patch by Erik Hollembeak [Bug #9814]
+
 Mon Jul  7 12:51:09 2014  Zachary Scott  <e@z...>
 
 	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
Index: ruby_2_0_0/enumerator.c
===================================================================
--- ruby_2_0_0/enumerator.c	(revision 46744)
+++ ruby_2_0_0/enumerator.c	(revision 46745)
@@ -795,7 +795,7 @@ enumerator_peek_values_m(VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/enumerator.c#L795
  *   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_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46744)
+++ ruby_2_0_0/version.h	(revision 46745)
@@ -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 "2014-07-07"
-#define RUBY_PATCHLEVEL 527
+#define RUBY_PATCHLEVEL 528
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

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


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