Merge branch 'master' of github.com:borkmann/netsniff-ng

Conflicts resolved by hand:
	bpfc.8
	ifpps.8
	netsniff-ng.8

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/bpfc.c b/bpfc.c
index 2045512..1b29bb3 100644
--- a/bpfc.c
+++ b/bpfc.c
@@ -42,8 +42,8 @@ static void help(void)
 	     "  -b|--bypass             Bypass filter validation (e.g. for bug testing)\n"
 	     "  -V|--verbose            Be more verbose\n"
 	     "  -d|--dump               Dump supported instruction table\n"
-	     "  -v|--version            Print version\n"
-	     "  -h|--help               Print this help\n\n"
+	     "  -v|--version            Print version and exit\n"
+	     "  -h|--help               Print this help and exit\n\n"
 	     "Examples:\n"
 	     "  bpfc fubar\n"
 	     "  bpfc fubar > foo (bpfc -f C -i fubar > foo) -->  netsniff-ng -f foo ...\n"