diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:17:12 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-21 09:17:12 +0000 |
commit | eb556f53d4ed357f829518c405221ba00cf1da06 (patch) | |
tree | 28995a5286172fdcddea2f31eeb763be314c076d /load.c | |
parent | 341c1cb7f8917838da788ef35dab6a65bce55cff (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -415,11 +415,11 @@ 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" */ @@ -627,8 +627,8 @@ 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 * a symbol) is accessed in the namespace of _mod_. |