From 33874eb513c57b269f9bb023f164ababf7f63739 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Fri, 29 May 2015 15:25:30 -0500 Subject: [PATCH] Fixup --slurpfile/argile docs --- docs/content/3.manual/manual.yml | 7 +++++-- main.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/content/3.manual/manual.yml b/docs/content/3.manual/manual.yml index 03495c06..95d8d53f 100644 --- a/docs/content/3.manual/manual.yml +++ b/docs/content/3.manual/manual.yml @@ -219,8 +219,11 @@ sections: * `--argfile variable-name filename`: - Like `--slurpfile`, but uses just the first value in the given - file. + Do not use. Use `--slurpfile` instead. + + (This option is like `--slurpfile`, but when the file has just + one text, then that is used, else an array of texts is used as + in `--slurfile`.) - title: Basic filters entries: diff --git a/main.c b/main.c index 813ff34d..372788e8 100644 --- a/main.c +++ b/main.c @@ -49,7 +49,7 @@ static void usage(int code) { BAIL(fprintf(f, "\t -R\t\tread raw strings, not JSON texts;\n")); BAIL(fprintf(f, "\t --arg a v\tset variable $a to value ;\n")); BAIL(fprintf(f, "\t --argjson a v\tset variable $a to JSON value ;\n")); - BAIL(fprintf(f, "\t --argfile a f\tset variable $a to JSON texts read from ;\n")); + BAIL(fprintf(f, "\t --slurpfile a f\tset variable $a to an array of JSON texts read from ;\n")); BAIL(fprintf(f, "\tSee the manpage for more options.\n")); exit(code); }