summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-17 07:59:26 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-17 07:59:26 +0000
commite116778e8ee252dfaeed330d9c1e1f71de6b8231 (patch)
tree6f521a56c9f544db090d952eca5de51b92794712
parent656c0c4302a7595845ac76a14ff39b83186e95ff (diff)
downloadruby-e116778e8ee252dfaeed330d9c1e1f71de6b8231.tar.gz
ruby-e116778e8ee252dfaeed330d9c1e1f71de6b8231.tar.xz
ruby-e116778e8ee252dfaeed330d9c1e1f71de6b8231.zip
* load.c (rb_f_require): RDoc updated. a patch from Run Paint Run
Run in [ruby-core:23833]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--load.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f027943d..04d94ac6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 17 16:57:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * load.c (rb_f_require): RDoc updated. a patch from Run Paint Run
+ Run in [ruby-core:23833].
+
Wed Jun 17 14:37:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sample/test.rb (valid_syntax?): skips BOM. [ruby-dev:38666]
diff --git a/load.c b/load.c
index 2c59f3304..addfe4693 100644
--- a/load.c
+++ b/load.c
@@ -419,10 +419,10 @@ load_unlock(const char *ftptr, int done)
* 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"
@@ -639,7 +639,7 @@ ruby_init_ext(const char *name, void (*init)(void))
/*
* 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