merge revision(s) r46481: [Backport ruby#9966]

nagachika · nagachika · commit 4ac47f315cfd · 2014-08-18T14:38:34.000Z
* encoding.c (enc_find): [DOC] never accepted a symbol. [ruby-dev:48308] [Bug ruby#9966] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 18 23:38:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_find): [DOC] never accepted a symbol.
+	  [ruby-dev:48308] [Bug #9966]
+
 Mon Aug 18 23:22:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (rb_str_resize): update capa only when buffer get
diff --git a/encoding.c b/encoding.c
@@ -1142,13 +1142,11 @@ enc_list(VALUE klass)
 /*
  * call-seq:
  *   Encoding.find(string) -> enc
- *   Encoding.find(symbol) -> enc
  *
  * Search the encoding with specified <i>name</i>.
- * <i>name</i> should be a string or symbol.
+ * <i>name</i> should be a string.
  *
  *   Encoding.find("US-ASCII")  #=> #<Encoding:US-ASCII>
- *   Encoding.find(:Shift_JIS)  #=> #<Encoding:Shift_JIS>
  *
  * Names which this method accept are encoding names and aliases
  * including following special aliases
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-08-18"
-#define RUBY_PATCHLEVEL 201
+#define RUBY_PATCHLEVEL 202
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 8

-Original file line number
+Diff line change
@@ @@ -1,3 +1,8 @@ @@
 +Mon Aug 18 23:38:21 2014  Nobuyoshi Nakada  <[email protected]>
++
 +	* encoding.c (enc_find): [DOC] never accepted a symbol.
 +	  [ruby-dev:48308] [Bug #9966]
++
 Mon Aug 18 23:22:03 2014  Nobuyoshi Nakada  <[email protected]>
 	* string.c (rb_str_resize): update capa only when buffer get
Original file line number	Diff line number	Diff line change
`@@ -1142,13 +1142,11 @@ enc_list(VALUE klass)`
`1142`	`1142`	`/*`
`1143`	`1143`	`* call-seq:`
`1144`	`1144`	`* Encoding.find(string) -> enc`
`1145`		`- * Encoding.find(symbol) -> enc`
`1146`	`1145`	`*`
`1147`	`1146`	`* Search the encoding with specified <i>name</i>.`
`1148`		`- * <i>name</i> should be a string or symbol.`
	`1147`	`+ * <i>name</i> should be a string.`
`1149`	`1148`	`*`
`1150`	`1149`	`* Encoding.find("US-ASCII") #=> #<Encoding:US-ASCII>`
`1151`		`- * Encoding.find(:Shift_JIS) #=> #<Encoding:Shift_JIS>`
`1152`	`1150`	`*`
`1153`	`1151`	`* Names which this method accept are encoding names and aliases`
`1154`	`1152`	`* including following special aliases`