Manpage fix and bumping the version number

diff --git a/ChangeLog b/ChangeLog
index 96d3ccebdbb0fe9693c99f431a35f0de6f1210b3..32b92d12b79fbac21d342895f76f469481e55ec9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2.2.2
+ - Jiffies rollover bug in ip_set_iptree reported and fixed by Rob Nielsen
+ - Compiler warning in the non-SMP case fixed (Marcus Sundberg)
+ - slab cache names shrunk in order to be compatible with 2.4.* (Marcus
+   Sundberg)
+
 2.2.1
  - Magic number in ip_set_nethash.h was mistyped (bug reported by Rob
    Carlson)

diff --git a/Makefile b/Makefile
index d40ece112f2db6e1fafade6eb42738d970e49e6e..0b72b0e6c7174e52f7ee73ae3c4ca8a1ce77a1de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ ifndef KERNEL_DIR
 KERNEL_DIR=/usr/src/linux
 endif
 
-IPSET_VERSION:=2.2.1
+IPSET_VERSION:=2.2.2
 
 PREFIX:=/usr/local
 LIBDIR:=$(PREFIX)/lib

diff --git a/ipset.8 b/ipset.8
index e5c4d82b092da3c96debba6ab1ee8ffee7d502ca..5e87af212bc9fda7a7f03609cdbc91a0ac364c76 100644 (file)
--- a/ipset.8
+++ b/ipset.8
@@ -313,7 +313,7 @@ where the CIDR block size must be in the inclusive range of 1-31.
 In order to avoid clashes in the hash, 
 double-hashing and, as a last resort, dynamic growing of the hash performed.
 .P
-Options to use when creating an iphash set:
+Options to use when creating an nethash set:
 .TP
 .BR "--hashsize " hashsize
 The initial hash size (default 1024)