naruse	2017-03-12 02:40:32 +0900 (Sun, 12 Mar 2017)

  New Revision: 57866

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

  Log:
    merge revision(s) 57390:
    
    Hash#fetch: fix grammar in documentation.
    
    [Fix GH-1515][ci skip]
    Author:    Alyssa Ross <hi+services.github@a...>

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/hash.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57865)
+++ ruby_2_4/version.h	(revision 57866)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 31
+#define RUBY_PATCHLEVEL 32
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/hash.c
===================================================================
--- ruby_2_4/hash.c	(revision 57865)
+++ ruby_2_4/hash.c	(revision 57866)
@@ -876,9 +876,9 @@ rb_hash_lookup(VALUE hash, VALUE key) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/hash.c#L876
  *
  *  Returns a value from the hash for the given key. If the key can't be
  *  found, there are several options: With no other arguments, it will
- *  raise an <code>KeyError</code> exception; if <i>default</i> is
- *  given, then that will be returned; if the optional code block is
- *  specified, then that will be run and its result returned.
+ *  raise a <code>KeyError</code> exception; if <i>default</i> is given,
+ *  then that will be returned; if the optional code block is specified,
+ *  then that will be run and its result returned.
  *
  *     h = { "a" => 100, "b" => 200 }
  *     h.fetch("a")                            #=> 100

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57390


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