From c25defaa61c75564c64410c47be0087781ff135c Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Sun, 14 Jul 2013 19:32:12 +0200 Subject: 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 Signed-off-by: Pablo Neira Ayuso --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'configure.ac') 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 -- cgit v1.2.3