New ifb from jamal

diff --git a/ChangeLog b/ChangeLog
index 09a0373b199c4e7dafd05a0efea34562d7dbd562..dd074dae5ecc4c68f3ca78f4b28ff26370108ffa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-03  Jamal Hadi Salim <hadi@znyx.com>
+
+       * Documentation for ifb
+
 2005-12-09  Stephen Hemminger  <shemminger@osdl.org>
 
        * Add corrupt feature to netem

diff --git a/doc/actions/mirred-usage b/doc/actions/mirred-usage
index 3e135a0e249eae69737ba1d358061df355f02fb9..aa942e58fd31cce1ca25571781633d87c0015cdc 100644 (file)
--- a/doc/actions/mirred-usage
+++ b/doc/actions/mirred-usage
@@ -66,6 +66,6 @@ action mirred egress mirror dev eth1
 ---
 
 A more interesting example is when you mirror flows to a dummy device
-so you could tcpdump them (dummy by defaults drops all devices it sees).
+so you could tcpdump them (dummy by defaults drops all packets it sees).
 This is a very useful debug feature.