From 2d360c5e9524986175b9eebc949f738769096af4 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 25 Apr 2016 17:55:14 +0000
Subject: 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`


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 encoding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'encoding.c')

diff --git a/encoding.c b/encoding.c
index b030f21875..f5f7555eca 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1718,7 +1718,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"]
-- 
cgit v1.2.3