diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:41:00 +0000 |
| commit | 1118c95535ea51961437089fc3dece5ab4ea7e1b (patch) | |
| tree | 1515bd2376a6d6c5123791662307ce2ed90cdf36 /util-linux/script.c | |
| parent | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (diff) | |
| parent | 066f39956641300c1e5c6bfe6c11a115cea3e2cf (diff) | |
| download | busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.gz busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.tar.bz2 busybox-w32-1118c95535ea51961437089fc3dece5ab4ea7e1b.zip | |
Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge
Conflicts:
procps/ps.c
Diffstat (limited to 'util-linux/script.c')
| -rw-r--r-- | util-linux/script.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/util-linux/script.c b/util-linux/script.c index 26f16ebf5..8fb991d15 100644 --- a/util-linux/script.c +++ b/util-linux/script.c | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | //usage:#define script_trivial_usage | 14 | //usage:#define script_trivial_usage |
| 15 | //usage: "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]" | 15 | //usage: "[-afq" IF_SCRIPTREPLAY("t") "] [-c PROG] [OUTFILE]" |
| 16 | //usage:#define script_full_usage "\n\n" | 16 | //usage:#define script_full_usage "\n\n" |
| 17 | //usage: "Options:" | 17 | //usage: " -a Append output" |
| 18 | //usage: "\n -a Append output" | ||
| 19 | //usage: "\n -c PROG Run PROG, not shell" | 18 | //usage: "\n -c PROG Run PROG, not shell" |
| 20 | //usage: "\n -f Flush output after each write" | 19 | //usage: "\n -f Flush output after each write" |
| 21 | //usage: "\n -q Quiet" | 20 | //usage: "\n -q Quiet" |