diff options
| author | Florian Westphal <fw@strlen.de> | 2013-07-14 19:32:12 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-07 11:27:16 +0200 |
| commit | c25defaa61c75564c64410c47be0087781ff135c (patch) | |
| tree | c6ef700ba7bce73efa9a3fcf9217e8e577e0c4e3 /iptables/iptables-restore.8 | |
| parent | 54fccb1be58fbbabb6bfff4b136470a19e2ef48c (diff) | |
doc: merge ip6table man pages into ipv4 ones
a couple of improvements to the iptables man page never made it into
ip6tables version.
The number of differences between these two files is so small that
it seems preferable to alias the ipv6 man pages to their ipv4 counterpart
and change iptables man page to specifically document differences
(e.g. lack of ip6tables -f, etc).
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/iptables-restore.8')
| -rw-r--r-- | iptables/iptables-restore.8 | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/iptables/iptables-restore.8 b/iptables/iptables-restore.8 index 2b1d102c..8567147a 100644 --- a/iptables/iptables-restore.8 +++ b/iptables/iptables-restore.8 @@ -20,13 +20,19 @@ .\" .SH NAME iptables-restore \(em Restore IP Tables +.P +ip6tables-restore \(em Restore IPv6 Tables .SH SYNOPSIS \fBiptables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP] +.P +\fBip6tables\-restore\fP [\fB\-chntv\fP] [\fB\-M\fP \fImodprobe\fP] [\fB\-T\fP \fIname\fP] .SH DESCRIPTION .PP .B iptables-restore -is used to restore IP Tables from data specified on STDIN. Use +and +.B ip6tables-restore +are used to restore IP and IPv6 Tables from data specified on STDIN. Use I/O redirection provided by your shell to read from a file .TP \fB\-c\fR, \fB\-\-counters\fR @@ -35,10 +41,9 @@ restore the values of all packet and byte counters \fB\-h\fP, \fB\-\-help\fP Print a short option summary. .TP -\fB\-n\fR, \fB\-\-noflush\fR -don't flush the previous contents of the table. If not specified, -.B iptables-restore -flushes (deletes) all previous contents of the respective table. +\fB\-n\fR, \fB\-\-noflush\fR +don't flush the previous contents of the table. If not specified, +both commands flush (delete) all previous contents of the respective table. .TP \fB\-t\fP, \fB\-\-test\fP Only parse and construct the ruleset, but do not commit it. @@ -54,8 +59,11 @@ inspect /proc/sys/kernel/modprobe to determine the executable's path. Restore only the named table even if the input stream contains other ones. .SH BUGS None known as of iptables-1.2.1 release -.SH AUTHOR -Harald Welte <laforge@gnumonks.org> +.SH AUTHORS +Harald Welte <laforge@gnumonks.org> wrote iptables-restore based on code +from Rusty Russell. +.br +Andras Kis-Szabo <kisza@sch.bme.hu> contributed ip6tables-restore. .SH SEE ALSO \fBiptables\-save\fP(8), \fBiptables\fP(8) .PP |