4 files changed, 59 insertions, 52 deletions
diff --git a/docs/configexamples/azure-vpn-bgp.rst b/docs/configexamples/azure-vpn-bgp.rst
index 1d61b3b8..c40e1b76 100644
--- a/docs/configexamples/azure-vpn-bgp.rst
+++ b/docs/configexamples/azure-vpn-bgp.rst
@@ -120,13 +120,14 @@ Vyos configuration
 
 .. code-block:: none
 
-  set protocols bgp 64499 neighbor 10.0.0.4 remote-as '65540'
-  set protocols bgp 64499 neighbor 10.0.0.4 address-family ipv4-unicast soft-reconfiguration 'inbound'
-  set protocols bgp 64499 neighbor 10.0.0.4 timers holdtime '30'
-  set protocols bgp 64499 neighbor 10.0.0.4 timers keepalive '10'
+  set protocols bgp local-as 64499
+  set protocols bgp neighbor 10.0.0.4 remote-as '65540'
+  set protocols bgp neighbor 10.0.0.4 address-family ipv4-unicast soft-reconfiguration 'inbound'
+  set protocols bgp neighbor 10.0.0.4 timers holdtime '30'
+  set protocols bgp neighbor 10.0.0.4 timers keepalive '10'
 
 - **Important**: Disable connected check \
 
 .. code-block:: none
 
-  set protocols bgp 64499 neighbor 10.0.0.4 disable-connected-check
+  set protocols bgp neighbor 10.0.0.4 disable-connected-check
diff --git a/docs/configexamples/azure-vpn-dual-bgp.rst b/docs/configexamples/azure-vpn-dual-bgp.rst
index 0a48156c..6df5d2ff 100644
--- a/docs/configexamples/azure-vpn-dual-bgp.rst
+++ b/docs/configexamples/azure-vpn-dual-bgp.rst
@@ -136,20 +136,21 @@ Vyos configuration
 
 .. code-block:: none
 
-  set protocols bgp 64499 neighbor 10.0.0.4 remote-as '65540'
-  set protocols bgp 64499 neighbor 10.0.0.4 address-family ipv4-unicast soft-reconfiguration 'inbound'
-  set protocols bgp 64499 neighbor 10.0.0.4 timers holdtime '30'
-  set protocols bgp 64499 neighbor 10.0.0.4 timers keepalive '10'
+  set protocols bgp local-as 64499
+  set protocols bgp neighbor 10.0.0.4 remote-as '65540'
+  set protocols bgp neighbor 10.0.0.4 address-family ipv4-unicast soft-reconfiguration 'inbound'
+  set protocols bgp neighbor 10.0.0.4 timers holdtime '30'
+  set protocols bgp neighbor 10.0.0.4 timers keepalive '10'
 
-  set protocols bgp 64499 neighbor 10.0.0.5 remote-as '65540'
-  set protocols bgp 64499 neighbor 10.0.0.5 address-family ipv4-unicast soft-reconfiguration 'inbound'
-  set protocols bgp 64499 neighbor 10.0.0.5 timers holdtime '30'
-  set protocols bgp 64499 neighbor 10.0.0.5 timers keepalive '10'
+  set protocols bgp neighbor 10.0.0.5 remote-as '65540'
+  set protocols bgp neighbor 10.0.0.5 address-family ipv4-unicast soft-reconfiguration 'inbound'
+  set protocols bgp neighbor 10.0.0.5 timers holdtime '30'
+  set protocols bgp neighbor 10.0.0.5 timers keepalive '10'
 
 - **Important**: Disable connected check, otherwise the routes learned
   from Azure will not be imported into the routing table.
 
 .. code-block:: none
 
