path: root/extensions/
diff options
authorJan Engelhardt <>2012-09-30 23:34:04 +0200
committerJan Engelhardt <>2012-09-30 23:38:58 +0200
commit4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch)
tree30ee606da82b0cbcb11ebb303196afb29f4e65e7 /extensions/
parentec40b897289745da3d67de2cb14be30353003922 (diff)
parent7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff)
Merge branch 'master' of git://
Conflicts: extensions/ Resolution: trivial, since this was a fuzz 3. Reason: Line added from v1.4.15-16-g33710a5 was in vincinity of changes from v1.4.15-22-g4496801.
Diffstat (limited to 'extensions/')
1 files changed, 2 insertions, 4 deletions
diff --git a/extensions/ b/extensions/
index c2cdf5a6..633b965e 100644
--- a/extensions/
+++ b/extensions/
@@ -1,5 +1,3 @@
This target disables connection tracking for all packets matching that rule.
-It can only be used in the
-.B raw
+It is obsoleted by \-j CT \-\-notrack. Like CT, NOTRACK can only be used in
+the \fBraw\fP table.