diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 12:45:17 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-23 12:45:17 +0000 |
| commit | 1f849b54fbddd015cf77e05364e494157f16e4d8 (patch) | |
| tree | 169281da9ed144fe291bea53316a287aa5c54638 /ext | |
| parent | 57eb3170450a0374dd17b30eb77a26ee4560019a (diff) | |
merges r30112 from trunk into ruby_1_9_2.
--
* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
patched by Kouhei Yanagita [ruby-dev:42696]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/nkf/lib/kconv.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb index 6230996876..f8c1ae8f59 100644 --- a/ext/nkf/lib/kconv.rb +++ b/ext/nkf/lib/kconv.rb @@ -51,8 +51,8 @@ module Kconv # call-seq: # Kconv.kconv(str, to_enc, from_enc=nil) # - # Convert <code>str</code> to out_code. - # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv. + # Convert <code>str</code> to <code>to_enc</code>. + # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects. def kconv(str, to_enc, from_enc=nil) opt = '' opt += ' --ic=' + from_enc.to_s if from_enc @@ -199,10 +199,10 @@ class String # call-seq: # String#kconv(to_enc, from_enc) # - # Convert <code>self</code> to out_code. - # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv. + # Convert <code>self</code> to <code>to_enc</code>. + # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects. def kconv(to_enc, from_enc=nil) - form_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0] + from_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0] Kconv::kconv(self, to_enc, from_enc) end |