diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-10 15:06:19 +0200 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2017-07-10 15:06:19 +0200 |
| commit | dfd8121281fbefa0b43e6aa960837dc0cca543a8 (patch) | |
| tree | d5cf5869cf836759c68f53635109223e2724b0e6 /vtysh | |
| parent | bgpd: Install SAFI_LABELED_UNICAST routes in SAFI_UNICAST table (diff) | |
| parent | Merge pull request #750 from donaldsharp/bgp_buffer (diff) | |
| download | frr-dfd8121281fbefa0b43e6aa960837dc0cca543a8.tar.xz frr-dfd8121281fbefa0b43e6aa960837dc0cca543a8.zip | |
Merge branch 'master' of https://github.com/dwalton76/frr into bgpd-ipv4-plus-label-misc3
Conflicts:
bgpd/bgp_route.c
bgpd/bgp_zebra.c
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index f5f532d53..f02bd0c88 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -1272,9 +1272,8 @@ DEFUNSH (VTYSH_BGPD, address_family_evpn_cmd, "address-family <l2vpn evpn>", "Enter Address Family command mode\n" - "EVPN Address family\n" - "Layer2 VPN Address family\n" - "Ethernet Virtual Private Network Subsequent Address Family\n") + "Address Family\n" + "Address Family modifier\n") { vty->node = BGP_EVPN_NODE; return CMD_SUCCESS; @@ -2446,10 +2445,9 @@ DEFUNSH (VTYSH_ALL, DEFUNSH (VTYSH_ALL, vtysh_config_password, vtysh_password_cmd, - "password (8-8) WORD", + "password [(8-8)] WORD", "Assign the terminal connection password\n" "Specifies a HIDDEN password will follow\n" - "dummy string \n" "The HIDDEN line password string\n") { return CMD_SUCCESS; |