merges r22083 from trunk into ruby_1_9_1.

* string.c (rb_str_each_codepoint): update RDoc for
  String#codepoints.  a patch from Radoslaw Bulat in
  [ruby-core:21835]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c2bb94b3c..c20d5158f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb  6 02:51:59 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_each_codepoint): update RDoc for
+	  String#codepoints.  a patch from Radoslaw Bulat in
+	  [ruby-core:21835]
+
 Fri Feb  6 01:09:13 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* cont.c (cont_mark, cont_capture, cont_restore_1): use #else instead
diff --git a/string.c b/string.c
index 236980e25..c3b47fb47 100644
--- a/string.c
+++ b/string.c
@@ -5703,7 +5703,7 @@ rb_str_each_char(VALUE str)
  *  when applied to Unicode strings. If a block is given, it iterates
  *  over each character in the string.
  *     
- *     "foo\u0635".chars.to_a   #=> [102, 111, 111, 1589]
+ *     "foo\u0635".codepoints.to_a   #=> [102, 111, 111, 1589]
  */
 
 /*