column: rename options

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/text-utils/column.1 b/text-utils/column.1
index b1e5fd885a9ec6a4df380c03b67c062d7ba58ad3..fa1540b8369a2f68097ebf7636f00c6f00140bb8 100644 (file)
--- a/text-utils/column.1
+++ b/text-utils/column.1
@@ -60,12 +60,12 @@ Determine the number of columns the input contains and create a table.
 Columns are delimited with whitespace, by default, or with the characters
 supplied using the \fB\-\-output\-separator\fP option.
 Table output is useful for pretty-printing.
-.IP "\fB\-N, \-\-table-colnames\fP \fInames\fP"
+.IP "\fB\-N, \-\-table-columns\fP \fInames\fP"
 Specify the columns names by comma separated list of names. The names are used
-for the table header.
-.IP "\fB\-R, \-\-table-colright\fP \fIcolumns\fP"
+for the table header or to addres column in option arguments.
+.IP "\fB\-R, \-\-table-right\fP \fIcolumns\fP"
 Right align text in the specified columns.  The \fIcolumns\fP is comma separated
-list of the column names (see \fB\-\-table-colnames\fP) or column number.
+list of the column names (see \fB\-\-table-columns\fP) or column number.
 .IP "\fB\-n, \-\-table-name\fP \fIname\fP"
 Specify the table name used for JSON output. The defaout is "table".
 .IP "\fB\-x, \-\-fillrows\fP"

diff --git a/text-utils/column.c b/text-utils/column.c
index ab700ab0134f6a0d38041750b1bb75fa215d470d..0db8fd5047d1476b77d4175cfefb243919407033 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -412,8 +412,8 @@ static void __attribute__((__noreturn__)) usage(int rc)
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -J, --json                       use JSON output format for table\n"), out);
        fputs(_(" -t, --table                      create a table\n"), out);
-       fputs(_(" -N, --table-colnames <names>     comma separated columns names\n"), out);
-       fputs(_(" -R, --table-colright <columns>   right align text in these columns\n"), out);
+       fputs(_(" -N, --table-columns <names>      comma separated columns names\n"), out);
+       fputs(_(" -R, --table-right <columns>      right align text in these columns\n"), out);
        fputs(_(" -n, --table-name <name>          table name for JSON output\n"), out);
        fputs(_(" -s, --separator <string>         possible table delimiters\n"), out);
        fputs(_(" -o, --output-separator <string>  columns separator for table output\n"
@@ -449,8 +449,8 @@ int main(int argc, char **argv)
                { "output-width",        required_argument, NULL, 'c' },
                { "separator",           required_argument, NULL, 's' },
                { "table",               no_argument,       NULL, 't' },
-               { "table-colnames",      required_argument, NULL, 'N' },
-               { "table-colright",      required_argument, NULL, 'R' },
+               { "table-columns",       required_argument, NULL, 'N' },
+               { "table-right",         required_argument, NULL, 'R' },
                { "table-name",          required_argument, NULL, 'n' },
                { "version",             no_argument,       NULL, 'V' },
                { NULL, 0, NULL, 0 },