usa	2016-04-26 13:26:16 +0900 (Tue, 26 Apr 2016)

  New Revision: 54772

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

  Log:
    merge revision(s) 54755: [Backport #12313]
    
    * encoding.c: Fix return value of `Encoding::ISO8859_1.name`
      [Bug #12313][ruby-core:75147][ci skip]
    
    * ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/encoding.c
    branches/ruby_2_2/ext/bigdecimal/bigdecimal.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ext/bigdecimal/bigdecimal.c
===================================================================
--- ruby_2_2/ext/bigdecimal/bigdecimal.c	(revision 54771)
+++ ruby_2_2/ext/bigdecimal/bigdecimal.c	(revision 54772)
@@ -1079,7 +1079,7 @@ BigDecimal_comp(VALUE self, VALUE r) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/bigdecimal/bigdecimal.c#L1079
  *
  * Values may be coerced to perform the comparison:
  *
- * BigDecimal.new('1.0') == 1.0  -> true
+ *   BigDecimal.new('1.0') == 1.0  #=> true
  */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54771)
+++ ruby_2_2/ChangeLog	(revision 54772)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Apr 26 13:25:25 2016  Marcus Stollsteimer  <sto.mar@w...>
+
+	* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
+	  [Bug #12313][ruby-core:75147][ci skip]
+	* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
+
 Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* configure.in: add missing -lm for AIX.
Index: ruby_2_2/encoding.c
===================================================================
--- ruby_2_2/encoding.c	(revision 54771)
+++ ruby_2_2/encoding.c	(revision 54772)
@@ -1691,7 +1691,7 @@ rb_enc_aliases(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/encoding.c#L1691
  * optionally, aliases:
  *
  *   Encoding::ISO_8859_1.name
- *   #=> #<Encoding:ISO-8859-1>
+ *   #=> "ISO-8859-1"
  *
  *   Encoding::ISO_8859_1.names
  *   #=> ["ISO-8859-1", "ISO8859-1"]
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54771)
+++ ruby_2_2/version.h	(revision 54772)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-26"
-#define RUBY_PATCHLEVEL 317
+#define RUBY_PATCHLEVEL 318
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54755


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