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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 177ed95a4..89a37448c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  3 12:24:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_getc, rb_io_readchar): documentation correction from
+	  Emiel van de Laar.  [ruby-core:20212]
+
+	* ext/stringio/stringio.c (strio_readchar): ditto.
+
 Wed Dec  3 09:26:29 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rexml/xpath.rb (REXML::XPath.first): apply documentation
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 4c997dcd0..4ff0e36c6 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -749,7 +749,7 @@ strio_ungetbyte(VALUE self, VALUE c)
 
 /*
  * call-seq:
- *   strio.readchar   -> fixnum
+ *   strio.readchar   -> string
  *
  * See IO#readchar.
  */
diff --git a/io.c b/io.c
index 810f385dd..b4bd70fb0 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