From d29595ceeeea08d86d3ceeec07850d4e638ba3f8 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 7 Jul 2014 03:52:52 +0000 Subject: [PATCH] merge revision(s) 46099: [Backport #9814] * enumerator.c: [DOC] Fix example to show Enumerator#peek behavior Patch by Erik Hollembeak [Bug #9814] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ enumerator.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 571ba50a4e..a2ed73f72b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jul 7 12:52:44 2014 Zachary Scott + + * 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 * enum.c: [DOC] Use #find in example to clarify alias by @rachellogie diff --git a/enumerator.c b/enumerator.c index 4ba0ac6f12..23590fbf43 100644 --- a/enumerator.c +++ b/enumerator.c @@ -795,7 +795,7 @@ enumerator_peek_values_m(VALUE obj) * p e.peek #=> 2 * p e.next #=> 2 * p e.next #=> 3 - * p e.next #raises StopIteration + * p e.peek #raises StopIteration * */ diff --git a/version.h b/version.h index 6d28110fd3..972c64a870 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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