marcandre	2010-06-22 13:56:37 +0900 (Tue, 22 Jun 2010)

  New Revision: 28380

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28380

  Log:
    merge from trunk (r28379)
    
    * class.c: rdoc fix [ruby-core:30449]
    
    * object.c: ditto

  Modified files:
    branches/ruby_1_9_2/class.c
    branches/ruby_1_9_2/object.c

Index: ruby_1_9_2/object.c
===================================================================
--- ruby_1_9_2/object.c	(revision 28379)
+++ ruby_1_9_2/object.c	(revision 28380)
@@ -1755,7 +1755,7 @@
  *  call-seq:
  *     obj.methods    -> array
  *
- *  Returns a list of the names of methods publicly accessible in
+ *  Returns a list of the names of public and protected methods of
  *  <i>obj</i>. This will include all the methods accessible in
  *  <i>obj</i>'s ancestors.
  *
Index: ruby_1_9_2/class.c
===================================================================
--- ruby_1_9_2/class.c	(revision 28379)
+++ ruby_1_9_2/class.c	(revision 28380)
@@ -865,8 +865,8 @@
  *  call-seq:
  *     mod.instance_methods(include_super=true)   -> array
  *
- *  Returns an array containing the names of instance methods that is callable
- *  from outside in the receiver. For a module, these are the public methods;
+ *  Returns an array containing the names of the public and protected instance
+ *  methods in the receiver. For a module, these are the public and protected methods;
  *  for a class, they are the instance (not singleton) methods. With no
  *  argument, or with an argument that is <code>false</code>, the
  *  instance methods in <i>mod</i> are returned, otherwise the methods
@@ -954,6 +954,7 @@
  *  Returns an array of the names of singleton methods for <i>obj</i>.
  *  If the optional <i>all</i> parameter is true, the list will include
  *  methods in modules included in <i>obj</i>.
+ *  Only public and protected singleton methods are returned.
  *
  *     module Other
  *       def three() end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/