diff --git a/README.md b/README.md index c3fe22c0a..6b54362c9 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ indices. Examples: ``` % mlr --csv cut -f hostname,uptime mydata.csv -% mlr --csv filter '$status != "down" && $upsec >= 10000' *.csv +% mlr --csv --rs lf filter '$status != "down" && $upsec >= 10000' *.csv % mlr --nidx put '$sum = $7 + 2.1*$8' *.dat % grep -v '^#' /etc/group | mlr --ifs : --nidx --opprint label group,pass,gid,member then sort -f group % mlr join -j account_id -f accounts.dat then group-by account_name balances.dat diff --git a/c/cli/mlrcli.c b/c/cli/mlrcli.c index 9f442f26f..ad01cd78e 100644 --- a/c/cli/mlrcli.c +++ b/c/cli/mlrcli.c @@ -304,8 +304,12 @@ static void main_usage_data_format_options(FILE* o, char* argv0) { fprintf(o, " The --right option right-justifies all fields for PPRINT output format.\n"); fprintf(o, " The --xvright option right-justifies values for XTAB format.\n"); fprintf(o, " -p is a keystroke-saver for --nidx --fs space --repifs\n"); + fprintf(o, "\n"); fprintf(o, " Examples: --csv for CSV-formatted input and output; --idkvp --opprint for\n"); fprintf(o, " DKVP-formatted input and pretty-printed output.\n"); + fprintf(o, "\n"); + fprintf(o, " Please use \"%s --csv --rs lf\" for for native Un*x (linefeed-terminated) CSV files.\n", + argv0); } static void main_usage_compressed_data_options(FILE* o, char* argv0) { diff --git a/c/todo.txt b/c/todo.txt index 112f14ffb..e6ace11c5 100644 --- a/c/todo.txt +++ b/c/todo.txt @@ -18,7 +18,7 @@ TOP OF LIST * rename mlr_selected_values_from_record to mlr_reference_selected_values_from_record ! --rs lf splatters - termcvt flins & rework that page -* link to release notes from release-docs page + * light edit on utf8 page * --mmap/--no-mmap @ mlr -h * debian screenshot diff --git a/doc/content-for-faq.html b/doc/content-for-faq.html index 6b3d52631..37602eb00 100644 --- a/doc/content-for-faq.html +++ b/doc/content-for-faq.html @@ -1,5 +1,11 @@ POKI_PUT_TOC_HERE +
% mlr --csv cut -f hostname,uptime mydata.csv
-% mlr --csv filter '$status != "down" && $upsec >= 10000' *.csv
+% mlr --csv --rs lf filter '$status != "down" && $upsec >= 10000' *.csv
% mlr --nidx put '$sum = $7 + 2.1*$8' *.dat
% grep -v '^#' /etc/group | mlr --ifs : --nidx --opprint label group,pass,gid,member then sort -f group
% mlr join -j account_id -f accounts.dat then group-by account_name balances.dat
diff --git a/doc/mlr.1.premade b/doc/mlr.1.premade
index 1863985cc..a87323851 100644
--- a/doc/mlr.1.premade
+++ b/doc/mlr.1.premade
@@ -167,8 +167,11 @@ Please use "mlr --help-all-functions" or "mlr -f" for help on all functions.
The --right option right-justifies all fields for PPRINT output format.
The --xvright option right-justifies values for XTAB format.
-p is a keystroke-saver for --nidx --fs space --repifs
+
Examples: --csv for CSV-formatted input and output; --idkvp --opprint for
DKVP-formatted input and pretty-printed output.
+
+ Please use "mlr --csv --rs lf" for for native Un*x (linefeed-terminated) CSV files.
.fi
.if n \{\
.RE
diff --git a/doc/reference.html b/doc/reference.html
index 3321a1ae6..1f6657d89 100644
--- a/doc/reference.html
+++ b/doc/reference.html
@@ -364,9 +364,12 @@ Data-format options, for input, output, or both:
The --right option right-justifies all fields for PPRINT output format.
The --xvright option right-justifies values for XTAB format.
-p is a keystroke-saver for --nidx --fs space --repifs
+
Examples: --csv for CSV-formatted input and output; --idkvp --opprint for
DKVP-formatted input and pretty-printed output.
+ Please use "mlr --csv --rs lf" for for native Un*x (linefeed-terminated) CSV files.
+
Compressed-data options:
--prepipe {command} This allows Miller to handle compressed inputs. You can do
without this for single input files, e.g. "gunzip < myfile.csv.gz | mlr ...".
diff --git a/doc/release-docs.html b/doc/release-docs.html
index 4bc9930f6..03c438297 100644
--- a/doc/release-docs.html
+++ b/doc/release-docs.html
@@ -134,14 +134,13 @@ Miller commands were run with pretty-print-tabular output format.
-These are full docsets as of the specified release.
-Please see
+For release notes per se — what changed from one release to the next — please see the following:
-https://github.com/johnkerl/miller/tags.
-
-for release notes per se — what changed from one release to the next.
+https://github.com/johnkerl/miller/tags
+The following are full docsets as of the specified release:
+