merges r32261 from trunk into ruby_1_9_2.

--
	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
	  hook up ri for BasicObject, Object, Module and Class.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 28 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 2a2d78880c..1f0697c08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
+
+	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
+	  hook up ri for BasicObject, Object, Module and Class.
+
 Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
 
 	* lib/irb/ruby-lex.rb: fix [Bug #4232].
diff --git a/object.c b/object.c
index ba180b517e..7ef2c9a8fe 100644
--- a/object.c
+++ b/object.c
@@ -2458,23 +2458,24 @@ rb_f_array(VALUE obj, VALUE arg)
  * \ingroup class
  */
 
-/*
+/*  Document-class: BasicObject
+ *
+ *  BasicObject is the parent class of all classes in Ruby.  It's an explicit
+ *  blank class.
+ */
+
+/*  Document-class: Object
  *
- *  <code>BasicObject</code> is the parent class of all classes in Ruby.
- *  It's an explicit blank class.  <code>Object</code>, the root of Ruby's
- *  class hierarchy is a direct subclass of <code>BasicObject</code>.  Its
- *  methods are therefore available to all objects unless explicitly
- *  overridden.
+ *  Object is the root of Ruby's class hierarchy.  Its methods are available
+ *  to all classes unless explicitly overridden.
  *
- *  <code>Object</code> mixes in the <code>Kernel</code> module, making
- *  the built-in kernel functions globally accessible. Although the
- *  instance methods of <code>Object</code> are defined by the
- *  <code>Kernel</code> module, we have chosen to document them here for
- *  clarity.
+ *  Object mixes in the Kernel module, making the built-in kernel functions
+ *  globally accessible. Although the instance methods of Object are defined
+ *  by the Kernel module, we have chosen to document them here for clarity.
  *
  *  In the descriptions of Object's methods, the parameter <i>symbol</i> refers
- *  to a symbol, which is either a quoted string or a
- *  <code>Symbol</code> (such as <code>:name</code>).
+ *  to a symbol, which is either a quoted string or a Symbol (such as
+ *  <code>:name</code>).
  */
 
 void
@@ -2485,6 +2486,14 @@ Init_Object(void)
 
     Init_class_hierarchy();
 
+#if 0
+    // teach RDoc about these classes
+    rb_cBasicObject = rb_define_class("BasicObject", Qnil);
+    rb_cObject = rb_define_class("Object", rb_cBasicObject);
+    rb_cModule = rb_define_class("Module", rb_cObject);
+    rb_cClass =  rb_define_class("Class",  rb_cModule);
+#endif
+
 #undef rb_intern
 #define rb_intern(str) rb_intern_const(str)
 
diff --git a/version.h b/version.h
index afc47e064b..a42d5ffffb 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 299
+#define RUBY_PATCHLEVEL 300
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1