summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-15 12:04:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-15 12:04:32 +0000
commitf41dcd486e2004c042941b9d41400986d36f65dc (patch)
treea99019efe403758051e49326416f3b7377efd4ef /transcode.c
parent3a47cf3395dd4c4fe8bdd5df13aab698f2ca314b (diff)
* transcode.c (econv_init): revert r31353. [ruby-dev:43512]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/transcode.c b/transcode.c
index fbc7c5aecd..704c740442 100644
--- a/transcode.c
+++ b/transcode.c
@@ -3254,8 +3254,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 CRLF to LF
- * :cr_newline => true # decorator for converting CR to LF
+ * :crlf_newline => true # decorator for converting LF to CRLF
+ * :cr_newline => true # decorator for converting LF to CR
* :xml => :text # escape as XML CharData.
* :xml => :attr # escape as XML AttValue
* integer form: