From 49b10fd508850e396f181101770948aaf8517922 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 4 Dec 2008 15:21:32 +0000 Subject: [PATCH] rdoc update. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 27 ++++++++++++++++++++------- process.c | 6 +++--- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/io.c b/io.c index eb954f22f3..c3b05a1982 100644 --- a/io.c +++ b/io.c @@ -4684,14 +4684,27 @@ pop_last_hash(int *argc_p, VALUE *argv) * * Runs the specified command as a subprocess; the subprocess's * standard input and output will be connected to the returned - * IO object. If _cmd_ is a +String+ - * ``-'', then a new instance of Ruby is started as the - * subprocess. If cmd is an +Array+ of +String+, then it will - * be used as the subprocess's +argv+ bypassing a shell. + * IO object. + * + * _cmd_ is a string or an array as follows. + * + * cmd: + * "-" : fork + * commandline : command line string which is passed to a shell + * [env, cmdname, arg1, ..., opts] : command name and arguments (no shell) + * [env, [cmdname, argv0], arg1, ..., opts] : command name and arguments including argv[0] (no shell) + * (env and opts are optional.) + * + * If _cmd_ is a +String+ ``-'', + * then a new instance of Ruby is started as the subprocess. + * + * If cmd is an +Array+ of +String+, + * then it will be used as the subprocess's +argv+ bypassing a shell. * The array can contains a hash at first for environments and - * a hash at last for options similar to spawn. The default - * mode for the new file object is ``r'', but mode may be set - * to any of the modes listed in the description for class IO. + * a hash at last for options similar to spawn. + * + * The default mode for the new file object is ``r'', + * but mode may be set to any of the modes listed in the description for class IO. * The last argument opt qualifies mode. * * # set IO encoding diff --git a/process.c b/process.c index b2cd225f2e..713ab15976 100644 --- a/process.c +++ b/process.c @@ -2833,9 +2833,9 @@ rb_f_system(int argc, VALUE *argv) * process group: * :pgroup => true or 0 : process leader * :pgroup => pgid : join to specified process group - * resource limit: xxx is core, cpu, data, etc. See Process.setrlimit. - * :rlimit_xxx => limit - * :rlimit_xxx => [cur_limit, max_limit] + * resource limit: resourcename is core, cpu, data, etc. See Process.setrlimit. + * :rlimit_resourcename => limit + * :rlimit_resourcename => [cur_limit, max_limit] * current directory: * :chdir => str * umask: