usa	2014-07-03 15:00:42 +0900 (Thu, 03 Jul 2014)

  New Revision: 46670

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

  Log:
    merge revision(s) 46481: [Backport #9966]
    
    * encoding.c (enc_find): [DOC] never accepted a symbol.
      [ruby-dev:48308] [Bug #9966]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/encoding.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/encoding.c
===================================================================
--- ruby_2_0_0/encoding.c	(revision 46669)
+++ ruby_2_0_0/encoding.c	(revision 46670)
@@ -1066,13 +1066,11 @@ enc_list(VALUE klass) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/encoding.c#L1066
 /*
  * 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
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 46669)
+++ ruby_2_0_0/ChangeLog	(revision 46670)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Thu Jul  3 15:00:35 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (enc_find): [DOC] never accepted a symbol.
+	  [ruby-dev:48308] [Bug #9966]
+
 Thu Jul  3 13:23:31 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p):
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46669)
+++ ruby_2_0_0/version.h	(revision 46670)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-07-03"
-#define RUBY_PATCHLEVEL 512
+#define RUBY_PATCHLEVEL 513
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46481


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