aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/observer.rb7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e2b1308a79..1622dba9f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 21 13:40:20 2013 Zachary Scott <e@zzak.io>
+
+ * lib/observer.rb: [DOC] Clarify default observer method.
+ By @edward [Fixes GH-450] https://github.com/ruby/ruby/pull/450
+
Thu Nov 21 13:32:53 2013 Zachary Scott <e@zzak.io>
* ext/openssl/ossl_engine.c: [DOC] Documentation for OpenSSL::Engine
diff --git a/lib/observer.rb b/lib/observer.rb
index 3756794952..99610f7505 100644
--- a/lib/observer.rb
+++ b/lib/observer.rb
@@ -15,13 +15,14 @@
# module, which provides the methods for managing the associated observer
# objects.
#
-# The observers must implement a method called +update+ to receive
-# notifications.
-#
# The observable object must:
# * assert that it has +#changed+
# * call +#notify_observers+
#
+# An observer subscribes to updates using Observable#add_observer, which also
+# specifies the method called via #notify_observers. The default method for
+# #notify_observers is #update.
+#
# === Example
#
# The following example demonstrates this nicely. A +Ticker+, when run,