summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--doc/syntax/methods.rdoc2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71701119ef..9ae68bfc5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 6 15:07:18 2014 Zachary Scott <e@zzak.io>
+
+ * doc/syntax/methods.rdoc: [DOC] Fix example for block arguments
+ By @idupree [Fixes GH-554] https://github.com/ruby/ruby/pull/554
+
Thu Mar 6 10:33:31 2014 Martin Bosslet <Martin.Bosslet@gmail.com>
* lib/openssl/ssl.rb: Explicitly whitelist the default
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
index d7610f161d..648843e753 100644
--- a/doc/syntax/methods.rdoc
+++ b/doc/syntax/methods.rdoc
@@ -383,7 +383,7 @@ arguments must appear before any keyword arguments.
The block argument is indicated by <code>&</code> and must come last:
def my_method(&my_block)
- my_method.call(self)
+ my_block.call(self)
end
Most frequently the block argument is used to pass a block to another method: