"local-address" can be specified for both address families now, so

no more need for separate v4/v6 groups.  ok claudio@

src/etc/examples/bgpd.conf

@@ -1,4 +1,4 @@
-# $OpenBSD: bgpd.conf,v 1.18 2020/02/16 20:02:21 kn Exp $
+# $OpenBSD: bgpd.conf,v 1.19 2020/04/23 17:12:59 sthen Exp $
 # example bgpd configuration file, see bgpd.conf(5)
 
 # define our own ASN as a macro
@@ -51,18 +51,15 @@ prefix-set bogons {
 network prefix-set mynetworks set large-community $ASN:1:1
 
 # assume simple network with 3 routers in IBGP full mesh
-group "ibgp mesh v4" {
+group "ibgp mesh" {
 	remote-as $ASN
-	# use loopback for IBGP sessions, assume its distributed in OSPF
+	# use loopback for IBGP sessions, assume it's distributed in OSPF
 	local-address 192.0.2.1
-	neighbor 192.0.2.2		# router 2 ipv4
-	neighbor 192.0.2.3		# router 3 ipv4
-}
-# define the IPv6 IBGP sessions
-group "ibgp mesh v6" {
-	remote-as $ASN
 	local-address 2001:db8:abcd::1
+
+	neighbor 192.0.2.2		# router 2 ipv4
 	neighbor 2001:db8:abcd::2	# router 2 ipv6
+	neighbor 192.0.2.3		# router 3 ipv4
 	neighbor 2001:db8:abcd::3	# router 3 ipv6
 }