yugui	2009-06-21 18:17:12 +0900 (Sun, 21 Jun 2009)

  New Revision: 23795

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

  Log:
    merges r23724 and r23725 from trunk into ruby_1_9_1.
    --
    * load.c (rb_f_require): RDoc updated.  a patch from Run Paint Run
      Run in [ruby-core:23833].
    --
    * load.c (rb_mod_autoload): ditto.  [ruby-core:23835]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/load.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23794)
+++ ruby_1_9_1/ChangeLog	(revision 23795)
@@ -1,3 +1,10 @@
+Wed Jun 17 16:57:40 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* load.c (rb_f_require): RDoc updated.  a patch from Run Paint Run
+	  Run in [ruby-core:23833].
+
+	* load.c (rb_mod_autoload): ditto.  [ruby-core:23835]
+
 Wed Jun 17 12:37:37 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on
Index: ruby_1_9_1/load.c
===================================================================
--- ruby_1_9_1/load.c	(revision 23794)
+++ ruby_1_9_1/load.c	(revision 23795)
@@ -415,11 +415,11 @@
  *  the current platform, Ruby loads the shared library as a Ruby
  *  extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
  *  to the name. The name of the loaded feature is added to the array in
- *  <code>$"</code>. A feature will not be loaded if it's name already
- *  appears in <code>$"</code>. However, the file name is not converted
- *  to an absolute path, so that ``<code>require 'a';require
- *  './a'</code>'' will load <code>a.rb</code> twice.
- *     
+ *  <code>$"</code>. A feature will not be loaded if its name already
+ *  appears in <code>$"</code>. The file name is converted to an absolute
+ *  path, so ``<code>require 'a'; require './a'</code>'' will not load
+ *  <code>a.rb</code> twice.
+ *
  *     require "my-library.rb"
  *     require "db-driver"
  */
@@ -627,8 +627,8 @@
 
 /*
  *  call-seq:
- *     mod.autoload(name, filename)   => nil
- *  
+ *     mod.autoload(module, filename)   => nil
+ *
  *  Registers _filename_ to be loaded (using <code>Kernel::require</code>)
  *  the first time that _module_ (which may be a <code>String</code> or
  *  a symbol) is accessed in the namespace of _mod_.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23794)
+++ ruby_1_9_1/version.h	(revision 23795)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 185
+#define RUBY_PATCHLEVEL 186
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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