path: root/iptables/
diff options
authorJan Engelhardt <>2012-09-30 23:34:04 +0200
committerJan Engelhardt <>2012-09-30 23:38:58 +0200
commit4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch)
tree30ee606da82b0cbcb11ebb303196afb29f4e65e7 /iptables/
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 'iptables/')
1 files changed, 4 insertions, 17 deletions
diff --git a/iptables/ b/iptables/
index 65f38646..078bcacd 100644
--- a/iptables/
+++ b/iptables/
@@ -362,23 +362,8 @@ When adding or inserting rules into a chain, use \fIcommand\fP
to load any necessary modules (targets, match extensions, etc).
-ip6tables can use extended packet matching modules
-with the \fB\-m\fP or \fB\-\-match\fP
-options, followed by the matching module name; after these, various
-extra command line options become available, depending on the specific
-module. You can specify multiple extended match modules in one line,
-and you can use the \fB\-h\fP or \fB\-\-help\fP
-options after the module has been specified to receive help specific
-to that module.
-If the \fB\-p\fP or \fB\-\-protocol\fP was specified and if and only if an
-unknown option is encountered, ip6tables will try load a match module of the
-same name as the protocol, to try making the option available.
-.\" @MATCH@
-ip6tables can use extended target modules: the following are included
-in the standard distribution.
-.\" @TARGET@
+iptables can use extended packet matching and target modules.
+A list of these is available in the \fBiptables\-extensions\fP(8) manpage.
Various error messages are printed to standard error. The exit code
is 0 for correct functioning. Errors which appear to be caused by
@@ -405,6 +390,8 @@ There are several other changes in ip6tables.