merges r20458 and r20459 from trunk into ruby_1_9_1.

* io.c (rb_io_getc, rb_io_readchar): documentation correction from
  Emiel van de Laar.  [ruby-core:20212]

* ext/stringio/stringio.c (strio_ungetbyte): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 5 deletions

diff --git a/io.c b/io.c
index 810f385dd8..b4bd70fb01 100644
--- a/io.c
+++ b/io.c
@@ -2688,14 +2688,14 @@ rb_io_chars(VALUE io)
 
 /*
  *  call-seq:
- *     ios.getc   => fixnum or nil
+ *     ios.getc   => string or nil
  *
  *  Reads a one-character string from <em>ios</em>. Returns
  *  <code>nil</code> if called at end of file.
  *
  *     f = File.new("testfile")
- *     f.getc   #=> "8"
- *     f.getc   #=> "1"
+ *     f.getc   #=> "h"
+ *     f.getc   #=> "e"
  */
 
 static VALUE
@@ -2720,8 +2720,8 @@ rb_io_getc(VALUE io)
  *  <code>EOFError</code> on end of file.
  *
  *     f = File.new("testfile")
- *     f.readchar   #=> "8"
- *     f.readchar   #=> "1"
+ *     f.readchar   #=> "h"
+ *     f.readchar   #=> "e"
  */
 
 static VALUE