yugui	2011-05-30 13:44:52 +0900 (Mon, 30 May 2011)

  New Revision: 31818

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31818

  Log:
    merges r31353 from trunk into ruby_1_9_2.
    --
    * transcode.c (econv_init): fix rdoc.

  Modified files:
    branches/ruby_1_9_2/transcode.c
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31817)
+++ ruby_1_9_2/version.h	(revision 31818)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 242
+#define RUBY_PATCHLEVEL 243
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_2/transcode.c
===================================================================
--- ruby_1_9_2/transcode.c	(revision 31817)
+++ ruby_1_9_2/transcode.c	(revision 31818)
@@ -3178,8 +3178,8 @@
  *     :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:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/