summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-22 14:52:36 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-22 14:52:36 +0000
commite67721b7cad2d18f0129714faca242932a2f1784 (patch)
tree6db1b2ff0ed3a357aec3157bd6577697585b8ee3
parentfd47c113a4c206dd0dc94d758d545158f5c9f4f4 (diff)
downloadruby-e67721b7cad2d18f0129714faca242932a2f1784.tar.gz
ruby-e67721b7cad2d18f0129714faca242932a2f1784.tar.xz
ruby-e67721b7cad2d18f0129714faca242932a2f1784.zip
merges r20295 from trunk into ruby_1_9_1.
* ruby.c (usage): -W description updated. [ruby-core:19858] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ruby.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 99a38f9a0..d093c7624 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Nov 21 22:17:15 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ruby.c (usage): -W description updated. [ruby-core:19858]
+
Sat Nov 22 23:03:47 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* signal.c (ALT_STACK_SIZE): 4KB is not enough on Mac OS X.
diff --git a/ruby.c b/ruby.c
index 012f34bd2..3065b5335 100644
--- a/ruby.c
+++ b/ruby.c
@@ -148,7 +148,7 @@ usage(const char *name)
"-T[level] turn on tainting checks",
"-v print version number, then turn on verbose mode",
"-w turn warnings on for your script",
- "-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default)",
+ "-W[level] set warning level; 0=silence, 1=medium, 2=verbose (default for level)",
"-x[directory] strip off text before #!ruby line and perhaps cd to directory",
"--copyright print the copyright",
"--version print the version",