diff options
author | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:34:04 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@inai.de> | 2012-09-30 23:38:58 +0200 |
commit | 4c1a015e201c6e5192448cbcf1975dd7630cad82 (patch) | |
tree | 30ee606da82b0cbcb11ebb303196afb29f4e65e7 /iptables/ip6tables.8.in | |
parent | ec40b897289745da3d67de2cb14be30353003922 (diff) | |
parent | 7b5ba43ae48c1310e5a615cf9485c1d42f486467 (diff) |
Merge branch 'master' of git://git.inai.de/iptables
Conflicts:
extensions/GNUmakefile.in
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/ip6tables.8.in')
-rw-r--r-- | iptables/ip6tables.8.in | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index 65f38646..078bcacd 100644 --- a/iptables/ip6tables.8.in +++ b/iptables/ip6tables.8.in @@ -362,23 +362,8 @@ When adding or inserting rules into a chain, use \fIcommand\fP to load any necessary modules (targets, match extensions, etc). .SH MATCH EXTENSIONS .PP -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. -.PP -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@ -.SH TARGET EXTENSIONS -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. .SH DIAGNOSTICS 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. \fBip6tables\-save\fP(8), \fBip6tables\-restore\fP(8), \fBiptables\fP(8), +\fBiptables\-apply\fP(8), +\fBiptables\-extensions\fP(8), \fBiptables\-save\fP(8), \fBiptables\-restore\fP(8), \fBlibipq\fP(3). |