aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/uri/ftp.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e16c963589..dd5cad2be5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Nov 8 10:37:58 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * lib/uri/ftp.rb: fix a typo.
+ [fix GH-1084][ci skip] Patch by @windwiny
+
Sun Nov 8 08:10:31 2015 Koichi Sasada <ko1@atdot.net>
* vm_trace.c (exec_hooks_precheck): check need_clean everytime
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index 557e1fda33..a90e9b20fd 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -85,8 +85,8 @@ module URI
# require 'uri'
#
# uri = URI::FTP.build(['user:password', 'ftp.example.com', nil,
- # '/path/file.> zip', 'i'])
- # puts uri.to_s -> ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=a
+ # '/path/file.zip', 'i'])
+ # puts uri.to_s -> ftp://user:password@ftp.example.com/%2Fpath/file.zip;type=i
#
# uri2 = URI::FTP.build({:host => 'ftp.example.com',
# :path => 'ruby/src'})