From 1996a4af6930e9376099df8d41f1bb9b2de7a90a Mon Sep 17 00:00:00 2001 From: mame Date: Mon, 26 Oct 2009 03:41:01 +0000 Subject: [PATCH] * ruby.c (usage): -T and -W descriptions updated. see [ruby-dev:39539] * man/ruby.1: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ man/ruby.1 | 4 ++-- ruby.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e07e14020b..a39209bc54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Oct 26 12:34:08 2009 Yusuke Endoh + + * ruby.c (usage): -T and -W descriptions updated. see + [ruby-dev:39539] + + * man/ruby.1: ditto. + Mon Oct 26 12:06:27 2009 Nobuyoshi Nakada * io.c (io_fwrite): adjust stdio file position after direct write on diff --git a/man/ruby.1 b/man/ruby.1 index e2d0abdefd..62a097d398 100644 --- a/man/ruby.1 +++ b/man/ruby.1 @@ -205,14 +205,14 @@ on machines that don't support it, in the following manner: exec /usr/local/bin/ruby -S $0 $* .Ed .Pp -.It Fl T Ns Op Ar level +.It Fl T Ns Op Ar level=1 Turns on taint checks at the specified level (default 1). .Pp .It Fl U Sets the defalut value for internal encodings .Pf ( Li "Encoding.default_internal" ) to UTF-8. .Pp -.It Fl W Ns Op Ar level +.It Fl W Ns Op Ar level=2 Turns on verbose mode at the specified level, without printing version message at the beginning. The level can be; .Bl -hang -offset indent diff --git a/ruby.c b/ruby.c index 1530306678..4c2d566643 100644 --- a/ruby.c +++ b/ruby.c @@ -147,10 +147,10 @@ usage(const char *name) "-rlibrary require the library, before executing your script", "-s enable some switch parsing for switches after script name", "-S look for the script using PATH environment variable", - "-T[level] turn on tainting checks", + "-T[level=1] 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 for level)", + "-W[level=2] set warning level; 0=silence, 1=medium, 2=verbose", "-x[directory] strip off text before #!ruby line and perhaps cd to directory", "--copyright print the copyright", "--version print the version",