Merge pull request #454 from dwalton76/hide-router-bgp-peer-ipv4-unicast-commands

bgpd: hide "router bgp" commands also under "address-family ipv4 unic…

6 files changed, 917 insertions, 142 deletions

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index b41ffa6e5..4d983c387 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -1575,6 +1575,12 @@ DEFUN (bgp_maxpaths,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_EBGP, argv[idx_number]->arg, 0, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths,
+              bgp_maxpaths_hidden_cmd,
+              "maximum-paths (1-255)",
+              "Forward packets over multiple paths\n"
+              "Number of paths\n")
+
 DEFUN (bgp_maxpaths_ibgp,
        bgp_maxpaths_ibgp_cmd,
        "maximum-paths ibgp (1-255)",
@@ -1586,6 +1592,13 @@ DEFUN (bgp_maxpaths_ibgp,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_IBGP, argv[idx_number]->arg, 0, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths_ibgp,
+              bgp_maxpaths_ibgp_hidden_cmd,
+              "maximum-paths ibgp (1-255)",
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n")
+
 DEFUN (bgp_maxpaths_ibgp_cluster,
        bgp_maxpaths_ibgp_cluster_cmd,
        "maximum-paths ibgp (1-255) equal-cluster-length",
@@ -1599,6 +1612,14 @@ DEFUN (bgp_maxpaths_ibgp_cluster,
 				 BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN, 1);
 }
 
+ALIAS_HIDDEN (bgp_maxpaths_ibgp_cluster,
+              bgp_maxpaths_ibgp_cluster_hidden_cmd,
+              "maximum-paths ibgp (1-255) equal-cluster-length",
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n"
+              "Match the cluster length\n")
+
 DEFUN (no_bgp_maxpaths,
        no_bgp_maxpaths_cmd,
        "no maximum-paths [(1-255)]",
@@ -1609,6 +1630,13 @@ DEFUN (no_bgp_maxpaths,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_EBGP, NULL, 0, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_maxpaths,
+              no_bgp_maxpaths_hidden_cmd,
+              "no maximum-paths [(1-255)]",
+              NO_STR
+              "Forward packets over multiple paths\n"
+              "Number of paths\n")
+
 DEFUN (no_bgp_maxpaths_ibgp,
        no_bgp_maxpaths_ibgp_cmd,
        "no maximum-paths ibgp [(1-255) [equal-cluster-length]]",
@@ -1621,6 +1649,15 @@ DEFUN (no_bgp_maxpaths_ibgp,
   return bgp_maxpaths_config_vty(vty, BGP_PEER_IBGP, NULL, 0, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_maxpaths_ibgp,
+              no_bgp_maxpaths_ibgp_hidden_cmd,
+              "no maximum-paths ibgp [(1-255) [equal-cluster-length]]",
+              NO_STR
+              "Forward packets over multiple paths\n"
+              "iBGP-multipath\n"
+              "Number of paths\n"
+              "Match the cluster length\n")
+
 int
 bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi,
 			   safi_t safi, int *write)
@@ -3308,6 +3345,13 @@ DEFUN (neighbor_activate,
   return CMD_SUCCESS;
 }
 
+ALIAS_HIDDEN (neighbor_activate,
+              neighbor_activate_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> activate",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Enable the Address Family for this Neighbor\n")
+
 DEFUN (no_neighbor_activate,
        no_neighbor_activate_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> activate",
@@ -3332,6 +3376,14 @@ DEFUN (no_neighbor_activate,
   return CMD_SUCCESS;
 }
 
+ALIAS_HIDDEN (no_neighbor_activate,
+              no_neighbor_activate_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> activate",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Enable the Address Family for this Neighbor\n")
+
 DEFUN (neighbor_set_peer_group,
        neighbor_set_peer_group_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
@@ -3398,6 +3450,14 @@ DEFUN (neighbor_set_peer_group,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (neighbor_set_peer_group,
+              neighbor_set_peer_group_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Member of the peer-group\n"
+              "Peer-group name\n")
+
 DEFUN (no_neighbor_set_peer_group,
        no_neighbor_set_peer_group_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
@@ -3430,6 +3490,15 @@ DEFUN (no_neighbor_set_peer_group,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (no_neighbor_set_peer_group,
+              no_neighbor_set_peer_group_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> peer-group WORD",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Member of the peer-group\n"
+              "Peer-group name\n")
+
 static int
 peer_flag_modify_vty (struct vty *vty, const char *ip_str,
                       u_int16_t flag, int set)
@@ -3694,6 +3763,18 @@ DEFUN (neighbor_capability_orf_prefix,
 			       bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (neighbor_capability_orf_prefix,
+              neighbor_capability_orf_prefix_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Advertise capability to the peer\n"
+              "Advertise ORF capability to the peer\n"
+              "Advertise prefixlist ORF capability to this neighbor\n"
+              "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+              "Capability to RECEIVE the ORF from this neighbor\n"
+              "Capability to SEND the ORF to this neighbor\n")
+
 DEFUN (no_neighbor_capability_orf_prefix,
        no_neighbor_capability_orf_prefix_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
@@ -3724,6 +3805,19 @@ DEFUN (no_neighbor_capability_orf_prefix,
 				 bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (no_neighbor_capability_orf_prefix,
+              no_neighbor_capability_orf_prefix_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> capability orf prefix-list <both|send|receive>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Advertise capability to the peer\n"
+              "Advertise ORF capability to the peer\n"
+              "Advertise prefixlist ORF capability to this neighbor\n"
+              "Capability to SEND and RECEIVE the ORF to/from this neighbor\n"
+              "Capability to RECEIVE the ORF from this neighbor\n"
+              "Capability to SEND the ORF to this neighbor\n")
+
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self,
        neighbor_nexthop_self_cmd,
@@ -3737,6 +3831,13 @@ DEFUN (neighbor_nexthop_self,
 			       bgp_node_safi (vty), PEER_FLAG_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (neighbor_nexthop_self,
+              neighbor_nexthop_self_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n")
+
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self_force,
        neighbor_nexthop_self_force_cmd,
@@ -3752,6 +3853,14 @@ DEFUN (neighbor_nexthop_self_force,
 			       PEER_FLAG_FORCE_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (neighbor_nexthop_self_force,
+              neighbor_nexthop_self_force_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n"
+              "Set the next hop to self for reflected routes\n")
+
 DEFUN (no_neighbor_nexthop_self,
        no_neighbor_nexthop_self_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
@@ -3766,6 +3875,14 @@ DEFUN (no_neighbor_nexthop_self,
 				 PEER_FLAG_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (no_neighbor_nexthop_self,
+              no_neighbor_nexthop_self_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n")
+
 DEFUN (no_neighbor_nexthop_self_force,
        no_neighbor_nexthop_self_force_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
@@ -3781,6 +3898,15 @@ DEFUN (no_neighbor_nexthop_self_force,
 				 PEER_FLAG_FORCE_NEXTHOP_SELF);
 }
 
+ALIAS_HIDDEN (no_neighbor_nexthop_self_force,
+              no_neighbor_nexthop_self_force_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> next-hop-self force",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Disable the next hop calculation for this neighbor\n"
+              "Set the next hop to self for reflected routes\n")
+
 /* neighbor as-override */
 DEFUN (neighbor_as_override,
        neighbor_as_override_cmd,
@@ -3795,6 +3921,13 @@ DEFUN (neighbor_as_override,
                                PEER_FLAG_AS_OVERRIDE);
 }
 
+ALIAS_HIDDEN (neighbor_as_override,
+              neighbor_as_override_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Override ASNs in outbound updates if aspath equals remote-as\n")
+
 DEFUN (no_neighbor_as_override,
        no_neighbor_as_override_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
@@ -3809,6 +3942,14 @@ DEFUN (no_neighbor_as_override,
                                  PEER_FLAG_AS_OVERRIDE);
 }
 
+ALIAS_HIDDEN (no_neighbor_as_override,
+              no_neighbor_as_override_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> as-override",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Override ASNs in outbound updates if aspath equals remote-as\n")
+
 /* neighbor remove-private-AS. */
 DEFUN (neighbor_remove_private_as,
        neighbor_remove_private_as_cmd,
@@ -3823,6 +3964,13 @@ DEFUN (neighbor_remove_private_as,
 			       PEER_FLAG_REMOVE_PRIVATE_AS);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as,
+              neighbor_remove_private_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n")
+
 DEFUN (neighbor_remove_private_as_all,
        neighbor_remove_private_as_all_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
@@ -3837,6 +3985,14 @@ DEFUN (neighbor_remove_private_as_all,
                                PEER_FLAG_REMOVE_PRIVATE_AS_ALL);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_all,
+              neighbor_remove_private_as_all_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers")
+
 DEFUN (neighbor_remove_private_as_replace_as,
        neighbor_remove_private_as_replace_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
@@ -3851,6 +4007,14 @@ DEFUN (neighbor_remove_private_as_replace_as,
                                PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_replace_as,
+              neighbor_remove_private_as_replace_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (neighbor_remove_private_as_all_replace_as,
        neighbor_remove_private_as_all_replace_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
@@ -3866,6 +4030,15 @@ DEFUN (neighbor_remove_private_as_all_replace_as,
                                PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE);
 }
 
+ALIAS_HIDDEN (neighbor_remove_private_as_all_replace_as,
+              neighbor_remove_private_as_all_replace_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as,
        no_neighbor_remove_private_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
@@ -3880,6 +4053,14 @@ DEFUN (no_neighbor_remove_private_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as,
+              no_neighbor_remove_private_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as_all,
        no_neighbor_remove_private_as_all_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
@@ -3895,6 +4076,15 @@ DEFUN (no_neighbor_remove_private_as_all,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_ALL);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_all,
+              no_neighbor_remove_private_as_all_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n")
+
 DEFUN (no_neighbor_remove_private_as_replace_as,
        no_neighbor_remove_private_as_replace_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
@@ -3910,6 +4100,15 @@ DEFUN (no_neighbor_remove_private_as_replace_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_REPLACE);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_replace_as,
+              no_neighbor_remove_private_as_replace_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS replace-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 DEFUN (no_neighbor_remove_private_as_all_replace_as,
        no_neighbor_remove_private_as_all_replace_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
@@ -3926,6 +4125,16 @@ DEFUN (no_neighbor_remove_private_as_all_replace_as,
 				 PEER_FLAG_REMOVE_PRIVATE_AS_ALL_REPLACE);
 }
 
+ALIAS_HIDDEN (no_neighbor_remove_private_as_all_replace_as,
+              no_neighbor_remove_private_as_all_replace_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> remove-private-AS all replace-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Remove private ASNs in outbound updates\n"
+              "Apply to all AS numbers\n"
+              "Replace private ASNs with our ASN in outbound updates\n")
+
 
 /* neighbor send-community. */
 DEFUN (neighbor_send_community,
@@ -3941,6 +4150,13 @@ DEFUN (neighbor_send_community,
 			       PEER_FLAG_SEND_COMMUNITY);
 }
 
+ALIAS_HIDDEN (neighbor_send_community,
+              neighbor_send_community_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n")
+
 DEFUN (no_neighbor_send_community,
        no_neighbor_send_community_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
@@ -3955,6 +4171,14 @@ DEFUN (no_neighbor_send_community,
 				 PEER_FLAG_SEND_COMMUNITY);
 }
 
+ALIAS_HIDDEN (no_neighbor_send_community,
+              no_neighbor_send_community_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n")
+
 /* neighbor send-community extended. */
 DEFUN (neighbor_send_community_type,
        neighbor_send_community_type_cmd,
@@ -3994,6 +4218,18 @@ DEFUN (neighbor_send_community_type,
   return peer_af_flag_set_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flag);
 }
 
+ALIAS_HIDDEN (neighbor_send_community_type,
+              neighbor_send_community_type_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n"
+              "Send Standard and Extended Community attributes\n"
+              "Send Standard, Large and Extended Community attributes\n"
+              "Send Extended Community attributes\n"
+              "Send Standard Community attributes\n"
+              "Send Large Community attributes\n")
+
 DEFUN (no_neighbor_send_community_type,
        no_neighbor_send_community_type_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
@@ -4034,6 +4270,19 @@ DEFUN (no_neighbor_send_community_type,
 				  PEER_FLAG_SEND_LARGE_COMMUNITY));
 }
 
+ALIAS_HIDDEN (no_neighbor_send_community_type,
+              no_neighbor_send_community_type_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> send-community <both|all|extended|standard|large>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Send Community attribute to this neighbor\n"
+              "Send Standard and Extended Community attributes\n"
+              "Send Standard, Large and Extended Community attributes\n"
+              "Send Extended Community attributes\n"
+              "Send Standard Community attributes\n"
+              "Send Large Community attributes\n")
+
 /* neighbor soft-reconfig. */
 DEFUN (neighbor_soft_reconfiguration,
        neighbor_soft_reconfiguration_cmd,
@@ -4049,6 +4298,14 @@ DEFUN (neighbor_soft_reconfiguration,
 			       PEER_FLAG_SOFT_RECONFIG);
 }
 
+ALIAS_HIDDEN (neighbor_soft_reconfiguration,
+              neighbor_soft_reconfiguration_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Per neighbor soft reconfiguration\n"
+              "Allow inbound soft reconfiguration for this neighbor\n")
+
 DEFUN (no_neighbor_soft_reconfiguration,
        no_neighbor_soft_reconfiguration_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
@@ -4064,6 +4321,15 @@ DEFUN (no_neighbor_soft_reconfiguration,
 				 PEER_FLAG_SOFT_RECONFIG);
 }
 
+ALIAS_HIDDEN (no_neighbor_soft_reconfiguration,
+              no_neighbor_soft_reconfiguration_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> soft-reconfiguration inbound",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Per neighbor soft reconfiguration\n"
+              "Allow inbound soft reconfiguration for this neighbor\n")
+
 DEFUN (neighbor_route_reflector_client,
        neighbor_route_reflector_client_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
@@ -4084,6 +4350,13 @@ DEFUN (neighbor_route_reflector_client,
 			       PEER_FLAG_REFLECTOR_CLIENT);
 }
 
+ALIAS_HIDDEN (neighbor_route_reflector_client,
+              neighbor_route_reflector_client_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Reflector client\n")
+
 DEFUN (no_neighbor_route_reflector_client,
        no_neighbor_route_reflector_client_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
@@ -4098,6 +4371,14 @@ DEFUN (no_neighbor_route_reflector_client,
 				 PEER_FLAG_REFLECTOR_CLIENT);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_reflector_client,
+              no_neighbor_route_reflector_client_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-reflector-client",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Reflector client\n")
+
 /* neighbor route-server-client. */
 DEFUN (neighbor_route_server_client,
        neighbor_route_server_client_cmd,
@@ -4117,6 +4398,13 @@ DEFUN (neighbor_route_server_client,
                                PEER_FLAG_RSERVER_CLIENT);
 }
 
+ALIAS_HIDDEN (neighbor_route_server_client,
+              neighbor_route_server_client_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Server client\n")
+
 DEFUN (no_neighbor_route_server_client,
        no_neighbor_route_server_client_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
@@ -4131,6 +4419,14 @@ DEFUN (no_neighbor_route_server_client,
                                  PEER_FLAG_RSERVER_CLIENT);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_server_client,
+              no_neighbor_route_server_client_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-server-client",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Configure a neighbor as Route Server client\n")
+
 DEFUN (neighbor_nexthop_local_unchanged,
        neighbor_nexthop_local_unchanged_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> nexthop-local unchanged",
@@ -4210,6 +4506,33 @@ DEFUN (neighbor_attr_unchanged,
   return peer_af_flag_set_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flags);
 }
 
+ALIAS_HIDDEN (neighbor_attr_unchanged,
+              neighbor_attr_unchanged_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
+              [<\
+                 as-path [<next-hop [med]|med [next-hop]>]|\
+                 next-hop [<as-path [med]|med [as-path]>]|\
+                 med [<as-path [next-hop]|next-hop [as-path]>]\
+              >]",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "BGP attribute is propagated unchanged to this neighbor\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n")
+
 DEFUN (no_neighbor_attr_unchanged,
        no_neighbor_attr_unchanged_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
@@ -4261,6 +4584,34 @@ DEFUN (no_neighbor_attr_unchanged,
   return peer_af_flag_unset_vty (vty, peer, bgp_node_afi (vty), bgp_node_safi (vty), flags);
 }
 
+ALIAS_HIDDEN (no_neighbor_attr_unchanged,
+              no_neighbor_attr_unchanged_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> attribute-unchanged\
+              [<\
+                 as-path [<next-hop [med]|med [next-hop]>]|\
+                 next-hop [<as-path [med]|med [as-path]>]|\
+                 med [<as-path [next-hop]|next-hop [as-path]>]\
+              >]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "BGP attribute is propagated unchanged to this neighbor\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Med attribute\n"
+              "As-path attribute\n"
+              "Nexthop attribute\n"
+              "Nexthop attribute\n"
+              "As-path attribute\n")
+
 
 /* EBGP multihop configuration. */
 static int
@@ -4514,6 +4865,13 @@ DEFUN (neighbor_default_originate,
 					 bgp_node_safi (vty), NULL, 1);
 }
 
+ALIAS_HIDDEN (neighbor_default_originate,
+              neighbor_default_originate_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n")
+
 DEFUN (neighbor_default_originate_rmap,
        neighbor_default_originate_rmap_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
@@ -4529,6 +4887,15 @@ DEFUN (neighbor_default_originate_rmap,
 					 bgp_node_safi (vty), argv[idx_word]->arg, 1);
 }
 
+ALIAS_HIDDEN (neighbor_default_originate_rmap,
+              neighbor_default_originate_rmap_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> default-originate route-map WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n"
+              "Route-map to specify criteria to originate default\n"
+              "route-map name\n")
+
 DEFUN (no_neighbor_default_originate,
        no_neighbor_default_originate_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
@@ -4544,6 +4911,16 @@ DEFUN (no_neighbor_default_originate,
 					 bgp_node_safi (vty), NULL, 0);
 }
 
+ALIAS_HIDDEN (no_neighbor_default_originate,
+              no_neighbor_default_originate_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> default-originate [route-map WORD]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Originate default route to this neighbor\n"
+              "Route-map to specify criteria to originate default\n"
+              "route-map name\n")
+
 
 /* Set neighbor's BGP port.  */
 static int
@@ -4653,6 +5030,14 @@ DEFUN (neighbor_weight,
                               argv[idx_number]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_weight,
+              neighbor_weight_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> weight (0-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Set default weight for routes from this neighbor\n"
+              "default weight\n")
+
 DEFUN (no_neighbor_weight,
        no_neighbor_weight_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> weight [(0-65535)]",
@@ -4666,6 +5051,15 @@ DEFUN (no_neighbor_weight,
   return peer_weight_unset_vty (vty, argv[idx_peer]->arg, bgp_node_afi (vty), bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_weight,
+              no_neighbor_weight_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> weight [(0-65535)]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Set default weight for routes from this neighbor\n"
+              "default weight\n")
+
 
 /* Override capability negotiation. */
 DEFUN (neighbor_override_capability,
@@ -5051,6 +5445,18 @@ DEFUN (neighbor_distribute_list,
 				  bgp_node_safi (vty), argv[idx_acl]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_distribute_list,
+              neighbor_distribute_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "IP access-list number\n"
+              "IP access-list number (expanded range)\n"
+              "IP Access-list name\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 DEFUN (no_neighbor_distribute_list,
        no_neighbor_distribute_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
@@ -5070,6 +5476,19 @@ DEFUN (no_neighbor_distribute_list,
 				    bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_distribute_list,
+              no_neighbor_distribute_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> distribute-list <(1-199)|(1300-2699)|WORD> <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "IP access-list number\n"
+              "IP access-list number (expanded range)\n"
+              "IP Access-list name\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 /* Set prefix list to the peer. */
 static int
 peer_prefix_list_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -5135,6 +5554,16 @@ DEFUN (neighbor_prefix_list,
 				   bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_prefix_list,
+              neighbor_prefix_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "Name of a prefix list\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 DEFUN (no_neighbor_prefix_list,
        no_neighbor_prefix_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
@@ -5152,6 +5581,17 @@ DEFUN (no_neighbor_prefix_list,
 				     bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_prefix_list,
+              no_neighbor_prefix_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> prefix-list WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Filter updates to/from this neighbor\n"
+              "Name of a prefix list\n"
+              "Filter incoming updates\n"
+              "Filter outgoing updates\n")
+
 static int
 peer_aslist_set_vty (struct vty *vty, const char *ip_str,
                      afi_t afi, safi_t safi,
@@ -5217,6 +5657,16 @@ DEFUN (neighbor_filter_list,
 			      bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_filter_list,
+              neighbor_filter_list_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Establish BGP filters\n"
+              "AS path access-list name\n"
+              "Filter incoming routes\n"
+              "Filter outgoing routes\n")
+
 DEFUN (no_neighbor_filter_list,
        no_neighbor_filter_list_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
@@ -5234,6 +5684,17 @@ DEFUN (no_neighbor_filter_list,
 				bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_filter_list,
+              no_neighbor_filter_list_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> filter-list WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Establish BGP filters\n"
+              "AS path access-list name\n"
+              "Filter incoming routes\n"
+              "Filter outgoing routes\n")
+
 /* Set route-map to the peer. */
 static int
 peer_route_map_set_vty (struct vty *vty, const char *ip_str,
@@ -5299,6 +5760,16 @@ DEFUN (neighbor_route_map,
 				 bgp_node_safi (vty), argv[idx_word]->arg, argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_route_map,
+              neighbor_route_map_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Apply route map to neighbor\n"
+              "Name of route map\n"
+              "Apply map to incoming routes\n"
+              "Apply map to outbound routes\n")
+
 DEFUN (no_neighbor_route_map,
        no_neighbor_route_map_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
@@ -5316,6 +5787,17 @@ DEFUN (no_neighbor_route_map,
 				   bgp_node_safi (vty), argv[idx_in_out]->arg);
 }
 
+ALIAS_HIDDEN (no_neighbor_route_map,
+              no_neighbor_route_map_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> route-map WORD <in|out>",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Apply route map to neighbor\n"
+              "Name of route map\n"
+              "Apply map to incoming routes\n"
+              "Apply map to outbound routes\n")
+
 /* Set unsuppress-map to the peer. */
 static int
 peer_unsuppress_map_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -5364,6 +5846,14 @@ DEFUN (neighbor_unsuppress_map,
 				      bgp_node_safi (vty), argv[idx_word]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_unsuppress_map,
+              neighbor_unsuppress_map_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Route-map to selectively unsuppress suppressed routes\n"
+              "Name of route map\n")
+
 DEFUN (no_neighbor_unsuppress_map,
        no_neighbor_unsuppress_map_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
@@ -5378,6 +5868,15 @@ DEFUN (no_neighbor_unsuppress_map,
 					bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_unsuppress_map,
+              no_neighbor_unsuppress_map_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> unsuppress-map WORD",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Route-map to selectively unsuppress suppressed routes\n"
+              "Name of route map\n")
+
 static int
 peer_maximum_prefix_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
 			     safi_t safi, const char *num_str,
@@ -5444,6 +5943,14 @@ DEFUN (neighbor_maximum_prefix,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix,
+              neighbor_maximum_prefix_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n")
+
 DEFUN (neighbor_maximum_prefix_threshold,
        neighbor_maximum_prefix_threshold_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100)",
@@ -5461,6 +5968,15 @@ DEFUN (neighbor_maximum_prefix_threshold,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold,
+              neighbor_maximum_prefix_threshold_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n")
+
 DEFUN (neighbor_maximum_prefix_warning,
        neighbor_maximum_prefix_warning_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) warning-only",
@@ -5477,6 +5993,15 @@ DEFUN (neighbor_maximum_prefix_warning,
 				      NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_warning,
+              neighbor_maximum_prefix_warning_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) warning-only",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Only give warning message when limit is exceeded\n")
+
 DEFUN (neighbor_maximum_prefix_threshold_warning,
        neighbor_maximum_prefix_threshold_warning_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) warning-only",
@@ -5494,6 +6019,16 @@ DEFUN (neighbor_maximum_prefix_threshold_warning,
 				      bgp_node_safi (vty), argv[idx_number]->arg, argv[idx_number_2]->arg, 1, NULL);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold_warning,
+              neighbor_maximum_prefix_threshold_warning_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) warning-only",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Only give warning message when limit is exceeded\n")
+
 DEFUN (neighbor_maximum_prefix_restart,
        neighbor_maximum_prefix_restart_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) restart (1-65535)",
@@ -5511,6 +6046,16 @@ DEFUN (neighbor_maximum_prefix_restart,
 				      bgp_node_safi (vty), argv[idx_number]->arg, NULL, 0, argv[idx_number_2]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_restart,
+              neighbor_maximum_prefix_restart_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) restart (1-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefix accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes")
+
 DEFUN (neighbor_maximum_prefix_threshold_restart,
        neighbor_maximum_prefix_threshold_restart_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) restart (1-65535)",
@@ -5530,6 +6075,17 @@ DEFUN (neighbor_maximum_prefix_threshold_restart,
 				      bgp_node_safi (vty), argv[idx_number]->arg, argv[idx_number_2]->arg, 0, argv[idx_number_3]->arg);
 }
 
+ALIAS_HIDDEN (neighbor_maximum_prefix_threshold_restart,
+              neighbor_maximum_prefix_threshold_restart_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix (1-4294967295) (1-100) restart (1-65535)",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefixes to accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes\n")
+
 DEFUN (no_neighbor_maximum_prefix,
        no_neighbor_maximum_prefix_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix [(1-4294967295) [(1-100)] [restart (1-65535)] [warning-only]]",
@@ -5548,6 +6104,19 @@ DEFUN (no_neighbor_maximum_prefix,
 					bgp_node_safi (vty));
 }
 
+ALIAS_HIDDEN (no_neighbor_maximum_prefix,
+              no_neighbor_maximum_prefix_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> maximum-prefix [(1-4294967295) [(1-100)] [restart (1-65535)] [warning-only]]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Maximum number of prefixes to accept from this peer\n"
+              "maximum no. of prefix limit\n"
+              "Threshold value (%) at which to generate a warning msg\n"
+              "Restart bgp connection after limit is exceeded\n"
+              "Restart interval in minutes\n"
+              "Only give warning message when limit is exceeded\n")
+
 
 /* "neighbor allowas-in" */
 DEFUN (neighbor_allowas_in,
@@ -5586,6 +6155,15 @@ DEFUN (neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (neighbor_allowas_in,
+              neighbor_allowas_in_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Accept as-path with my AS present in it\n"
+              "Number of occurances of AS number\n"
+              "Only accept my AS in the as-path if the route was originated in my AS\n")
+
 DEFUN (no_neighbor_allowas_in,
        no_neighbor_allowas_in_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
@@ -5609,6 +6187,16 @@ DEFUN (no_neighbor_allowas_in,
   return bgp_vty_return (vty, ret);
 }
 
+ALIAS_HIDDEN (no_neighbor_allowas_in,
+              no_neighbor_allowas_in_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> allowas-in [<(1-10)|origin>]",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "allow local ASN appears in aspath attribute\n"
+              "Number of occurances of AS number\n"
+              "Only accept my AS in the as-path if the route was originated in my AS\n")
+
 DEFUN (neighbor_ttl_security,
        neighbor_ttl_security_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
@@ -5681,6 +6269,13 @@ DEFUN (neighbor_addpath_tx_all_paths,
 			       PEER_FLAG_ADDPATH_TX_ALL_PATHS);
 }
 
+ALIAS_HIDDEN (neighbor_addpath_tx_all_paths,
+              neighbor_addpath_tx_all_paths_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise all paths to a neighbor\n")
+
 DEFUN (no_neighbor_addpath_tx_all_paths,
        no_neighbor_addpath_tx_all_paths_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
@@ -5695,6 +6290,14 @@ DEFUN (no_neighbor_addpath_tx_all_paths,
 				 PEER_FLAG_ADDPATH_TX_ALL_PATHS);
 }
 
+ALIAS_HIDDEN (no_neighbor_addpath_tx_all_paths,
+              no_neighbor_addpath_tx_all_paths_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-all-paths",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise all paths to a neighbor\n")
+
 DEFUN (neighbor_addpath_tx_bestpath_per_as,
        neighbor_addpath_tx_bestpath_per_as_cmd,
        "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
@@ -5714,6 +6317,13 @@ DEFUN (neighbor_addpath_tx_bestpath_per_as,
 			       PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
 }
 
+ALIAS_HIDDEN (neighbor_addpath_tx_bestpath_per_as,
+              neighbor_addpath_tx_bestpath_per_as_hidden_cmd,
+              "neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise the bestpath per each neighboring AS\n")
+
 DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
        no_neighbor_addpath_tx_bestpath_per_as_cmd,
        "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
@@ -5728,6 +6338,14 @@ DEFUN (no_neighbor_addpath_tx_bestpath_per_as,
 				 PEER_FLAG_ADDPATH_TX_BESTPATH_PER_AS);
 }
 
+ALIAS_HIDDEN (no_neighbor_addpath_tx_bestpath_per_as,
+              no_neighbor_addpath_tx_bestpath_per_as_hidden_cmd,
+              "no neighbor <A.B.C.D|X:X::X:X|WORD> addpath-tx-bestpath-per-AS",
+              NO_STR
+              NEIGHBOR_STR
+              NEIGHBOR_ADDR_STR2
+              "Use addpath to advertise the bestpath per each neighboring AS\n")
+
 DEFUN_NOSH (address_family_ipv4_safi,
        address_family_ipv4_safi_cmd,
        "address-family ipv4 [<unicast|multicast|vpn|encap|labeled-unicast>]",
@@ -9563,6 +10181,12 @@ DEFUN (bgp_redistribute_ipv4,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4,
+              bgp_redistribute_ipv4_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD,
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD)
+
 DEFUN (bgp_redistribute_ipv4_rmap,
        bgp_redistribute_ipv4_rmap_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
@@ -9589,6 +10213,14 @@ DEFUN (bgp_redistribute_ipv4_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_rmap,
+              bgp_redistribute_ipv4_rmap_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_metric,
        bgp_redistribute_ipv4_metric_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)",
@@ -9617,6 +10249,14 @@ DEFUN (bgp_redistribute_ipv4_metric,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_metric,
+              bgp_redistribute_ipv4_metric_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_rmap_metric,
        bgp_redistribute_ipv4_rmap_metric_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
@@ -9649,6 +10289,16 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_rmap_metric,
+              bgp_redistribute_ipv4_rmap_metric_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " route-map WORD metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Route map reference\n"
+              "Pointer to route-map entries\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_metric_rmap,
        bgp_redistribute_ipv4_metric_rmap_cmd,
        "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
@@ -9681,6 +10331,16 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_metric_rmap,
+              bgp_redistribute_ipv4_metric_rmap_hidden_cmd,
+              "redistribute " FRR_IP_REDIST_STR_BGPD " metric (0-4294967295) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf,
        bgp_redistribute_ipv4_ospf_cmd,
        "redistribute <ospf|table> (1-65535)",
@@ -9706,6 +10366,14 @@ DEFUN (bgp_redistribute_ipv4_ospf,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf,
+              bgp_redistribute_ipv4_ospf_hidden_cmd,
+              "redistribute <ospf|table> (1-65535)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_rmap,
        bgp_redistribute_ipv4_ospf_rmap_cmd,
        "redistribute <ospf|table> (1-65535) route-map WORD",
@@ -9735,6 +10403,16 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_rmap,
+              bgp_redistribute_ipv4_ospf_rmap_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_metric,
        bgp_redistribute_ipv4_ospf_metric_cmd,
        "redistribute <ospf|table> (1-65535) metric (0-4294967295)",
@@ -9767,6 +10445,16 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_metric,
+              bgp_redistribute_ipv4_ospf_metric_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
        bgp_redistribute_ipv4_ospf_rmap_metric_cmd,
        "redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
@@ -9803,6 +10491,18 @@ DEFUN (bgp_redistribute_ipv4_ospf_rmap_metric,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_rmap_metric,
+              bgp_redistribute_ipv4_ospf_rmap_metric_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) route-map WORD metric (0-4294967295)",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n")
+
 DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
        bgp_redistribute_ipv4_ospf_metric_rmap_cmd,
        "redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
@@ -9839,6 +10539,18 @@ DEFUN (bgp_redistribute_ipv4_ospf_metric_rmap,
   return bgp_redistribute_set (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (bgp_redistribute_ipv4_ospf_metric_rmap,
+              bgp_redistribute_ipv4_ospf_metric_rmap_hidden_cmd,
+              "redistribute <ospf|table> (1-65535) metric (0-4294967295) route-map WORD",
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (no_bgp_redistribute_ipv4_ospf,
        no_bgp_redistribute_ipv4_ospf_cmd,
        "no redistribute <ospf|table> (1-65535) [metric (0-4294967295)] [route-map WORD]",
@@ -9867,6 +10579,19 @@ DEFUN (no_bgp_redistribute_ipv4_ospf,
   return bgp_redistribute_unset (bgp, AFI_IP, protocol, instance);
 }
 
+ALIAS_HIDDEN (no_bgp_redistribute_ipv4_ospf,
+              no_bgp_redistribute_ipv4_ospf_hidden_cmd,
+              "no redistribute <ospf|table> (1-65535) [metric (0-4294967295)] [route-map WORD]",
+              NO_STR
+              "Redistribute information from another routing protocol\n"
+              "Open Shortest Path First (OSPFv2)\n"
+              "Non-main Kernel Routing Table\n"
+              "Instance ID/Table ID\n"
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (no_bgp_redistribute_ipv4,
        no_bgp_redistribute_ipv4_cmd,
        "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]",
@@ -9891,6 +10616,17 @@ DEFUN (no_bgp_redistribute_ipv4,
   return bgp_redistribute_unset (bgp, AFI_IP, type, 0);
 }
 
+ALIAS_HIDDEN (no_bgp_redistribute_ipv4,
+              no_bgp_redistribute_ipv4_hidden_cmd,
+              "no redistribute " FRR_IP_REDIST_STR_BGPD " [metric (0-4294967295)] [route-map WORD]",
+              NO_STR
+              "Redistribute information from another routing protocol\n"
+              FRR_IP_REDIST_HELP_STR_BGPD
+              "Metric for redistributed routes\n"
+              "Default metric\n"
+              "Route map reference\n"
+              "Pointer to route-map entries\n")
+
 DEFUN (bgp_redistribute_ipv6,
        bgp_redistribute_ipv6_cmd,
        "redistribute " FRR_IP6_REDIST_STR_BGPD,
@@ -10278,15 +11014,15 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_bgp_coalesce_time_cmd);
 
   /* "maximum-paths" commands. */
-  install_element (BGP_NODE, &bgp_maxpaths_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_maxpaths_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_cmd);
   install_element (BGP_IPV6_NODE, &bgp_maxpaths_cmd);
   install_element (BGP_IPV6_NODE, &no_bgp_maxpaths_cmd);
-  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cmd);
-  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cluster_cmd);
-  install_element (BGP_NODE, &no_bgp_maxpaths_ibgp_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_ibgp_hidden_cmd);
+  install_element (BGP_NODE, &bgp_maxpaths_ibgp_cluster_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_maxpaths_ibgp_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_ibgp_cmd);
   install_element (BGP_IPV4_NODE, &bgp_maxpaths_ibgp_cluster_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_maxpaths_ibgp_cmd);
@@ -10431,7 +11167,7 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_password_cmd);
 
   /* "neighbor activate" commands. */
-  install_element (BGP_NODE, &neighbor_activate_cmd);
+  install_element (BGP_NODE, &neighbor_activate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_activate_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_activate_cmd);
   install_element (BGP_IPV4L_NODE, &neighbor_activate_cmd);
@@ -10445,7 +11181,7 @@ bgp_vty_init (void)
   install_element (BGP_EVPN_NODE, &neighbor_activate_cmd);
 
   /* "no neighbor activate" commands. */
-  install_element (BGP_NODE, &no_neighbor_activate_cmd);
+  install_element (BGP_NODE, &no_neighbor_activate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_IPV4M_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_IPV4L_NODE, &no_neighbor_activate_cmd);
@@ -10458,40 +11194,35 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_activate_cmd);
   install_element (BGP_EVPN_NODE, &no_neighbor_activate_cmd);
 
-  /* "neighbor peer-group" set commands.
-   * Long term we should only accept this command under BGP_NODE and not all of
-   * the afi/safi sub-contexts. For now though we need to accept it for backwards
-   * compatibility. This changed when we stopped requiring that peers be assigned
-   * to their peer-group under each address-family sub-context.
-   */
+  /* "neighbor peer-group" set commands. */
   install_element (BGP_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4L_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6L_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &neighbor_set_peer_group_cmd);
+  install_element (BGP_IPV4_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4M_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4L_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6M_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6L_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV4_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV6_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAP_NODE, &neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAPV6_NODE, &neighbor_set_peer_group_hidden_cmd);
 
   /* "no neighbor peer-group unset" commands. */
   install_element (BGP_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV4L_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_IPV6L_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAP_NODE, &no_neighbor_set_peer_group_cmd);
-  install_element (BGP_ENCAPV6_NODE, &no_neighbor_set_peer_group_cmd);
+  install_element (BGP_IPV4_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4M_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV4L_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6M_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_IPV6L_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV4_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_VPNV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAP_NODE, &no_neighbor_set_peer_group_hidden_cmd);
+  install_element (BGP_ENCAPV6_NODE, &no_neighbor_set_peer_group_hidden_cmd);
 
   /* "neighbor softreconfiguration inbound" commands.*/
-  install_element (BGP_NODE, &neighbor_soft_reconfiguration_cmd);
-  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_cmd);
+  install_element (BGP_NODE, &neighbor_soft_reconfiguration_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_soft_reconfiguration_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_soft_reconfiguration_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_soft_reconfiguration_cmd);
   install_element (BGP_IPV4L_NODE, &neighbor_soft_reconfiguration_cmd);
@@ -10514,8 +11245,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_soft_reconfiguration_cmd);
 
   /* "neighbor attribute-unchanged" commands.  */
-  install_element (BGP_NODE, &neighbor_attr_unchanged_cmd);
-  install_element (BGP_NODE, &no_neighbor_attr_unchanged_cmd);
+  install_element (BGP_NODE, &neighbor_attr_unchanged_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_attr_unchanged_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_attr_unchanged_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_attr_unchanged_cmd);
@@ -10547,8 +11278,8 @@ bgp_vty_init (void)
   install_element (BGP_IPV6_NODE, &no_neighbor_nexthop_local_unchanged_cmd);
 
   /* "neighbor next-hop-self" commands. */
-  install_element (BGP_NODE, &neighbor_nexthop_self_cmd);
-  install_element (BGP_NODE, &no_neighbor_nexthop_self_cmd);
+  install_element (BGP_NODE, &neighbor_nexthop_self_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_nexthop_self_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_cmd);
@@ -10571,8 +11302,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_nexthop_self_cmd);
 
   /* "neighbor next-hop-self force" commands. */
-  install_element (BGP_NODE, &neighbor_nexthop_self_force_cmd);
-  install_element (BGP_NODE, &no_neighbor_nexthop_self_force_cmd);
+  install_element (BGP_NODE, &neighbor_nexthop_self_force_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_nexthop_self_force_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_nexthop_self_force_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_nexthop_self_force_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_nexthop_self_force_cmd);
@@ -10591,8 +11322,8 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_nexthop_self_force_cmd);
 
   /* "neighbor as-override" commands. */
-  install_element (BGP_NODE, &neighbor_as_override_cmd);
-  install_element (BGP_NODE, &no_neighbor_as_override_cmd);
+  install_element (BGP_NODE, &neighbor_as_override_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_as_override_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_as_override_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_as_override_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_as_override_cmd);
@@ -10611,14 +11342,14 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_as_override_cmd);
 
   /* "neighbor remove-private-AS" commands. */
-  install_element (BGP_NODE, &neighbor_remove_private_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_all_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_replace_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_replace_as_cmd);
-  install_element (BGP_NODE, &neighbor_remove_private_as_all_replace_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_replace_as_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_all_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_remove_private_as_all_replace_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_remove_private_as_all_replace_as_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_remove_private_as_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_remove_private_as_all_cmd);
@@ -10689,10 +11420,10 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_remove_private_as_cmd);
 
   /* "neighbor send-community" commands.*/
-  install_element (BGP_NODE, &neighbor_send_community_cmd);
-  install_element (BGP_NODE, &neighbor_send_community_type_cmd);
-  install_element (BGP_NODE, &no_neighbor_send_community_cmd);
-  install_element (BGP_NODE, &no_neighbor_send_community_type_cmd);
+  install_element (BGP_NODE, &neighbor_send_community_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_send_community_type_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_send_community_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_send_community_type_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_send_community_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_send_community_type_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_send_community_cmd);
@@ -10735,8 +11466,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_send_community_type_cmd);
 
   /* "neighbor route-reflector" commands.*/
-  install_element (BGP_NODE, &neighbor_route_reflector_client_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_reflector_client_cmd);
+  install_element (BGP_NODE, &neighbor_route_reflector_client_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_reflector_client_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_reflector_client_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_reflector_client_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_reflector_client_cmd);
@@ -10759,8 +11490,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_reflector_client_cmd);
 
   /* "neighbor route-server" commands.*/
-  install_element (BGP_NODE, &neighbor_route_server_client_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_server_client_cmd);
+  install_element (BGP_NODE, &neighbor_route_server_client_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_server_client_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_server_client_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_server_client_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_server_client_cmd);
@@ -10783,8 +11514,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_server_client_cmd);
 
   /* "neighbor addpath-tx-all-paths" commands.*/
-  install_element (BGP_NODE, &neighbor_addpath_tx_all_paths_cmd);
-  install_element (BGP_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
+  install_element (BGP_NODE, &neighbor_addpath_tx_all_paths_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_addpath_tx_all_paths_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_addpath_tx_all_paths_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_addpath_tx_all_paths_cmd);
@@ -10803,8 +11534,8 @@ bgp_vty_init (void)
   install_element (BGP_VPNV6_NODE, &no_neighbor_addpath_tx_all_paths_cmd);
 
   /* "neighbor addpath-tx-bestpath-per-AS" commands.*/
-  install_element (BGP_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
-  install_element (BGP_NODE, &no_neighbor_addpath_tx_bestpath_per_as_cmd);
+  install_element (BGP_NODE, &neighbor_addpath_tx_bestpath_per_as_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_addpath_tx_bestpath_per_as_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_addpath_tx_bestpath_per_as_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_addpath_tx_bestpath_per_as_cmd);
@@ -10838,8 +11569,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_capability_enhe_cmd);
 
   /* "neighbor capability orf prefix-list" commands.*/
-  install_element (BGP_NODE, &neighbor_capability_orf_prefix_cmd);
-  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_cmd);
+  install_element (BGP_NODE, &neighbor_capability_orf_prefix_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_capability_orf_prefix_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_capability_orf_prefix_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_capability_orf_prefix_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_capability_orf_prefix_cmd);
@@ -10879,9 +11610,9 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_update_source_cmd);
 
   /* "neighbor default-originate" commands. */
-  install_element (BGP_NODE, &neighbor_default_originate_cmd);
-  install_element (BGP_NODE, &neighbor_default_originate_rmap_cmd);
-  install_element (BGP_NODE, &no_neighbor_default_originate_cmd);
+  install_element (BGP_NODE, &neighbor_default_originate_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_default_originate_rmap_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_default_originate_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_default_originate_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_default_originate_rmap_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_default_originate_cmd);
@@ -10906,8 +11637,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_port_cmd);
 
   /* "neighbor weight" commands. */
-  install_element (BGP_NODE, &neighbor_weight_cmd);
-  install_element (BGP_NODE, &no_neighbor_weight_cmd);
+  install_element (BGP_NODE, &neighbor_weight_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_weight_hidden_cmd);
 
   install_element (BGP_IPV4_NODE, &neighbor_weight_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_weight_cmd);
@@ -10955,8 +11686,8 @@ bgp_vty_init (void)
   install_element (BGP_NODE, &no_neighbor_interface_cmd);
 
   /* "neighbor distribute" commands. */
-  install_element (BGP_NODE, &neighbor_distribute_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_distribute_list_cmd);
+  install_element (BGP_NODE, &neighbor_distribute_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_distribute_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_distribute_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_distribute_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_distribute_list_cmd);
@@ -10979,8 +11710,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_distribute_list_cmd);
 
   /* "neighbor prefix-list" commands. */
-  install_element (BGP_NODE, &neighbor_prefix_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_prefix_list_cmd);
+  install_element (BGP_NODE, &neighbor_prefix_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_prefix_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_prefix_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_prefix_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_prefix_list_cmd);
@@ -11003,8 +11734,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_prefix_list_cmd);
 
   /* "neighbor filter-list" commands. */
-  install_element (BGP_NODE, &neighbor_filter_list_cmd);
-  install_element (BGP_NODE, &no_neighbor_filter_list_cmd);
+  install_element (BGP_NODE, &neighbor_filter_list_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_filter_list_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_filter_list_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_filter_list_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_filter_list_cmd);
@@ -11027,8 +11758,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_filter_list_cmd);
 
   /* "neighbor route-map" commands. */
-  install_element (BGP_NODE, &neighbor_route_map_cmd);
-  install_element (BGP_NODE, &no_neighbor_route_map_cmd);
+  install_element (BGP_NODE, &neighbor_route_map_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_route_map_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_route_map_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_route_map_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_route_map_cmd);
@@ -11051,8 +11782,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_route_map_cmd);
 
   /* "neighbor unsuppress-map" commands. */
-  install_element (BGP_NODE, &neighbor_unsuppress_map_cmd);
-  install_element (BGP_NODE, &no_neighbor_unsuppress_map_cmd);
+  install_element (BGP_NODE, &neighbor_unsuppress_map_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_unsuppress_map_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_unsuppress_map_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_unsuppress_map_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_unsuppress_map_cmd);
@@ -11075,13 +11806,13 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_unsuppress_map_cmd);
 
   /* "neighbor maximum-prefix" commands. */
-  install_element (BGP_NODE, &neighbor_maximum_prefix_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_warning_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_restart_cmd);
-  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_restart_cmd);
-  install_element (BGP_NODE, &no_neighbor_maximum_prefix_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_warning_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_warning_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_restart_hidden_cmd);
+  install_element (BGP_NODE, &neighbor_maximum_prefix_threshold_restart_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_maximum_prefix_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_threshold_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_maximum_prefix_warning_cmd);
@@ -11156,8 +11887,8 @@ bgp_vty_init (void)
   install_element (BGP_ENCAPV6_NODE, &no_neighbor_maximum_prefix_cmd);
 
   /* "neighbor allowas-in" */
-  install_element (BGP_NODE, &neighbor_allowas_in_cmd);
-  install_element (BGP_NODE, &no_neighbor_allowas_in_cmd);
+  install_element (BGP_NODE, &neighbor_allowas_in_hidden_cmd);
+  install_element (BGP_NODE, &no_neighbor_allowas_in_hidden_cmd);
   install_element (BGP_IPV4_NODE, &neighbor_allowas_in_cmd);
   install_element (BGP_IPV4_NODE, &no_neighbor_allowas_in_cmd);
   install_element (BGP_IPV4M_NODE, &neighbor_allowas_in_cmd);
@@ -11248,18 +11979,18 @@ bgp_vty_init (void)
   install_element (VIEW_NODE, &show_ip_bgp_attr_info_cmd);
 
   /* "redistribute" commands.  */
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_cmd);
-  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_cmd);
-  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_rmap_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_metric_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_hidden_cmd);
+  install_element (BGP_NODE, &no_bgp_redistribute_ipv4_ospf_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_rmap_metric_hidden_cmd);
+  install_element (BGP_NODE, &bgp_redistribute_ipv4_ospf_metric_rmap_hidden_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_cmd);
   install_element (BGP_IPV4_NODE, &no_bgp_redistribute_ipv4_cmd);
   install_element (BGP_IPV4_NODE, &bgp_redistribute_ipv4_rmap_cmd);
diff --git a/bgpd/bgpd.conf.sample b/bgpd/bgpd.conf.sample
index b6a8b6f10..60a74a71e 100644
--- a/bgpd/bgpd.conf.sample
+++ b/bgpd/bgpd.conf.sample
@@ -14,9 +14,12 @@ router bgp 7675
 ! bgp router-id 10.0.0.1
 ! network 10.0.0.0/8
 ! neighbor 10.0.0.2 remote-as 7675
-! neighbor 10.0.0.2 route-map set-nexthop out
 ! neighbor 10.0.0.2 ebgp-multihop
-! neighbor 10.0.0.2 next-hop-self
+!
+! address-family ipv4 unicast
+!  neighbor 10.0.0.2 route-map set-nexthop out
+!  neighbor 10.0.0.2 next-hop-self
+! exit-address-family
 !
 ! access-list all permit any
 !
diff --git a/bgpd/bgpd.conf.vnc.sample b/bgpd/bgpd.conf.vnc.sample
index 863abde3a..a8a2dc5fa 100644
--- a/bgpd/bgpd.conf.vnc.sample
+++ b/bgpd/bgpd.conf.vnc.sample
@@ -19,13 +19,15 @@ router bgp 64512
     neighbor 192.1.1.2 description H192.1.1.2
     neighbor 192.1.1.2 update-source 192.1.1.1
     neighbor 192.1.1.2 advertisement-interval 1
-    no neighbor 192.1.1.2 activate
 
     neighbor 192.1.1.3 remote-as 64512
     neighbor 192.1.1.3 description H192.1.1.3
     neighbor 192.1.1.3 update-source 192.1.1.1
     neighbor 192.1.1.3 advertisement-interval 1
-    no neighbor 192.1.1.3 activate
+
+    address-family ipv4 unicast
+        no neighbor 192.1.1.2 activate
+        no neighbor 192.1.1.3 activate
 
     address-family vpnv4
         neighbor 192.1.1.2 activate
diff --git a/doc/bgpd.texi b/doc/bgpd.texi
index 08cd4149a..8e0da1294 100644
--- a/doc/bgpd.texi
+++ b/doc/bgpd.texi
@@ -526,7 +526,9 @@ This command adds the announcement network.
 @example
 @group
 router bgp 1
- network 10.0.0.0/8
+ address-family ipv4 unicast
+  network 10.0.0.0/8
+ exit-address-family
 @end group
 @end example
 This configuration example says that network 10.0.0.0/8 will be
@@ -1160,7 +1162,9 @@ communities attribute to the updates.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list 70 permit 7675:70
 ip community-list 70 deny
@@ -1191,7 +1195,9 @@ value 80.
 router bgp 100
  network 10.0.0.0/8
  neighbor 192.168.0.2 remote-as 7675
- neighbor 192.168.0.2 route-map RMAP out
+ address-family ipv4 unicast
+  neighbor 192.168.0.2 route-map RMAP out
+ exit-address-family
 !
 ip prefix-list PLIST permit 10.0.0.0/8
 !
@@ -1209,7 +1215,9 @@ limit the BGP routes announcement into the internal network.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list 1 permit 0:80 0:90
 !
@@ -1224,7 +1232,9 @@ filtering all of routes, we need to define permit any at last.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list standard FILTER deny 1:1
 ip community-list standard FILTER permit
@@ -1252,7 +1262,9 @@ community-list is used.  @code{deny} community-list is ignored.
 @example
 router bgp 7675
  neighbor 192.168.0.1 remote-as 100
- neighbor 192.168.0.1 route-map RMAP in
+ address-family ipv4 unicast
+  neighbor 192.168.0.1 route-map RMAP in
+ exit-address-family
 !
 ip community-list standard DEL permit 100:1 100:2
 !
@@ -1606,11 +1618,15 @@ to specify @command{neighbor A.B.C.D send-community} command.
 !
 router bgp 1
  neighbor 10.0.0.1 remote-as 1
- no neighbor 10.0.0.1 send-community
+ address-family ipv4 unicast
+  no neighbor 10.0.0.1 send-community
+ exit-address-family
 !
 router bgp 1
  neighbor 10.0.0.1 remote-as 1
- neighbor 10.0.0.1 send-community
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 send-community
+ exit-address-family
 !
 @end example
 
@@ -1680,11 +1696,15 @@ bgp multiple-instance
 !
 router bgp 1 view 1
  neighbor 10.0.0.1 remote-as 2
- neighbor 10.0.0.1 distribute-list 1 in
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 distribute-list 1 in
+ exit-address-family
 !
 router bgp 1 view 2
  neighbor 10.0.0.1 remote-as 2
- neighbor 10.0.0.1 distribute-list 2 in
+ address-family ipv4 unicast
+  neighbor 10.0.0.1 distribute-list 2 in
+ exit-address-family
 @end group
 @end example
 
@@ -1792,13 +1812,16 @@ Example of a session to an upstream, advertising only one prefix to it.
 @example
 router bgp 64512
  bgp router-id 10.236.87.1
- network 10.236.87.0/24
  neighbor upstream peer-group
  neighbor upstream remote-as 64515
  neighbor upstream capability dynamic
- neighbor upstream prefix-list pl-allowed-adv out
  neighbor 10.1.1.1 peer-group upstream
  neighbor 10.1.1.1 description ACME ISP
+
+ address-family ipv4 unicast
+  network 10.236.87.0/24
+  neighbor upstream prefix-list pl-allowed-adv out
+ exit-address-family
 !
 ip prefix-list pl-allowed-adv seq 5 permit 82.195.133.0/25
 ip prefix-list pl-allowed-adv seq 10 deny any
@@ -1816,18 +1839,9 @@ flaws.
 @example
 router bgp 64512
  bgp router-id 10.236.87.1
- network 10.123.456.0/24
- network 10.123.456.128/25 route-map rm-no-export
  neighbor upstream capability dynamic
- neighbor upstream route-map rm-upstream-out out
  neighbor cust capability dynamic
- neighbor cust route-map rm-cust-in in
- neighbor cust route-map rm-cust-out out
- neighbor cust send-community both
  neighbor peer capability dynamic
- neighbor peer route-map rm-peer-in in
- neighbor peer route-map rm-peer-out out
- neighbor peer send-community both
  neighbor 10.1.1.1 remote-as 64515
  neighbor 10.1.1.1 peer-group upstream
  neighbor 10.2.1.1 remote-as 64516
@@ -1835,19 +1849,31 @@ router bgp 64512
  neighbor 10.3.1.1 remote-as 64517
  neighbor 10.3.1.1 peer-group cust-default
  neighbor 10.3.1.1 description customer1
- neighbor 10.3.1.1 prefix-list pl-cust1-network in
  neighbor 10.4.1.1 remote-as 64518
  neighbor 10.4.1.1 peer-group cust
- neighbor 10.4.1.1 prefix-list pl-cust2-network in
  neighbor 10.4.1.1 description customer2
  neighbor 10.5.1.1 remote-as 64519
  neighbor 10.5.1.1 peer-group peer
- neighbor 10.5.1.1 prefix-list pl-peer1-network in
  neighbor 10.5.1.1 description peer AS 1
  neighbor 10.6.1.1 remote-as 64520
  neighbor 10.6.1.1 peer-group peer
- neighbor 10.6.1.1 prefix-list pl-peer2-network in
  neighbor 10.6.1.1 description peer AS 2
+
+ address-family ipv4 unicast
+  network 10.123.456.0/24
+  network 10.123.456.128/25 route-map rm-no-export
+  neighbor upstream route-map rm-upstream-out out
+  neighbor cust route-map rm-cust-in in
+  neighbor cust route-map rm-cust-out out
+  neighbor cust send-community both
+  neighbor peer route-map rm-peer-in in
+  neighbor peer route-map rm-peer-out out
+  neighbor peer send-community both
+  neighbor 10.3.1.1 prefix-list pl-cust1-network in
+  neighbor 10.4.1.1 prefix-list pl-cust2-network in
+  neighbor 10.5.1.1 prefix-list pl-peer1-network in
+  neighbor 10.6.1.1 prefix-list pl-peer2-network in
+ exit-address-family
 !
 ip prefix-list pl-default permit 0.0.0.0/0
 !
diff --git a/doc/nhrpd.texi b/doc/nhrpd.texi
index 1820044ae..069b46495 100644
--- a/doc/nhrpd.texi
+++ b/doc/nhrpd.texi
@@ -64,8 +64,10 @@ command defines the GRE subnet):
 @example
 @group
 router bgp 65555
+ address-family ipv4 unicast
    network 172.16.0.0/16
    redistribute nhrp
+ exit-address-family
 @end group
 @end example
 
diff --git a/doc/vnc.texi b/doc/vnc.texi
index f375d3a7d..b14899421 100644
--- a/doc/vnc.texi
+++ b/doc/vnc.texi
@@ -1115,18 +1115,21 @@ The configuration for @code{VNC-GW 1} is shown below.
 router bgp 64512
  bgp router-id 192.168.1.101
  bgp cluster-id 1.2.3.4
- redistribute vnc-direct
  neighbor 192.168.1.102 remote-as 64512
- no neighbor 192.168.1.102 activate
  neighbor 192.168.1.103 remote-as 64512
- no neighbor 192.168.1.103 activate
  neighbor 192.168.1.104 remote-as 64512
- no neighbor 192.168.1.104 activate
  neighbor 172.16.1.2 remote-as 64512
- neighbor 172.16.1.2 route-reflector-client
  neighbor 172.16.2.2 remote-as 64512
- neighbor 172.16.2.2 route-reflector-client
-!
+ !
+ address-family ipv4 unicast
+  redistribute vnc-direct
+  no neighbor 192.168.1.102 activate
+  no neighbor 192.168.1.103 activate
+  no neighbor 192.168.1.104 activate
+  neighbor 172.16.1.2 route-reflector-client
+  neighbor 172.16.2.2 route-reflector-client
+ exit-address-family
+ !
  address-family vpnv4 unicast
    neighbor 192.168.1.102 activate
    neighbor 192.168.1.103 activate
@@ -1148,16 +1151,21 @@ Configuration for @code{NVA 2}:
 router bgp 64512
  bgp router-id 192.168.1.104
  neighbor 192.168.1.101 remote-as 64512
- no neighbor 192.168.1.101 activate
  neighbor 192.168.1.102 remote-as 64512
- no neighbor 192.168.1.102 activate
  neighbor 192.168.1.103 remote-as 64512
- no neighbor 192.168.1.103 activate
+ !
+ address-family ipv4 unicast
+  no neighbor 192.168.1.101 activate
+  no neighbor 192.168.1.102 activate
+  no neighbor 192.168.1.103 activate
+ exit-address-family
+ !
  address-family vpnv4 unicast
    neighbor 192.168.1.101 activate
    neighbor 192.168.1.102 activate
    neighbor 192.168.1.103 activate
  exit-address-family
+ !
  vnc defaults
   response-lifetime 3600
   exit-vnc
@@ -1231,12 +1239,15 @@ router bgp 64512
     neighbor 192.168.1.101 remote-as 64512
     neighbor 192.168.1.101 port 7179
     neighbor 192.168.1.101 description iBGP-client-192-168-1-101
-    neighbor 192.168.1.101 route-reflector-client
 
     neighbor 192.168.1.102 remote-as 64512
     neighbor 192.168.1.102 port 7179
     neighbor 192.168.1.102 description iBGP-client-192-168-1-102
-    neighbor 192.168.1.102 route-reflector-client
+
+    address-family ipv4 unicast
+        neighbor 192.168.1.101 route-reflector-client
+        neighbor 192.168.1.102 route-reflector-client
+    exit-address-family
 
     address-family vpnv4
         neighbor 192.168.1.101 activate