diff --git a/ChangeLog b/ChangeLog index 0f18f3effd..12bc6d9fa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 19 19:57:54 2005 Yukihiro Matsumoto + + * lib/fileutils.rb (FileUtils::ln): ln documentation fix. + [ruby-core:06661] + Sat Nov 19 08:19:38 2005 Zach Dennis * ext/socket/socket.c: Socket Documentation. [ruby-core:6580] diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 2d9692c519..646cfe07d3 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -274,7 +274,7 @@ module FileUtils # ln(old, new, options = {}) # # Creates a hard link +new+ which points to +old+. - # If +new+ already exists and it is a directory, creates a symbolic link +new/old+. + # If +new+ already exists and it is a directory, creates a link +new/old+. # If +new+ already exists and it is not a directory, raises Errno::EEXIST. # But if :force option is set, overwrite +new+. # diff --git a/lib/find.rb b/lib/find.rb index 08a3908c5b..b2e811e614 100644 --- a/lib/find.rb +++ b/lib/find.rb @@ -37,6 +37,7 @@ module Find while file = paths.shift catch(:prune) do yield file.dup.taint + next unless File.exist? file begin if File.lstat(file).directory? then d = Dir.open(file)