merge from trunk (28381)

* io.c: rdoc fix for ARGF.lineno; see [ruby-core:29048]

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

1 files changed, 2 insertions, 2 deletions

diff --git a/io.c b/io.c
index 3fedc9165f..274ee89c10 100644
--- a/io.c
+++ b/io.c
@@ -6660,7 +6660,7 @@ argf_initialize_copy(VALUE argf, VALUE orig)
  *  call-seq:
  *     ARGF.lineno = number  -> nil
  *
- *  Sets the line number of the current file in +ARGF+ to the given +Integer+.
+ *  Sets the line number of +ARGF+ as a whole to the given +Integer+.
  *
  *  +ARGF+ sets the line number automatically as you read data, so normally
  *  you will not need to set it explicitly. To access the current line number
@@ -6686,7 +6686,7 @@ argf_set_lineno(VALUE argf, VALUE val)
  *  call-seq:
  *     ARGF.lineno -> integer
  *
- *  Returns the current line number of the current file in +ARGF+. This value
+ *  Returns the current line number of ARGF as a whole. This value
  *  can be set manually with +ARGF.lineno=+.
  *
  *  For example: