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 /configure.ac | |
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 'configure.ac')
-rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f8affedd..52d6b54d 100644 --- a/configure.ac +++ b/configure.ac @@ -155,8 +155,7 @@ AC_SUBST([libxtables_vmajor]) AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile iptables/Makefile iptables/xtables.pc - iptables/iptables.8 iptables/ip6tables.8 - iptables/iptables-extensions.8.tmpl + iptables/iptables.8 iptables/iptables-extensions.8.tmpl libipq/Makefile libipq/libipq.pc libiptc/Makefile libiptc/libiptc.pc libiptc/libip4tc.pc libiptc/libip6tc.pc |