-  set protocols bgp 64499 neighbor 10.0.0.4 disable-connected-check
-  set protocols bgp 64499 neighbor 10.0.0.5 disable-connected-check
+  set protocols bgp neighbor 10.0.0.4 disable-connected-check
+  set protocols bgp neighbor 10.0.0.5 disable-connected-check
diff --git a/docs/configexamples/bgp-ipv6-unnumbered.rst b/docs/configexamples/bgp-ipv6-unnumbered.rst
index fe4430ae..12ce2bd6 100644
--- a/docs/configexamples/bgp-ipv6-unnumbered.rst
+++ b/docs/configexamples/bgp-ipv6-unnumbered.rst
@@ -13,39 +13,41 @@ Configuration
 
 .. code-block:: none
 
-  set protocols bgp 64496 address-family ipv4-unicast redistribute connected
-  set protocols bgp 64496 address-family ipv6-unicast redistribute connected
-  set protocols bgp 64496 neighbor eth1 interface v6only
-  set protocols bgp 64496 neighbor eth1 interface v6only peer-group 'fabric'
-  set protocols bgp 64496 neighbor eth2 interface v6only
-  set protocols bgp 64496 neighbor eth2 interface v6only peer-group 'fabric'
-  set protocols bgp 64496 parameters bestpath as-path multipath-relax
-  set protocols bgp 64496 parameters bestpath compare-routerid
-  set protocols bgp 64496 parameters default no-ipv4-unicast
-  set protocols bgp 64496 parameters router-id '192.168.0.1'
-  set protocols bgp 64496 peer-group fabric address-family ipv4-unicast
-  set protocols bgp 64496 peer-group fabric address-family ipv6-unicast
-  set protocols bgp 64496 peer-group fabric capability extended-nexthop
-  set protocols bgp 64496 peer-group fabric remote-as 'external'
+  set protocols bgp local-as 64496
+  set protocols bgp address-family ipv4-unicast redistribute connected
+  set protocols bgp address-family ipv6-unicast redistribute connected
+  set protocols bgp neighbor eth1 interface v6only
+  set protocols bgp neighbor eth1 interface v6only peer-group 'fabric'
+  set protocols bgp neighbor eth2 interface v6only
+  set protocols bgp neighbor eth2 interface v6only peer-group 'fabric'
+  set protocols bgp parameters bestpath as-path multipath-relax
+  set protocols bgp parameters bestpath compare-routerid
+  set protocols bgp parameters default no-ipv4-unicast
+  set protocols bgp parameters router-id '192.168.0.1'
+  set protocols bgp peer-group fabric address-family ipv4-unicast
+  set protocols bgp peer-group fabric address-family ipv6-unicast
+  set protocols bgp peer-group fabric capability extended-nexthop
+  set protocols bgp peer-group fabric remote-as 'external'
 
 - Router B:
 
 .. code-block:: none
 
-  set protocols bgp 64499 address-family ipv4-unicast redistribute connected
-  set protocols bgp 64499 address-family ipv6-unicast redistribute connected
-  set protocols bgp 64499 neighbor eth1 interface v6only
-  set protocols bgp 64499 neighbor eth1 interface v6only peer-group 'fabric'
-  set protocols bgp 64499 neighbor eth2 interface v6only
-  set protocols bgp 64499 neighbor eth2 interface v6only peer-group 'fabric'
-  set protocols bgp 64499 parameters bestpath as-path multipath-relax
-  set protocols bgp 64499 parameters bestpath compare-routerid
-  set protocols bgp 64499 parameters default no-ipv4-unicast
-  set protocols bgp 64499 parameters router-id '192.168.0.2'
-  set protocols bgp 64499 peer-group fabric address-family ipv4-unicast
-  set protocols bgp 64499 peer-group fabric address-family ipv6-unicast
-  set protocols bgp 64499 peer-group fabric capability extended-nexthop
-  set protocols bgp 64499 peer-group fabric remote-as 'external'
+  set protocols bgp local-as 64499
+  set protocols bgp address-family ipv4-unicast redistribute connected
+  set protocols bgp address-family ipv6-unicast redistribute connected
+  set protocols bgp neighbor eth1 interface v6only
+  set protocols bgp neighbor eth1 interface v6only peer-group 'fabric'
+  set protocols bgp neighbor eth2 interface v6only
+  set protocols bgp neighbor eth2 interface v6only peer-group 'fabric'
+  set protocols bgp parameters bestpath as-path multipath-relax
+  set protocols bgp parameters bestpath compare-routerid
+  set protocols bgp parameters default no-ipv4-unicast
+  set protocols bgp parameters router-id '192.168.0.2'
+  set protocols bgp peer-group fabric address-family ipv4-unicast
+  set protocols bgp peer-group fabric address-family ipv6-unicast
+  set protocols bgp peer-group fabric capability extended-nexthop
+  set protocols bgp peer-group fabric remote-as 'external'
 
 Results
 =======
