Fix markup issues and add references to updated RFCs.

MFC after:	3 days

2 files changed, 57 insertions, 14 deletions

diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index b052fc987cec..c2ef91389b0b 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 7, 2012
+.Dd November 1, 2018
 .Dt ICMP6 4
 .Os
 .Sh NAME
@@ -188,11 +188,11 @@ By default, all messages types are allowed on newly created raw ICMPv6
 sockets.
 The following macros may be used to refine the input set:
 .Bl -tag -width Ds
-.It Fn "void ICMP6_FILTER_SETPASSALL" "struct icmp6_filter *filterp"
+.It Ft void Fn ICMP6_FILTER_SETPASSALL "struct icmp6_filter *filterp"
 Allow all incoming messages.
 .Va filterp
 is modified to allow all message types.
-.It Fn "void ICMP6_FILTER_SETBLOCKALL" "struct icmp6_filter *filterp"
+.It Ft void Fn ICMP6_FILTER_SETBLOCKALL "struct icmp6_filter *filterp"
 Ignore all incoming messages.
 .Va filterp
 is modified to ignore all message types.
@@ -206,7 +206,7 @@ Allow ICMPv6 messages with the given
 is modified to allow such messages.
 .It Xo
 .Ft void
-.Fn ICMP6_FILTER_SETBLOCK" "int type" "struct icmp6_filter *filterp"
+.Fn ICMP6_FILTER_SETBLOCK "int type" "struct icmp6_filter *filterp"
 .Xc
 Ignore ICMPv6 messages with the given
 .Fa type .
@@ -214,13 +214,13 @@ Ignore ICMPv6 messages with the given
 is modified to ignore such messages.
 .It Xo
 .Ft int
-.Fn ICMP6_FILTER_WILLPASS" "int type" "const struct icmp6_filter *filterp"
+.Fn ICMP6_FILTER_WILLPASS "int type" "const struct icmp6_filter *filterp"
 .Xc
 Determine if the given filter will allow an ICMPv6 message of the given
 type.
 .It Xo
 .Ft int
-.Fn ICMP6_FILTER_WILLBLOCK" "int type" "const struct icmp6_filter *filterp"
+.Fn ICMP6_FILTER_WILLBLOCK "int type" "const struct icmp6_filter *filterp"
 .Xc
 Determine if the given filter will ignore an ICMPv6 message of the given
 type.
@@ -263,3 +263,21 @@ structure as the option value.
 .%N RFC 2463
 .%D December 1998
 .Re
+.Rs
+.%A W. Stevens
+.%A M. Thomas
+.%A E. Nordmark
+.%A T. Jinmei
+.%T "Advanced Sockets Application Program Interface (API) for IPv6"
+.%R RFC 3542
+.%D May 2003
+.Re
+.Rs
+.%A A. Conta
+.%A S. Deering
+.%A M. Gupta
+.%T "Internet Control Message Protocol (ICMPv6) for the Internet" \
+    "Protocol Version 6 (IPv6) Specification"
+.%R RFC 4443
+.%D March 2006
+.Re
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 9828510922e1..7b71aa23eae0 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 19, 2018
+.Dd November 1, 2018
 .Dt IP6 4
 .Os
 .Sh NAME
@@ -652,9 +652,8 @@ An ancillary data object was improperly formed.
 .Xr setsockopt 2 ,
 .Xr socket 2 ,
 .Xr CMSG_DATA 3 ,
-.\" .Xr inet6_option_space 3 ,
-.\" .Xr inet6_rthdr_space 3 ,
 .Xr if_nametoindex 3 ,
+.Xr inet6_opt_init 3 ,
 .Xr bpf 4 ,
 .Xr icmp6 4 ,
 .Xr inet6 4 ,
@@ -686,16 +685,42 @@ An ancillary data object was improperly formed.
 .%D March 1999
 .Re
 .Rs
+.%A R. Gilligan
+.%A S. Thomson
+.%A J. Bound
+.%A J. McCann
+.%A W. Stevens
+.%T Basic Socket Interface Extensions for IPv6
+.%R RFC 3493
+.%D February 2003
+.Re
+.Rs
+.%A W. Stevens
+.%A M. Thomas
+.%A E. Nordmark
+.%A T. Jinmei
+.%T Advanced Sockets Application Program Interface (API) for IPv6
+.%R RFC 3542
+.%D May 2003
+.Re
+.Rs
+.%A S. Deering
+.%A R. Hinden
+.%T Internet Protocol, Version 6 (IPv6) Specification
+.%R RFC 8200
+.%D July 2017
+.Re
+.Rs
 .%A W. Stevens
 .%A B. Fenner
 .%A A. Rudoff
-.%T UNIX Network Programming, third edition
+.%T UNIX Network Programming, 3rd Edition
+.%I Addison-Wesley Professional
+.%D November 2003
 .Re
 .Sh STANDARDS
-Most of the socket options are defined in RFC 2292 or RFC 2553.
-The
-.Dv IPV6_V6ONLY
-socket option is defined in RFC 3493 Section 5.3.
+Most of the socket options are defined in RFC 2292 / 3542 or
+RFC 2553 / 3493.
 The
 .Dv IPV6_PORTRANGE
 socket option and the conflict resolution rule are not defined in the