naruse	2015-01-22 11:47:44 +0900 (Thu, 22 Jan 2015)

  New Revision: 49375

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

  Log:
    merge revision(s) 49056: [Backport #10671]
    
    * doc/syntax/literals.rdoc (Symbols): now Symbols created by
      interpolation can be garbage collected.  patch by Yihang Ho in
      [ruby-core:67194].  [Bug #10671]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/doc/syntax/literals.rdoc
    branches/ruby_2_2/version.h
Index: ruby_2_2/doc/syntax/literals.rdoc
===================================================================
--- ruby_2_2/doc/syntax/literals.rdoc	(revision 49374)
+++ ruby_2_2/doc/syntax/literals.rdoc	(revision 49375)
@@ -199,9 +199,6 @@ You may also create symbols by interpola https://github.com/ruby/ruby/blob/trunk/ruby_2_2/doc/syntax/literals.rdoc#L199
   :"my_symbol1"
   :"my_symbol#{1 + 1}"
 
-Note that symbols are never garbage collected so be careful when referencing
-symbols using interpolation.
-
 Like strings, a single-quote may be used to disable interpolation:
 
   :'my_symbol#{1 + 1}' #=> :"my_symbol\#{1 + 1}"
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49374)
+++ ruby_2_2/ChangeLog	(revision 49375)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Jan 22 11:47:31 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* doc/syntax/literals.rdoc (Symbols): now Symbols created by
+	  interpolation can be garbage collected.  patch by Yihang Ho in
+	  [ruby-core:67194].  [Bug #10671]
+
 Thu Jan 22 11:45:32 2015  Kazuki Tsujimoto  <kazuki@c...>
 
 	* eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c:
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49374)
+++ ruby_2_2/version.h	(revision 49375)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-22"
-#define RUBY_PATCHLEVEL 35
+#define RUBY_PATCHLEVEL 36
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1

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


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