diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-30 04:44:52 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-30 04:44:52 +0000 |
| commit | b3498ae62d25047d62c6d58906a2512bfd2d8ddc (patch) | |
| tree | 8deceb49c81fbc129b416ce355e9db8d8c870198 /transcode.c | |
| parent | 475907ecf0d9923533f61d604dcd0e466ca41200 (diff) | |
merges r31353 from trunk into ruby_1_9_2.
--
* transcode.c (econv_init): fix rdoc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c index dadb57b90d..514c181699 100644 --- a/transcode.c +++ b/transcode.c @@ -3178,8 +3178,8 @@ rb_econv_init_by_convpath(VALUE self, VALUE convpath, * :undef => :replace # replace undefined conversion * :replace => string # replacement string ("?" or "\uFFFD" if not specified) * :universal_newline => true # decorator for converting CRLF and CR to LF - * :crlf_newline => true # decorator for converting LF to CRLF - * :cr_newline => true # decorator for converting LF to CR + * :crlf_newline => true # decorator for converting CRLF to LF + * :cr_newline => true # decorator for converting CR to LF * :xml => :text # escape as XML CharData. * :xml => :attr # escape as XML AttValue * integer form: |