merges r20722 from trunk into ruby_1_9_1.

* string.c (sym_equal): remove documentation error "Otherwise,
  compares them as strings".  [ruby-dev:37398]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 01073c7198..f36e7dc3bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 13 15:52:27 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (sym_equal): remove documentation error "Otherwise,
+	  compares them as strings".  [ruby-dev:37398]
+
 Sat Dec 13 15:55:37 2008  TAKAO Kouji  <kouji@takao7.net>
 
 	* ruby.c (process_options): fixed default_internal is nil.
diff --git a/string.c b/string.c
index a48dd69c47..db5b422b69 100644
--- a/string.c
+++ b/string.c
@@ -6815,8 +6815,7 @@ rb_str_is_ascii_only_p(VALUE str)
  *     sym == obj   => true or false
  *  
  *  Equality---If <i>sym</i> and <i>obj</i> are exactly the same
- *  symbol, returns <code>true</code>. Otherwise, compares them
- *  as strings.
+ *  symbol, returns <code>true</code>. 
  */
 
 static VALUE