diff --git a/docs/configexamples/ha.rst b/docs/configexamples/ha.rst
index 48d093c9..aa184d09 100644
--- a/docs/configexamples/ha.rst
+++ b/docs/configexamples/ha.rst
@@ -6,7 +6,7 @@ This document walks you through a complete HA setup of two VyOS machines. This
 design is based on a VM as the primary router, and a physical machine as a
 backup, using VRRP, BGP, OSPF and conntrack sharing.
 
-The aim of this document is to walk you through setting everything up, so 
+The aim of this document is to walk you through setting everything up, so
 at a point where you can reboot any machine and not lose more than a few
 seconds worth of connectivity.
 
@@ -555,6 +555,7 @@ it is not 203.0.113.0/24.
    set policy prefix-list BGPOUT rule 100 prefix '203.0.113.0/24'
    set policy prefix-list BGPOUT rule 10000 action 'deny'
    set policy prefix-list BGPOUT rule 10000 prefix '0.0.0.0/0'
+
    set policy route-map BGPOUT description 'BGP Export Filter'
    set policy route-map BGPOUT rule 10 action 'permit'
    set policy route-map BGPOUT rule 10 match ip address prefix-list 'BGPOUT'
@@ -564,14 +565,16 @@ it is not 203.0.113.0/24.
    set policy route-map BGPPREPENDOUT rule 10 set as-path-prepend '65551 65551 65551'
    set policy route-map BGPPREPENDOUT rule 10 match ip address prefix-list 'BGPOUT'
    set policy route-map BGPPREPENDOUT rule 10000 action 'deny'
-   set protocols bgp 65551 address-family ipv4-unicast network 192.0.2.0/24
-   set protocols bgp 65551 address-family ipv4-unicast redistribute connected metric '50'
-   set protocols bgp 65551 address-family ipv4-unicast redistribute ospf metric '50'
-   set protocols bgp 65551 neighbor 192.0.2.11 address-family ipv4-unicast route-map export 'BGPOUT'
-   set protocols bgp 65551 neighbor 192.0.2.11 address-family ipv4-unicast soft-reconfiguration inbound
-   set protocols bgp 65551 neighbor 192.0.2.11 remote-as '65550'
-   set protocols bgp 65551 neighbor 192.0.2.11 update-source '192.0.2.21'
-   set protocols bgp 65551 parameters router-id '192.0.2.21'
+
+   set protocols bgp local-as 65551
+   set protocols bgp address-family ipv4-unicast network 192.0.2.0/24
+   set protocols bgp address-family ipv4-unicast redistribute connected metric '50'
+   set protocols bgp address-family ipv4-unicast redistribute ospf metric '50'
+   set protocols bgp neighbor 192.0.2.11 address-family ipv4-unicast route-map export 'BGPOUT'
+   set protocols bgp neighbor 192.0.2.11 address-family ipv4-unicast soft-reconfiguration inbound
+   set protocols bgp neighbor 192.0.2.11 remote-as '65550'
+   set protocols bgp neighbor 192.0.2.11 update-source '192.0.2.21'
+   set protocols bgp parameters router-id '192.0.2.21'
 
 
 **router2**