All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH conntrack-tools v2] conntrack.8: minor copy edit
@ 2021-09-27 15:12 Štěpán Němec
  2021-09-28 10:54 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Štěpán Němec @ 2021-09-27 15:12 UTC (permalink / raw)
  To: netfilter-devel, Pablo Neira Ayuso

Signed-off-by: Štěpán Němec <snemec@redhat.com>
---
v2: Forgot to escape the dashes, sorry.

 conntrack.8 | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/conntrack.8 b/conntrack.8
index a14cca6f6480..c3214ee0c886 100644
--- a/conntrack.8
+++ b/conntrack.8
@@ -26,7 +26,7 @@ conntrack \- command line interface for netfilter connection tracking
 .br
 .BR "conntrack -R file"
 .SH DESCRIPTION
-The \fBconntrack\fP utilty provides a full featured userspace interface to the
+The \fBconntrack\fP utility provides a full\-featured userspace interface to the
 Netfilter connection tracking system that is intended to replace the old
 /proc/net/ip_conntrack interface. This tool can be used to search, list,
 inspect and maintain the connection tracking subsystem of the Linux kernel.
@@ -121,12 +121,12 @@ timestamp available since 2.6.38 (you can enable it via the \fBsysctl(8)\fP
 key \fBnet.netfilter.nf_conntrack_timestamp\fP).
 The labels output option tells \fBconntrack\fP to show the names of connection
 tracking labels that might be present.
-The userspace output options tells if the event has been triggered by a process.
+The userspace output option tells if the event has been triggered by a process.
 .TP
 .BI "-e, --event-mask " "[ALL|NEW|UPDATES|DESTROY][,...]"
 Set the bitmask of events that are to be generated by the in-kernel ctnetlink
 event code.  Using this parameter, you can reduce the event messages generated
-by the kernel to those types to those that you are actually interested in.
+by the kernel to the types that you are actually interested in.
 .
 This option can only be used in conjunction with "\-E, \-\-event".
 .TP
@@ -135,7 +135,7 @@ Set the Netlink socket buffer size in bytes. This option is useful if the
 command line tool reports ENOBUFS errors. If you do not pass this option, the
 default value available at \fBsysctl(8)\fP key \fBnet.core.rmem_default\fP is
 used. The tool reports this problem if your process is too slow to handle all
-the event messages or, in other words, if the amount of events are big enough
+the event messages or, in other words, if the amount of events is big enough
 to overrun the socket buffer. Note that using a big buffer reduces the chances
 to hit ENOBUFS, however, this results in more memory consumption.
 .
@@ -163,7 +163,7 @@ one specified as argument.
 Specify layer four (TCP, UDP, ...) protocol.
 .TP
 .BI "-f, --family " "PROTO"
-Specify layer three (ipv4, ipv6) protocol
+Specify layer three (ipv4, ipv6) protocol.
 This option is only required in conjunction with "\-L, \-\-dump". If this
 option is not passed, the default layer 3 protocol will be IPv4.
 .TP
@@ -181,12 +181,11 @@ comparision. In "\-\-create" mode, the mask is ignored.
 Specify a conntrack label.
 This option is only available in conjunction with "\-L, \-\-dump",
 "\-E, \-\-event", "\-U \-\-update" or "\-D \-\-delete".
-Match entries whose labels match at least those specified.
-Use multiple \-l commands to specify multiple labels that need to be set.
-Match entries whose labels matches at least those specified as arguments.
+Match entries whose labels include those specified as arguments.
+Use multiple \-l options to specify multiple labels that need to be set.
 .TP
 .BI "--label-add " "LABEL"
-Specify the conntrack label to add to to the selected conntracks.
+Specify the conntrack label to add to the selected conntracks.
 This option is only available in conjunction with "\-I, \-\-create" or
 "\-U, \-\-update".
 .TP
@@ -395,7 +394,7 @@ Show source NAT connections
 Show connection events together with the timestamp
 .TP
 .B conntrack \-D \-s 1.2.3.4
-Delete all flow whose source address is 1.2.3.4
+Delete all flows whose source address is 1.2.3.4
 .TP
 .B conntrack \-U \-s 1.2.3.4 \-m 1
 Set connmark to 1 of all the flows whose source address is 1.2.3.4
@@ -417,8 +416,8 @@ See
 Jay Schulist, Patrick McHardy, Harald Welte and Pablo Neira Ayuso wrote the
 kernel-level "ctnetlink" interface that is used by the conntrack tool.
 .PP
-Pablo Neira Ayuso wrote and maintain the conntrack tool, Harald Welte added
-support for conntrack based accounting counters.
+Pablo Neira Ayuso wrote and maintains the conntrack tool, Harald Welte added
+support for conntrack\-based accounting counters.
 .PP
 Man page written by Harald Welte <laforge@netfilter.org> and
 Pablo Neira Ayuso <pablo@netfilter.org>.

base-commit: ee2d35899a2768489c8705fe1a9e72731813e6d2
-- 
2.33.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH conntrack-tools v2] conntrack.8: minor copy edit
  2021-09-27 15:12 [PATCH conntrack-tools v2] conntrack.8: minor copy edit Štěpán Němec
@ 2021-09-28 10:54 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2021-09-28 10:54 UTC (permalink / raw)
  To: Štěpán Němec; +Cc: netfilter-devel

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-28 10:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-27 15:12 [PATCH conntrack-tools v2] conntrack.8: minor copy edit Štěpán Němec
2021-09-28 10:54 ` Pablo Neira Ayuso

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.