The man page is a bit confusing for how we can control which address families we support during the capabilities negotiation. Slightly reorganize the man page to be more clear, and explicitly state what the default is.
OK? Index: bgpd.conf.5 =================================================================== RCS file: /cvs/src/usr.sbin/bgpd/bgpd.conf.5,v retrieving revision 1.144 diff -u -p -u -p -r1.144 bgpd.conf.5 --- bgpd.conf.5 28 Jun 2016 16:59:14 -0000 1.144 +++ bgpd.conf.5 16 Aug 2016 15:40:44 -0000 @@ -617,16 +617,21 @@ The default for IBGP peers is .Pq Ic none Ns | Ns Ic unicast Ns | Ns Ic vpn .Xc For the given address family, control which subsequent address families -(at the moment, only +are announced during the capabilities negotiation. +Only routes for that address family and subsequent address family will be +announced and processed. +.Pp +At the moment, only .Em none , which disables the announcement of that address family, .Em unicast , and .Em vpn , -which allows the distribution of BGP MPLS VPNs, are supported) are announced -during the capabilities negotiation. -Only routes for that address family and subsequent address family will be -announced and processed. +which allows the distribution of BGP MPLS VPNs, are supported. +.Pp +The default is +.Ic unicast +for the same address family of the session. .Pp .It Xo .Ic announce as-4byte -- One advantage of talking to yourself is that you know at least somebody's listening. -- Franklin P. Jones