--- old/./arp.7p.txt	Fri Dec 19 04:18:44 2008
+++ new/./arp.7p.txt	Fri Dec 19 04:18:44 2008
@@ -116,7 +116,7 @@
 
      The address  family  for  the  [x]arp_pa  sockaddr  must  be
      AF_INET.  The  ATF_COM  flag  bits  ([x]arp_flags) cannot be
-     altered.  ATF_USETRAILER  is not implemented on Solaris  and
+     altered.  ATF_USETRAILERS is not implemented on Solaris  and
      is  retained   for  compatibility  only.  ATF_PERM makes the
      entry permanent (disables aging)   if  the  ioctl()  request
      succeeds.  ATF_PUBL specifies that the system should respond
@@ -171,6 +171,31 @@
      interface.  The information returned is very similar to that
      returned via routing sockets on an RTM_IFINFO message.
 
+     The ARP   ioctls  have several additional  restrictions  and
+     enhancements when used in conjunction with IPMP:
+
+        * The ARP  mappings for IPMP  data and test addresses are
+          managed by  the   kernel, and thus    cannot be changed
+          through any  ARP  ioctls, though  they may be retrieved
+          using *SIOCGARP* or *SIOCGXARP*.
+
+        * ARP mappings for a  given IPMP group must be consistent
+          across  the group.  Therefore,  ARP  mappings cannot be
+          associated with  individual underlying IP interfaces in
+          an IPMP group, and  must instead be associated with the
+          corresponding IPMP IP interface.
+
+        * Proxy ARP mappings for  an IPMP group are automatically
+          managed by the kernel.   Specifically, if the  hardware
+          address in a  *SIOCSARP* or *SIOCSXARP* request matches
+          the hardware  address of  an  IP  interface in an  IPMP
+          group, and the  IP address is not  local to the system,
+          the kernel will regard this as a  IPMP Proxy ARP entry.
+          This  IPMP Proxy ARP    entry  will have   its hardware
+          address automatically adjusted in  order to keep the IP
+          address reachable  (provided   the IPMP group has   not
+          entirely failed).
+
      ARP  performs  duplicate   address   detection   for   local
      addresses.  When a logical  interface is brought up (IFF_UP)
      or any time the hardware link goes  up   (IFF_RUNNING),  ARP