[iptables] doc: resynchronize markup in iptables,ip6tables.8.in

[Pablo Neira]

Gitweb:		http://git.netfilter.org/cgi-bin/gitweb.cgi?p=iptables.git;a=commit;h=0c2b5a4aff8ee61529aca8541f7fdae18500470f
commit 0c2b5a4aff8ee61529aca8541f7fdae18500470f
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jan 8 18:04:40 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu Jan 8 18:04:40 2009 +0100

    doc: resynchronize markup in iptables,ip6tables.8.in
    
    Change .br to .PP in the intro section and use consistent
    paragraphing in later ones.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 8d67190c5501fd99a71908838ad6d36444234124
Author:     Jan Engelhardt <jengelh at medozas.de>
AuthorDate: Thu Jan 8 18:03:45 2009 +0100
Commit:     Pablo Neira Ayuso <pablo at netfilter.org>
CommitDate: Thu Jan 8 18:03:45 2009 +0100

    doc: put iptables version into manpage
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>
       via  0c2b5a4aff8ee61529aca8541f7fdae18500470f (commit)
       via  8d67190c5501fd99a71908838ad6d36444234124 (commit)
      from  0086b8bf9cf74642f6d6d82d9bbaedc80fec1dca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0c2b5a4aff8ee61529aca8541f7fdae18500470f
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Jan 8 18:04:40 2009 +0100

    doc: resynchronize markup in iptables,ip6tables.8.in
    
    Change .br to .PP in the intro section and use consistent
    paragraphing in later ones.
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

commit 8d67190c5501fd99a71908838ad6d36444234124
Author: Jan Engelhardt <jengelh at medozas.de>
Date:   Thu Jan 8 18:03:45 2009 +0100

    doc: put iptables version into manpage
    
    Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
    Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

-----------------------------------------------------------------------

 Makefile.am    |    4 ++--
 ip6tables.8.in |   25 ++++++++++++-------------
 iptables.8.in  |    7 +++----
 3 files changed, 17 insertions(+), 19 deletions(-)
Signed-off-by: Jan Engelhardt <jengelh at medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo at netfilter.org>

diff --git a/Makefile.am b/Makefile.am
index ced23b3..fd4d93f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,10 +89,10 @@ sbin_PROGRAMS += iptables iptables-multi iptables-restore iptables-save \
 endif
 
 iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man extensions/targets4.man
-	${AM_VERBOSE_GEN} sed -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
 
 ip6tables.8: ${srcdir}/ip6tables.8.in extensions/matches6.man extensions/targets6.man
-	${AM_VERBOSE_GEN} sed -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
+	${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
 
 extensions/%:
 	${MAKE} ${AM_MAKEFLAGS} -C $(@D) $(@F)
diff --git a/ip6tables.8.in b/ip6tables.8.in
index 669a961..3b473bf 100644
--- a/ip6tables.8.in
+++ b/ip6tables.8.in
@@ -1,4 +1,4 @@
-.TH IP6TABLES 8 "Jul 03, 2008" "" ""
+.TH IP6TABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@"
 .\"
 .\" Man page written by Andras Kis-Szabo <kisza at sch.bme.hu>
 .\" It is based on iptables man page.
diff --git a/iptables.8.in b/iptables.8.in
index 9947da4..b9d6383 100644
--- a/iptables.8.in
+++ b/iptables.8.in
@@ -1,4 +1,4 @@
-.TH IPTABLES 8 "Jul 03, 2008" "" ""
+.TH IPTABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@"
 .\"
 .\" Man page written by Herve Eychenne <rv at wallfire.org> (May 1999)
 .\" It is based on ipchains page.