yugui	2008-12-29 16:19:18 +0900 (Mon, 29 Dec 2008)

  New Revision: 21159

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

  Log:
    merges r21145 from trunk into ruby_1_9_1.
    * cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
      in [ruby-core:20921].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/cont.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21158)
+++ ruby_1_9_1/ChangeLog	(revision 21159)
@@ -1,4 +1,10 @@
+Mon Dec 29 07:15:16 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* cont.c: small RDoc fix mentioned from <radek.bulat at gmail.com>
+	  in [ruby-core:20921].
+
 Mon Dec 29 03:43:25 2008  Koichi Sasada  <ko1@a...> 
+
 	* ruby.c (process_options): set th->base_block only while
 	  it is needed.  [ruby-dev:37634] [Bug #939]
 
Index: ruby_1_9_1/cont.c
===================================================================
--- ruby_1_9_1/cont.c	(revision 21158)
+++ ruby_1_9_1/cont.c	(revision 21159)
@@ -611,7 +611,7 @@
  *     
  *  The <code>Fiber#resume</code> method accepts an arbitary number of
  *  parameters, if it is the first call to <code>resume</code> then they
- *  will be passed as block arguments. Other wise they will be the return
+ *  will be passed as block arguments. Otherwise they will be the return
  *  value of the call to <code>Fiber.yield</code>
  *
  *  Example:

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