--- ifconfig.1m.orig	Thu Oct 26 11:55:42 2006
+++ ifconfig.1m.new	Thu Oct 26 22:44:24 2006
@@ -28,9 +28,9 @@
      -xmit]  [encaplimit n | -encaplimit]  [thoplimit n]  [router
      | -router]  [zone zonename | -zone | -all-zones]
 
-     ifconfig  interface {auto-dhcp |  dhcp}   [primary]  [  wait
-     seconds]   drop | extend | inform | ping | release | start |
-     status
+     ifconfig  interface [address_family] {auto-dhcp |  dhcp}
+     [primary]  [wait  seconds]   drop | extend | inform | ping |
+     release | start | status
 
 DESCRIPTION
      The command ifconfig is used to assign an address to a  net-
@@ -50,8 +50,7 @@
   DHCP Configuration
      The third and fourth forms of this command are used to  con-
      trol the Dynamic Host Configuration Protocol ("DHCP") confi-
-     guring of the interface. DHCP is only  available  on  inter-
-     faces  for  which  the address family is inet. In this mode,
+     guring of the interface.  In this mode,
      ifconfig is used to control operation of dhcpagent(1M),  the
      DHCP  client  daemon. Once an interface is placed under DHCP
      control by using the start operand, ifconfig should not,  in
@@ -160,6 +159,11 @@
          interface. This option has a completely equivalent alias
          called dhcp.
 
+         For IPv6, the interface specified must be the zeroth
+         logical interface (the physical interface name), which
+         has the link-local address.
+
+
          primary         Defines the interface  as  the  primary.
                          The  interface  is  defined  as the pre-
                          ferred one for the delivery  of  client-
@@ -204,14 +208,18 @@
 
 
          drop            Remove the specified interface from DHCP
-                         control.   Additionally,   set   the  IP
-                         address to zero and mark  the  interface
-                         as "down".
+                         control without notifying the DHCP
+                         server, and record the current lease for
+                         later use.   Additionally, for IPv4,
+                         set   the  IP address to zero and mark
+                         the  interface as "down."  For IPv6,
+                         unplumb all logical interfaces plumbed
+                         by dhcpagent.
 
 
 
          extend          Attempt  to  extend  the  lease  on  the
-                         interface's  IPv4  address.  This is not
+                         interface's  IP  addresses.  This is not
                          required, as the  agent  will  automati-
                          cally  extend  the  lease well before it
                          expires.
@@ -220,7 +228,7 @@
 
          inform          Obtain network configuration  parameters
                          from  DHCP  without obtaining a lease on
-                         an IP address. This is useful in  situa-
+                         IP addresses. This is useful in  situa-
                          tions  where  an  IP address is obtained
                          through mechanisms other than DHCP.
 
@@ -230,15 +238,16 @@
                          under DHCP control, which means that the
                          interface is managed by the  DHCP  agent
                          and  is working properly. An exit status
-                         of 0 means success. This subcommand  has
-                         no  meaning  when  the  named  interface
-                         represents more than one interface.
+                         of 0 means success.
 
 
 
-         release         Relinquish  the  IPv4  address  on   the
-                         interface,  and  mark  the  interface as
-                         "down."
+         release         Relinquish  the  IP  addresses  on   the
+                         interface by notifying the server and
+                         discard the current lease.  For IPv4,
+                         mark  the  interface as "down."  For
+                         IPv6, all logical interfaces plumbed by
+                         dhcpagent are unplumbed.
 
 
 
@@ -271,7 +280,8 @@
 
          automatically  acquire  an  address  for this interface.
          This will fail if the interface does not  support  RARP;
-         for example, IPoIB (IP over InfiniBand).
+         for example, IPoIB (IP over InfiniBand), and on IPv6
+         interfaces.
 
 
 
@@ -2125,6 +2135,18 @@
      The test2  and  test3  zone  interfaces  and  addresses  are
      created in the same way.
 
+     Example 13: Turning Off DHCPv6
+
+     The following example shows how to disable automatic use of
+     DHCPv6 on all interfaces, and immediately shut down DHCPv6
+     on the interface named "hme0."  See in.ndpd(1M) and
+     ndpd.conf(4) for more information on the automatic DHCPv6
+     configuration mechanism.
+
+     example% echo ifdefault StatefulAddrConf false >> /etc/inet/ndpd.conf
+     example% pkill -HUP -x in.ndpd
+     example% ifconfig hme0 dhcp release
+
 FILES
      /etc/netmasks           Netmask data.
 
@@ -2138,35 +2160,24 @@
      See attributes(5) for descriptions of the  following  attri-
      butes:
 
-  /usr/sbin
      ____________________________________________________________
     |       ATTRIBUTE TYPE        |       ATTRIBUTE VALUE       |
     |_____________________________|_____________________________|
     | Availability                | SUNWcsu                     |
     |_____________________________|_____________________________|
-    | Interface   Stability   for | Evolving                    |
-    | options modlist, modinsert, |                             |
-    | and modremove               |                             |
+    | Interface Stability for     | Committed                   |
+    | command-line options        |                             |
     |_____________________________|_____________________________|
-
-
-  /sbin
-     ____________________________________________________________
-    |       ATTRIBUTE TYPE        |       ATTRIBUTE VALUE       |
+    | Interface Stability for     | Uncommitted                 |
+    | command output              |                             |
     |_____________________________|_____________________________|
-    | Availability                | SUNWcsr                     |
-    |_____________________________|_____________________________|
-    | Interface   Stability   for | Evolving                    |
-    | options modlist, modinsert, |                             |
-    | and modremove               |                             |
-    |_____________________________|_____________________________|
 
 
 SEE ALSO
-     dhcpinfo(1),  dhcpagent(1M),  in.mpathd(1M),  in.routed(1M),
+     dhcpinfo(1),  dhcpagent(1M),  in.mpathd(1M),  in.ndpd(1M), in.routed(1M),
      ndd(1M),    netstat(1M),    zoneadm(1M),    ethers(3SOCKET),
      gethostbyname(3NSL),    getnetbyname(3SOCKET),     hosts(4),
-     inet_type(4),  netmasks(4),  networks(4),  nsswitch.conf(4),
+     inet_type(4),  ndpd.conf(4), netmasks(4),  networks(4),  nsswitch.conf(4),
      attributes(5),     privileges(5),     zones(5),     arp(7P),
      ipsecah(7P), ipsecesp(7P), tun(7M)
 
