summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--load.c14
-rw-r--r--version.h2
3 files changed, 15 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c077dbb557..fd27a7f01d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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].
+
+ * load.c (rb_mod_autoload): ditto. [ruby-core:23835]
+
Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on
diff --git a/load.c b/load.c
index 8e533771f1..516e3b8bff 100644
--- a/load.c
+++ b/load.c
@@ -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_.
diff --git a/version.h b/version.h
index 4c82915df3..8d3a71efa7 100644
--- a/version.h
+++ b/version.h
@@ -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