Removal was promised to happen at March 2014 and the time has to get rid of this unexpected feature. Reference: c5b057b3422504a671ee588fa66574ae876521f1 Signed-off-by: Sami Kerola <kerolasa@xxxxxx> --- Documentation/deprecated.txt | 5 ----- misc-utils/kill.1 | 5 ----- misc-utils/kill.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/Documentation/deprecated.txt b/Documentation/deprecated.txt index 81a4122..39dc335 100644 --- a/Documentation/deprecated.txt +++ b/Documentation/deprecated.txt @@ -34,11 +34,6 @@ why: does not provide control on output data formatting. The recommended solut -------------------------- -what: "pid" as binary name for "kill --pid" -why: too ugly, too obscure - --------------------------- - What: mkfs Why: use filesystem specific mkfs.<type>. diff --git a/misc-utils/kill.1 b/misc-utils/kill.1 index f50d850..a7d7a74 100644 --- a/misc-utils/kill.1 +++ b/misc-utils/kill.1 @@ -91,11 +91,6 @@ uid as the present process. \fB\-p\fR, \fB\-\-pid\fR Only print the process id (pid) of the named processes, do not send any signals. -.IP -The \fB\-\-pid\fR option is automatically enabled when the \fBkill\fR command -is invoked with the name of -.BR pid . -This functionality is deprecated, and will be removed in March 2016. .TP \fB\-\-verbose\fR Print pid(s) that will be signaled with kill along with the signal. diff --git a/misc-utils/kill.c b/misc-utils/kill.c index 34b9487..e52a03d 100644 --- a/misc-utils/kill.c +++ b/misc-utils/kill.c @@ -472,10 +472,6 @@ int main(int argc, char **argv) textdomain(PACKAGE); atexit(close_stdout); - ctl.do_pid = (!strcmp(program_invocation_short_name, "pid")); /* Yecch */ - if (ctl.do_pid) /* FIXME: remove in March 2016. */ - warnx(_("use of 'kill --pid' option as command name is deprecated")); - argv = parse_arguments(argc, argv, &ctl); /* The rest of the arguments should be process ids and names. */ -- 2.9.3 -- To unsubscribe from this list: send the line "unsubscribe util-linux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html