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, 1 insertions, 1 deletions

diff --git a/trafgen.c b/trafgen.c
index 4e670ed..5ec837b 100644
--- a/trafgen.c
+++ b/trafgen.c
@@ -179,7 +179,7 @@ static void help(void)
 	     "  -u|--user <userid>             Drop privileges and change to userid\n"
 	     "  -g|--group <groupid>           Drop privileges and change to groupid\n"
 	     "  -V|--verbose                   Be more verbose\n"
-	     "  -v|--version                   Show version\n"
+	     "  -v|--version                   Show version and exit\n"
 	     "  -e|--example                   Show built-in packet config example\n"
 	     "  -h|--help                      Guess what?!\n\n"
 	     "Examples:\n"