naruse	2013-12-22 19:22:18 +0900 (Sun, 22 Dec 2013)

  New Revision: 44342

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

  Log:
    merge revision(s) 44330: [Backport #9279]
    
    * lib/rubygems.rb (module Gem):  Fix comment for
      Gem::load_path_insert_index.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/rubygems.rb
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44341)
+++ ruby_2_1/ChangeLog	(revision 44342)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Dec 22 19:22:01 2013  Eric Hodel  <drbrain@s...>
+
+	* lib/rubygems.rb (module Gem):  Fix comment for
+	  Gem::load_path_insert_index.
+
 Sun Dec 22 18:08:42 2013  NAKAMURA Usaku  <usa@r...>
 
 	* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
Index: ruby_2_1/lib/rubygems.rb
===================================================================
--- ruby_2_1/lib/rubygems.rb	(revision 44341)
+++ ruby_2_1/lib/rubygems.rb	(revision 44342)
@@ -568,11 +568,8 @@ module Gem https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rubygems.rb#L568
   end
 
   ##
-  # The index to insert activated gem paths into the $LOAD_PATH.
-  #
-  # Defaults to the site lib directory unless gem_prelude.rb has loaded paths,
-  # then it inserts the activated gem's paths before the gem_prelude.rb paths
-  # so you can override the gem_prelude.rb default $LOAD_PATH paths.
+  # The index to insert activated gem paths into the $LOAD_PATH. The activated
+  # gem's paths are inserted before site lib directory by default.
 
   def self.load_path_insert_index
     index = $LOAD_PATH.index ConfigMap[:sitelibdir]

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44330


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