1 files changed, 16 insertions, 18 deletions

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index e27202bb8d75..1f45bd887d65 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1,7 +1,7 @@
 
                 Linux Ethernet Bonding Driver HOWTO
 
-                Latest update: 23 September 2009
+                Latest update: 27 April 2011
 
 Initial release : Thomas Davis <tadavis at lbl.gov>
 Corrections, HA extensions : 2000/10/03-15 :
@@ -585,25 +585,23 @@ mode
                 chosen.
 
 num_grat_arp
-
-        Specifies the number of gratuitous ARPs to be issued after a
-        failover event.  One gratuitous ARP is issued immediately after
-        the failover, subsequent ARPs are sent at a rate of one per link
-        monitor interval (arp_interval or miimon, whichever is active).
-
-        The valid range is 0 - 255; the default value is 1.  This option
-        affects only the active-backup mode.  This option was added for
-        bonding version 3.3.0.
-
 num_unsol_na
 
-        Specifies the number of unsolicited IPv6 Neighbor Advertisements
-        to be issued after a failover event.  One unsolicited NA is issued
-        immediately after the failover.
-
-        The valid range is 0 - 255; the default value is 1.  This option
-        affects only the active-backup mode.  This option was added for
-        bonding version 3.4.0.
+        Specify the number of peer notifications (gratuitous ARPs and
+        unsolicited IPv6 Neighbor Advertisements) to be issued after a
+        failover event.  As soon as the link is up on the new slave
+        (possibly immediately) a peer notification is sent on the
+        bonding device and each VLAN sub-device.  This is repeated at
+        each link monitor interval (arp_interval or miimon, whichever
+        is active) if the number is greater than 1.
+
+        The valid range is 0 - 255; the default value is 1.  These options
+        affect only the active-backup mode.  These options were added for
+        bonding versions 3.3.0 and 3.4.0 respectively.
+
+        From Linux 2.6.40 and bonding version 3.7.1, these notifications
+        are generated by the ipv4 and ipv6 code and the numbers of
+        repetitions cannot be set independently.
 
 primary