* conntrack: fix English typo in documentation
@ 2009-07-16 10:49 Jan Engelhardt
2009-07-17 10:19 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Jan Engelhardt @ 2009-07-16 10:49 UTC (permalink / raw)
To: pablo; +Cc: Netfilter Developer Mailing List
parent 9d57b20ca51ee4de21b938bc20f9e3345aa9b02b (conntrack-tools-0.9.12-38-g9d57b20)
commit 88a98cc401541402283fa0354c1361505eed6406
Author: Jan Engelhardt <jengelh@medozas.de>
Date: Thu Jul 16 12:48:42 2009 +0200
conntrack: fix English typo in documentation
This is an update to commit 575fc906a302599cb9afeb136096dfd96bb57b17.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
doc/manual/conntrack-tools.tmpl | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/manual/conntrack-tools.tmpl b/doc/manual/conntrack-tools.tmpl
index 50ae23f..b897318 100644
--- a/doc/manual/conntrack-tools.tmpl
+++ b/doc/manual/conntrack-tools.tmpl
@@ -181,14 +181,14 @@
# conntrack -L
tcp 6 431982 ESTABLISHED src=192.168.2.100 dst=123.59.27.117 sport=34846 dport=993 packets=169 bytes=14322 src=123.59.27.117 dst=192.168.2.100 sport=993 dport=34846 packets=113 bytes=34787 [ASSURED] mark=0 secmark=0 use=1
tcp 6 431698 ESTABLISHED src=192.168.2.100 dst=123.59.27.117 sport=34849 dport=993 packets=244 bytes=18723 src=123.59.27.117 dst=192.168.2.100 sport=993 dport=34849 packets=203 bytes=144731 [ASSURED] mark=0 secmark=0 use=1
-conntrack v0.9.7 (conntrack-tools): 2 flow entries has been shown.
+conntrack v0.9.7 (conntrack-tools): 2 flow entries have been shown.
</programlisting>
<para>You can natively filter the output without using <emphasis>grep</emphasis>:</para>
<programlisting>
# conntrack -L -p tcp --dport 34856
tcp 6 431982 ESTABLISHED src=192.168.2.100 dst=123.59.27.117 sport=34846 dport=993 packets=169 bytes=14322 src=123.59.27.117 dst=192.168.2.100 sport=993 dport=34846 packets=113 bytes=34787 [ASSURED] mark=0 secmark=0 use=1
-conntrack v0.9.7 (conntrack-tools): 1 flow entries has been shown.
+conntrack v0.9.7 (conntrack-tools): 1 flow entries have been shown.
</programlisting>
<para>Update the mark based on a selection, this allows you to change the mark of an entry without using the CONNMARK target:</para>
--
# Created with git-export-patch
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: conntrack: fix English typo in documentation
2009-07-16 10:49 conntrack: fix English typo in documentation Jan Engelhardt
@ 2009-07-17 10:19 ` Pablo Neira Ayuso
2009-07-17 10:20 ` Pablo Neira Ayuso
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2009-07-17 10:19 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Developer Mailing List
Jan Engelhardt wrote:
> parent 9d57b20ca51ee4de21b938bc20f9e3345aa9b02b (conntrack-tools-0.9.12-38-g9d57b20)
> commit 88a98cc401541402283fa0354c1361505eed6406
> Author: Jan Engelhardt <jengelh@medozas.de>
> Date: Thu Jul 16 12:48:42 2009 +0200
>
> conntrack: fix English typo in documentation
>
> This is an update to commit 575fc906a302599cb9afeb136096dfd96bb57b17.
Applied, thanks!
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: conntrack: fix English typo in documentation
2009-07-17 10:19 ` Pablo Neira Ayuso
@ 2009-07-17 10:20 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2009-07-17 10:20 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Netfilter Developer Mailing List
Pablo Neira Ayuso wrote:
> Jan Engelhardt wrote:
>> parent 9d57b20ca51ee4de21b938bc20f9e3345aa9b02b (conntrack-tools-0.9.12-38-g9d57b20)
>> commit 88a98cc401541402283fa0354c1361505eed6406
>> Author: Jan Engelhardt <jengelh@medozas.de>
>> Date: Thu Jul 16 12:48:42 2009 +0200
>>
>> conntrack: fix English typo in documentation
>>
>> This is an update to commit 575fc906a302599cb9afeb136096dfd96bb57b17.
>
> Applied, thanks!
Ops, I forgot to update GIT_AUTHOR_[*] stuff. Sorry.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-17 10:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-16 10:49 conntrack: fix English typo in documentation Jan Engelhardt
2009-07-17 10:19 ` Pablo Neira Ayuso
2009-07-17 10:20 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).