trailer: trailer location is a place, not an action

Fix the help text to say "placement" instead of "action" because the
values are placements, not actions.

While we're at it, tweak the documentation to say "placements" instead
of "values", similar to how the existing language for "--if-exists" uses
the word "action" to describe both the syntax (with the phrase
"--if-exists <action>") and the possible values (with the phrase
"possible actions").

Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 72f5bdb652fd1afc1e16a3437187673223ee04bf..b5284c3d33fd36482e8daf2107a3bef78fd88576 100644 (file)
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -117,7 +117,7 @@ OPTIONS
        and applies to all '--trailer' options until the next occurrence of
        '--where' or '--no-where'. Upon encountering '--no-where', clear the
        effect of any previous use of '--where', such that the relevant configuration
-       variables are no longer overridden. Possible values are `after`,
+       variables are no longer overridden. Possible placements are `after`,
        `before`, `end` or `start`.
 
 --if-exists <action>::

diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index c5e83452654de9242f01a4045fb90f3f058ea8f7..cf4f703c4e21daf4e52b320e5b734222f49fe4c3 100644 (file)
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -97,7 +97,7 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
                OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
                OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
 
-               OPT_CALLBACK(0, "where", NULL, N_("action"),
+               OPT_CALLBACK(0, "where", NULL, N_("placement"),
                             N_("where to place the new trailer"), option_parse_where),
                OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
                             N_("action if trailer already exists"), option_parse_if_exists),