From b5a000bf4cb583df93a13d45bcc09301127fa1da Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 Jun 2014 02:37:31 +0000
Subject: * file.c: [DOC] document File.join returns a string.   Contributed by
 @dapplebeforedawn. [fix GH-646]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 file.c    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 114655051b..0c9eb0c425 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 30 11:36:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* file.c: [DOC] document File.join returns a string.
+	  Contributed by @dapplebeforedawn. [fix GH-646]
+
 Sat Jun 28 22:57:01 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* ext/pathname/pathname.c (path_birthtime): Windows support.
diff --git a/file.c b/file.c
index a2d6681700..196efbbba3 100644
--- a/file.c
+++ b/file.c
@@ -4291,7 +4291,7 @@ rb_file_join(VALUE ary, VALUE sep)
 
 /*
  *  call-seq:
- *     File.join(string, ...)  ->  path
+ *     File.join(string, ...)  ->  string
  *
  *  Returns a new string formed by joining the strings using
  *  <code>File::SEPARATOR</code>.
-- 
cgit v1.2.3