merge revision(s) 54755: [Backport ruby#12313]

unak · unak · commit f9a641fdd2d7 · 2016-04-26T04:26:16.000Z
* encoding.c: Fix return value of `Encoding::ISO8859_1.name` [Bug ruby#12313][ruby-core:75147][ci skip] * ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new` git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 26 13:25:25 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* 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@gmail.com>
 
 	* configure.in: add missing -lm for AIX.
diff --git a/encoding.c b/encoding.c
@@ -1691,7 +1691,7 @@ rb_enc_aliases(VALUE klass)
  * optionally, aliases:
  *
  *   Encoding::ISO_8859_1.name
- *   #=> #<Encoding:ISO-8859-1>
+ *   #=> "ISO-8859-1"
  *
  *   Encoding::ISO_8859_1.names
  *   #=> ["ISO-8859-1", "ISO8859-1"]
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
@@ -1079,7 +1079,7 @@ BigDecimal_comp(VALUE self, VALUE r)
  *
  * 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)
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

Original file line number	Diff line number	Diff line change
`@@ -1691,7 +1691,7 @@ rb_enc_aliases(VALUE klass)`
`1691`	`1691`	`* optionally, aliases:`
`1692`	`1692`	`*`
`1693`	`1693`	`* Encoding::ISO_8859_1.name`
`1694`		`- * #=> #<Encoding:ISO-8859-1>`
	`1694`	`+ * #=> "ISO-8859-1"`
`1695`	`1695`	`*`
`1696`	`1696`	`* Encoding::ISO_8859_1.names`
`1697`	`1697`	`* #=> ["ISO-8859-1", "ISO8859-1"]`
Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,7 @@ BigDecimal_comp(VALUE self, VALUE r)`
`1079`	`1079`	`*`
`1080`	`1080`	`* Values may be coerced to perform the comparison:`
`1081`	`1081`	`*`
`1082`		`- * BigDecimal.new('1.0') == 1.0 -> true`
	`1082`	`+ * BigDecimal.new('1.0') == 1.0 #=> true`
`1083`	`1083`	`*/`
`1084`	`1084`	`static VALUE`
`1085`	`1085`	`BigDecimal_eq(VALUE self, VALUE r)`