summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--object.c12
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ffe727ec1..528b38b78a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jun 1 06:40:25 2012 Eric Hodel <drbrain@segment7.net>
+
+ * object.c (Init_Object): Restored Kernel documentation based on
+ Pickaxe book documentation. Patch by Zachary Scott.
+ [ruby-trunk - Feature #6521]
+
Fri Jun 1 06:29:42 2012 Eric Hodel <drbrain@segment7.net>
* object.c (rb_equal): Let Object be a link in #=== documentation.
diff --git a/object.c b/object.c
index e1ad798480..daa7015254 100644
--- a/object.c
+++ b/object.c
@@ -2845,6 +2845,18 @@ Init_Object(void)
rb_define_private_method(rb_cBasicObject, "singleton_method_removed", rb_obj_dummy, 1);
rb_define_private_method(rb_cBasicObject, "singleton_method_undefined", rb_obj_dummy, 1);
+ /* Document-module: Kernel
+ *
+ * The Kernel module is included by class Object, so its methods are
+ * available in every Ruby object.
+ *
+ * The Kernel instance methods are documented in class Object while the
+ * module methods are documented here. These methods are called without a
+ * receiver and thus can be called in functional form:
+ *
+ * sprintf "%.1f", 1.234 #=> "1.2"
+ *
+ */
rb_mKernel = rb_define_module("Kernel");
rb_include_module(rb_cObject, rb_mKernel);
rb_define_private_method(rb_cClass, "inherited", rb_obj_dummy, 1);