nagachika	2014-07-04 00:44:54 +0900 (Fri, 04 Jul 2014)

  New Revision: 46676

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

  Log:
    merge revision(s) r46095: [Backport #9819]
    
    * enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
      Patch submitted via documenting-ruby/ruby#34

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/enum.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46675)
+++ ruby_2_1/ChangeLog	(revision 46676)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Jul  4 00:44:43 2014  Zachary Scott  <e@z...>
+
+	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
+	  Patch submitted via documenting-ruby/ruby#34
+
 Fri Jul  4 00:42:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
Index: ruby_2_1/enum.c
===================================================================
--- ruby_2_1/enum.c	(revision 46675)
+++ ruby_2_1/enum.c	(revision 46676)
@@ -203,8 +203,8 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, mem https://github.com/ruby/ruby/blob/trunk/ruby_2_1/enum.c#L203
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..10).detect  { |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).detect { |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
+ *     (1..10).detect	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
+ *     (1..100).find	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
  *
  */
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46675)
+++ ruby_2_1/version.h	(revision 46676)
@@ -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 164
+#define RUBY_PATCHLEVEL 165
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

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


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