remove chunks about options we do not have, and uncomment the ones we

do have.

1 files changed, 13 insertions, 26 deletions

diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 3d8abf76257..d73e8026863 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ip6.4,v 1.31 2013/07/10 07:07:12 jmc Exp $
+.\"	$OpenBSD: ip6.4,v 1.32 2013/10/27 18:29:02 deraadt Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -26,7 +26,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: July 10 2013 $
+.Dd $Mdocdate: October 27 2013 $
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -140,22 +140,10 @@ extension headers.
 .Pp
 The following socket options are supported:
 .Bl -tag -width Ds
-.\" .It Dv IPV6_OPTIONS
 .It Dv IPV6_UNICAST_HOPS Fa "int *"
 Get or set the default hop limit header field for outgoing unicast
 datagrams sent on this socket.
 A value of \-1 resets to the default value.
-.\" .It Dv IPV6_RECVOPTS Fa "int *"
-.\" Get or set the status of whether all header options will be
-.\" delivered along with the datagram when it is received.
-.\" .It Dv IPV6_RECVRETOPTS Fa "int *"
-.\" Get or set the status of whether header options will be delivered
-.\" for reply.
-.\" .It Dv IPV6_RECVDSTADDR Fa "int *"
-.\" Get or set the status of whether datagrams are received with
-.\" destination addresses.
-.\" .It Dv IPV6_RETOPTS
-.\" Get or set IPv6 options.
 .It Dv IPV6_MULTICAST_IF Fa "u_int *"
 Get or set the interface from which multicast packets will be sent.
 For hosts with multiple interfaces, each multicast transmission is sent
@@ -263,17 +251,17 @@ The value is stored as an
 in the ancillary data returned.
 Turning this option on will result in this socket getting cmsg data of
 type IPV6_HOPLIMIT.
-.\" .It Dv IPV6_NEXTHOP Fa "int *"
-.\" Get or set whether the address of the next hop for subsequent
-.\" packets will be provided as ancillary data along with the payload in
-.\" subsequent
-.\" .Xr recvmsg 2
-.\" calls.
-.\" The option is stored as a
-.\" .Vt sockaddr
-.\" structure in the ancillary data returned.
-.\" .Pp
-.\" This option requires superuser privileges.
+.It Dv IPV6_NEXTHOP Fa "int *"
+Get or set whether the address of the next hop for subsequent
+packets will be provided as ancillary data along with the payload in
+subsequent
+.Xr recvmsg 2
+calls.
+The option is stored as a
+.Vt sockaddr
+structure in the ancillary data returned.
+.Pp
+This option requires superuser privileges.
 .It Dv IPV6_RECVHOPOPTS Fa "int *"
 Get or set whether the hop-by-hop options from subsequent packets will be
 provided as ancillary data along with the payload in subsequent
@@ -432,7 +420,6 @@ type IPV6_RECVDSTPORT.
 .Pp
 The
 .Dv IPV6_RECVPKTINFO ,
-.\" .Dv IPV6_RECVNEXTHOP ,
 .Dv IPV6_RECVHOPLIMIT ,
 .Dv IPV6_RECVHOPOPTS ,
 .Dv IPV6_RECVDSTOPTS ,