summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/syntax/modules_and_classes.rdoc9
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ee77f9439a..e44610b61f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jan 5 13:58:59 2013 Eric Hodel <drbrain@segment7.net>
+
+ * doc/syntax/modules_and_classes.rdoc: Improved description of methods
+ on a module or class as suggested by Tobias Buhlmann
+
Sat Jan 5 13:38:07 2013 Masaki Matsushita <glass.saga@gmail.com>
* string.c (rb_str_enumerate_lines): fix invalid byte sequence error
diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
index 4710dcf3cb..cca9dc2563 100644
--- a/doc/syntax/modules_and_classes.rdoc
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -120,8 +120,13 @@ If a constant is defined at the top-level you may preceded it with
=== Methods
-Class methods (also known as module functions, see Module#module_function) may
-be called directly.
+For method definition documentation see the {syntax documentation for
+methods}[rdoc-ref:doc/syntax/methods.rdoc].
+
+Class methods may be called directly. (This is slightly confusing, but a
+method on a module is often called a "class method" instead of a "module
+method". See also Module#module_function which can convert an instance method
+into a class method.)
When a class method references a constant it uses the same rules as referencing
it outside the method as the scope is the same.