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/flowtop.8 b/flowtop.8
index fd2393c..bd3c84e 100644
--- a/flowtop.8
+++ b/flowtop.8
@@ -82,10 +82,10 @@ limit policy), different hosts or IP addresses can be placed into geoip.conf,
 separated by a newline.
 
 .SS -v, --version
-Show versioning information.
+Show versioning information and exit.
 
 .SS -h, --help
-Show user help.
+Show user help and exit.
 
 .SH USAGE EXAMPLE