summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:25 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:25 +0000
commit7ac90158e284783159fefc37fa88fc2dc0bdd5a9 (patch)
tree8f5269df37babe381da1c820c3f308994e4943c2
parent72c96b806cb4c12f003837ab6aca89e76621dbf0 (diff)
merges r20534 from trunk into ruby_1_9_1.
* string.c (rb_str_cmp_m): fixed rdoc. pointed out by <Thomas C. Mitchell AT gmail.com> at [ruby-talk:321967] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--string.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index daabcadbe0..d305dd4198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 5 10:01:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_cmp_m): fixed rdoc. pointed out by <Thomas
+ C. Mitchell AT gmail.com> at [ruby-talk:321967]
+
Fri Dec 5 07:58:30 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_binwrite): arg.offset should be updated after retry.
diff --git a/string.c b/string.c
index d931cd9ca4..a8b3f29cd9 100644
--- a/string.c
+++ b/string.c
@@ -2149,8 +2149,8 @@ rb_str_eql(VALUE str1, VALUE str2)
* call-seq:
* str <=> other_str => -1, 0, +1
*
- * Comparison---Returns -1 if <i>other_str</i> is less than, 0 if
- * <i>other_str</i> is equal to, and +1 if <i>other_str</i> is greater than
+ * Comparison---Returns -1 if <i>other_str</i> is greater than, 0 if
+ * <i>other_str</i> is equal to, and +1 if <i>other_str</i> is less than
* <i>str</i>. If the strings are of different lengths, and the strings are
* equal when compared up to the shortest length, then the longer string is
* considered greater than the shorter one. In older versions of Ruby, setting