summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/shellwords.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ef9fa723c..89e73dd7ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 14 16:12:58 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/shellwords.rb: scape should be an alias to shellescape. a
+ patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
+ [ruby-dev:33060].
+
Mon Jan 14 16:09:16 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* ruby.1: a patch to describe --encoding. a patch from Yugui
diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index ff1474b4e8..3709ace30b 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -86,7 +86,7 @@ module Shellwords
module_function :shellescape
class << self
- alias escape shellsplit
+ alias escape shellescape
end
#