Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

3 files changed, 0 insertions, 3 deletions

diff --git a/findutils/find.c b/findutils/find.c
index 050d6373e..babcda0ed 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -236,7 +236,6 @@
 //usage:       "Search for files and perform actions on them.\n"
 //usage:       "First failed action stops processing of current file.\n"
 //usage:       "Defaults: PATH is current directory, action is '-print'\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -follow         Follow symlinks"
 //usage:        IF_FEATURE_FIND_XDEV(
 //usage:     "\n        -xdev           Don't descend directories on other filesystems"
diff --git a/findutils/grep.c b/findutils/grep.c
index f746210d2..fa3b8a3a9 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -72,7 +72,6 @@
 //usage:       "PATTERN/-e PATTERN.../-f FILE [FILE]..."
 //usage:#define grep_full_usage "\n\n"
 //usage:       "Search for PATTERN in FILEs (or stdin)\n"
-//usage:     "\nOptions:"
 //usage:     "\n        -H      Add 'filename:' prefix"
 //usage:     "\n        -h      Do not add 'filename:' prefix"
 //usage:     "\n        -n      Add 'line_no:' prefix"
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 967737133..0d1bb43fc 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -349,7 +349,6 @@ static int xargs_ask_confirmation(void)
 //usage:       "[OPTIONS] [PROG ARGS]"
 //usage:#define xargs_full_usage "\n\n"
 //usage:       "Run PROG on every item given by stdin\n"
-//usage:     "\nOptions:"
 //usage:        IF_FEATURE_XARGS_SUPPORT_CONFIRMATION(
 //usage:     "\n        -p      Ask user whether to run each command"
 //usage:        )