- add warning note to ctnl_test.c: old API is deprecated

- split expect_api_test.c into small example files expect_*.c
- introduce alias tags for original tuple attributes
- introduce nfexp_sizeof and nfexp_maxsize
- build expectation attributes iif they are set
- fix l3num setting in expect/build.c

1 files changed, 7 insertions, 2 deletions

diff --git a/conntrack.8 b/conntrack.8
index 307180b..6c5d9d6 100644
--- a/conntrack.8
+++ b/conntrack.8
@@ -1,6 +1,7 @@
-.TH CONNTRACK 8 "Jun 23, 2005" "" ""
+.TH CONNTRACK 8 "May 6, 2007" "" ""
 
 .\" Man page written by Harald Welte <laforge@netfilter.org (Jun 2005)
+.\" Maintained by Pablo Neira Ayuso <pablo@netfilter.org (May 2007)
 
 .SH NAME
 conntrack \- administration tool for netfilter connection tracking
@@ -74,6 +75,10 @@ Flush the whole given table
 Atomically zero counters after reading them.  This option is only valid in
 combination with the "-L, --dump" command options.
 .TP
+.BI "-x, --xml "
+Display output in XML format.  This option is only valid in combination with 
+the "-L, --dump", "-E, --event" and "-G, --get" command options.
+.TP
 .BI "-e, --event-mask " "[ALL|NEW|UPDATES|DESTROY][,...]"
 Set the bitmask of events that are to be generated by the in-kernel ctnetlink
 event code.  Using this parameter, you can reduce the event messages generated
@@ -139,4 +144,4 @@ Jay Schulist, Patrick McHardy, Harald Welte and Pablo Neira wrote the kernel-lev
 .PP
 Pablo Neira wrote the conntrack tool, Harald Welte added support for conntrack based accounting counters.
 .PP
-Man page written by Harald Welte <laforge@netfilter.org>.
+Man page written by Harald Welte <laforge@netfilter.org> and Pablo Neira Ayuso <pablo@netfilter.org>.