all: fix sundry syntax errors

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
index 7bc902ef922da8c0444b3371e11f578fa666afa3..684694d0bc40db99b1aa2ccd53db471d4d11e07a 100644 (file)
--- a/bgpd/bgp_bfd.c
+++ b/bgpd/bgp_bfd.c
@@ -615,7 +615,7 @@ DEFUN (neighbor_bfd_param,
 
 DEFUN_HIDDEN (neighbor_bfd_type,
        neighbor_bfd_type_cmd,
-       "neighbor <A.B.C.D|X:X::X:X|WORD> bfd (multihop|singlehop)",
+       "neighbor <A.B.C.D|X:X::X:X|WORD> bfd <multihop|singlehop>",
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Enables BFD support\n"
@@ -674,7 +674,7 @@ DEFUN (no_neighbor_bfd,
 
 DEFUN_HIDDEN (no_neighbor_bfd_type,
        no_neighbor_bfd_type_cmd,
-       "no neighbor <A.B.C.D|X:X::X:X|WORD> bfd (multihop|singlehop)",
+       "no neighbor <A.B.C.D|X:X::X:X|WORD> bfd <multihop|singlehop>",
        NO_STR
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 0d6a071ec6d66613b92dcabacb0087834c6d30d9..e188de6e7654e338475cd7decd508ff552a55a46 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -974,7 +974,7 @@ DEFUN (bgp_confederation_peers,
 
 DEFUN (no_bgp_confederation_peers,
        no_bgp_confederation_peers_cmd,
-       "no bgp confederation peers . (1-4294967295)",
+       "no bgp confederation peers (1-4294967295)...",
        NO_STR
        "BGP specific commands\n"
        "AS confederation parameters\n"

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index aae433bb7bf6f9877db4b0548783db52715ac709..3609299007063b2d6cda85b037cbf89edf6d3193 100644 (file)
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -6306,7 +6306,7 @@ DEFUN (ip_ospf_message_digest_key,
 
 DEFUN_HIDDEN (ospf_message_digest_key,
               ospf_message_digest_key_cmd,
-              "ospf message-digest-key <1-255> md5 KEY",
+              "ospf message-digest-key (1-255) md5 KEY",
               "OSPF interface commands\n"
               "Message digest authentication password (key)\n"
               "Key ID\n"
@@ -6559,7 +6559,7 @@ DEFUN (ip_ospf_cost,
 
 DEFUN_HIDDEN (ospf_cost,
               ospf_cost_u32_inet4_cmd,
-              "ospf cost <1-65535> A.B.C.D",
+              "ospf cost (1-65535) A.B.C.D",
               "OSPF interface commands\n"
               "Interface cost\n"
               "Cost\n"
@@ -6936,7 +6936,7 @@ DEFUN (ip_ospf_dead_interval,
 
 DEFUN_HIDDEN (ospf_dead_interval,
               ospf_dead_interval_cmd,
-              "ospf dead-interval <1-65535>",
+              "ospf dead-interval (1-65535)",
               "OSPF interface commands\n"
               "Interval after which a neighbor is declared dead\n"
               "Seconds\n")
@@ -6989,7 +6989,7 @@ DEFUN (no_ospf_dead_interval,
 
 DEFUN (no_ip_ospf_dead_interval,
        no_ip_ospf_dead_interval_addr_cmd,
-       "no ip ospf dead-interval [[(1-65535)|minimal hello-multiplier (1-10)] [A.B.C.D]]",
+       "no ip ospf dead-interval [<(1-65535)|minimal hello-multiplier (1-10)> [A.B.C.D]]",
        NO_STR
        "IP Information\n"
        "OSPF interface commands\n"
@@ -7108,7 +7108,7 @@ DEFUN (ip_ospf_hello_interval,
 
 DEFUN_HIDDEN (ospf_hello_interval,
               ospf_hello_interval_cmd,
-              "ospf hello-interval <1-65535>",
+              "ospf hello-interval (1-65535)",
               "OSPF interface commands\n"
               "Time between HELLO packets\n"
               "Seconds\n")
@@ -7244,7 +7244,7 @@ DEFUN (ip_ospf_network,
 
 DEFUN_HIDDEN (ospf_network,
               ospf_network_cmd,
-              "ospf network (broadcast|non-broadcast|point-to-multipoint|point-to-point)",
+              "ospf network <broadcast|non-broadcast|point-to-multipoint|point-to-point>",
               "OSPF interface commands\n"
               "Network type\n"
               "Specify OSPF broadcast multi-access network\n"
@@ -7441,7 +7441,7 @@ DEFUN (ip_ospf_priority,
 
 DEFUN_HIDDEN (ospf_priority,
               ospf_priority_cmd,
-              "ospf priority <0-255>",
+              "ospf priority (0-255)",
               "OSPF interface commands\n"
               "Router priority\n"
               "Priority\n")
@@ -7658,7 +7658,7 @@ DEFUN (ip_ospf_retransmit_interval,
 
 DEFUN_HIDDEN (ospf_retransmit_interval,
               ospf_retransmit_interval_cmd,
-              "ospf retransmit-interval <3-65535>",
+              "ospf retransmit-interval (3-65535)",
               "OSPF interface commands\n"
               "Time between retransmitting lost link state advertisements\n"
               "Seconds\n")
@@ -7704,7 +7704,7 @@ DEFUN (no_ospf_retransmit_interval,
 
 DEFUN (no_ip_ospf_retransmit_interval,
        no_ip_ospf_retransmit_interval_addr_cmd,
-       "no ip ospf retransmit-interval [<<3-65535 [A.B.C.D]|A.B.C.D>]",
+       "no ip ospf retransmit-interval [<(3-65535) [A.B.C.D]|A.B.C.D>]",
        NO_STR
        "IP Information\n"
        "OSPF interface commands\n"
@@ -7803,7 +7803,7 @@ DEFUN (ip_ospf_transmit_delay,
 
 DEFUN_HIDDEN (ospf_transmit_delay,
               ospf_transmit_delay_cmd,
-              "ospf transmit-delay <1-65535>",
+              "ospf transmit-delay (1-65535)",
               "OSPF interface commands\n"
               "Link state transmit delay\n"
               "Seconds\n")
@@ -8058,7 +8058,7 @@ DEFUN (no_ip_ospf_instance_area,
 
 DEFUN (ospf_redistribute_source,
        ospf_redistribute_source_cmd,
-       "redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type <1|2>|route-map WORD>]",
+       "redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_OSPFD
        "Metric for redistributed routes\n"
@@ -8113,7 +8113,7 @@ DEFUN (ospf_redistribute_source,
 
 DEFUN (no_ospf_redistribute_source,
        no_ospf_redistribute_source_cmd,
-       "no redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type <1|2>|route-map WORD>]",
+       "no redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        NO_STR
        REDIST_STR
        QUAGGA_REDIST_HELP_STR_OSPFD
@@ -8320,7 +8320,7 @@ DEFUN (no_ospf_distribute_list_out,
 /* Default information originate. */
 DEFUN (ospf_default_information_originate,
        ospf_default_information_originate_cmd,
-       "default-information originate [<always|metric (0-16777214)|metric-type <1|2>|route-map WORD>]",
+       "default-information originate [<always|metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        "Control distribution of default information\n"
        "Distribute a default route\n"
        "Always advertise default route\n"

diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 95fadde95278d93665cc31a3a85e1f18d9348651..4e37871456526df153ce3bfd693f4e77b72e60fb 100644 (file)
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -1327,7 +1327,7 @@ DEFUN (no_rip_neighbor,
 
 DEFUN (ip_rip_receive_version,
        ip_rip_receive_version_cmd,
-       "ip rip receive version <1|2>",
+       "ip rip receive version (1-2)",
        IP_STR
        "Routing Information Protocol\n"
        "Advertisement reception\n"
@@ -1400,7 +1400,7 @@ DEFUN (ip_rip_receive_version_2,
 
 DEFUN (no_ip_rip_receive_version,
        no_ip_rip_receive_version_cmd,
-       "no ip rip receive version [<1|2>]",
+       "no ip rip receive version [(1-2)]",
        NO_STR
        IP_STR
        "Routing Information Protocol\n"
@@ -1422,7 +1422,7 @@ DEFUN (no_ip_rip_receive_version,
 
 DEFUN (ip_rip_send_version,
        ip_rip_send_version_cmd,
-       "ip rip send version <1|2>",
+       "ip rip send version (1-2)",
        IP_STR
        "Routing Information Protocol\n"
        "Advertisement transmission\n"
@@ -1495,7 +1495,7 @@ DEFUN (ip_rip_send_version_2,
 
 DEFUN (no_ip_rip_send_version,
        no_ip_rip_send_version_cmd,
-       "no ip rip send version [<1|2>]",
+       "no ip rip send version [(1-2)]",
        NO_STR
        IP_STR
        "Routing Information Protocol\n"

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index de973cf4cefa53a97bace0a0bfa53f19ddfb9e4b..8ab3243dbd58b3af472cd5c67e517466d3fa32ad 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1942,7 +1942,7 @@ DEFUNSH (VTYSH_ALL,
 DEFUNSH (VTYSH_ALL,
         vtysh_log_monitor,
         vtysh_log_monitor_cmd,
-        "log monitor [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>",
+        "log monitor [<emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>]",
         "Logging control\n"
         "Set terminal line (monitor) logging level\n"
          LOG_LEVEL_DESC)