From 7f7c68ebea0476c48805a68309825c0be1f5aeff Mon Sep 17 00:00:00 2001
From: marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 27 Jun 2010 03:11:44 +0000
Subject: merge r28448 from trunk into ruby_1_9_2:

 * enum.c (zip): rdoc fix, patch by okkez [ruby-dev:41737]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enum.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enum.c b/enum.c
index 54e36ffdb9..fc8a3c35d2 100644
--- a/enum.c
+++ b/enum.c
@@ -1904,7 +1904,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
 
 /*
  *  call-seq:
- *     enum.zip(arg, ...)                   -> an_enumerator
+ *     enum.zip(arg, ...)                   -> an_array_of_array
  *     enum.zip(arg, ...) {|arr| block }    -> nil
  *
  *  Takes one element from <i>enum</i> and merges corresponding
-- 
cgit v1.2.3