[PATCH 0/2] conntrackd: Fix bogus characters in help

[PATCH 0/2] conntrackd: Fix bogus characters in help

[Mart Frauenlob]

Good day!

The usage output as well as the man page of conntrackd
contain superflous separator characters.
The man page has two quoting errors.

Best regards,
Mart

[PATCH 1/2] conntrackd: man: remove bogus characters

[Mart Frauenlob]

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 conntrackd.8 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conntrackd.8 b/conntrackd.8
index 1ac96a2..3bb4335 100644
--- a/conntrackd.8
+++ b/conntrackd.8
@@ -24,17 +24,17 @@ Run conntrackd in daemon mode.
 .B conntrackd 
 can be used in client mode to request several information and operations to a running daemon
 .TP
-.BI "-i "[ct|expect]"
+.BI "-i " "[ct|expect]"
 Dump the internal cache, i.e. show local states
 .TP
-.BI "-e "[ct|expect]"
+.BI "-e " "[ct|expect]"
 Dump the external cache, i.e. show foreign states
 .TP
 .BI "-x "
 Display output in XML format. This option is only valid in combination
 with "\-i" and "\-e" parameters.
 .TP
-.BI "-f " "[|internal|external]"
+.BI "-f " "[internal|external]"
 Flush the internal and/or external cache
 .TP
 .BI "-F [ct|expect]"
@@ -54,7 +54,7 @@ Request resync with other node (only FT-FW and NOTRACK modes).
 .BI "-k "
 Kill the daemon
 .TP
-.BI "-s " "[|network|cache|runtime|link|rsqueue|process|queue|ct|expect]"
+.BI "-s " "[network|cache|runtime|link|rsqueue|process|queue|ct|expect]"
 Dump statistics. If no parameter is passed, it displays the general statistics.
 If "network" is passed as parameter it displays the networking statistics.
 If "cache" is passed as parameter, it shows the extended cache statistics.
-- 
1.7.2.5

[PATCH 2/2] conntrackd: remove unnecessary separator character from usage output.

[Mart Frauenlob]

Signed-off-by: Mart Frauenlob <mart.frauenlob@chello.at>
---
 src/main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 161f654..d12fe18 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,12 +43,12 @@ static const char usage_daemon_commands[] =
 static const char usage_client_commands[] =
 	"Client mode commands:\n"
 	"  -c [ct|expect], commit external cache to conntrack table\n"
-	"  -f [|internal|external], flush internal and external cache\n"
+	"  -f [internal|external], flush internal and external cache\n"
 	"  -F [ct|expect], flush kernel conntrack table\n"
 	"  -i [ct|expect], display content of the internal cache\n"
 	"  -e [ct|expect], display the content of the external cache\n"
 	"  -k, kill conntrack daemon\n"
-	"  -s  [|network|cache|runtime|link|rsqueue|queue|ct|expect], "
+	"  -s  [network|cache|runtime|link|rsqueue|queue|ct|expect], "
 		"dump statistics\n"
 	"  -R [ct|expect], resync with kernel conntrack table\n"
 	"  -n, request resync with other node (only FT-FW and NOTRACK modes)\n"
-- 
1.7.2.5

Re: [PATCH 1/2] conntrackd: man: remove bogus characters

[Pablo Neira Ayuso]

Applied.

Re: [PATCH 2/2] conntrackd: remove unnecessary separator character from usage output.

[Pablo Neira Ayuso]

Also applied.