Merge pull request #4848 from donaldsharp/spelling_errors

debian packaging issues found
FRRouting · Aug 19, 2019 · 8d3c0d3 · 8d3c0d3
2 parents 6043214 + e671f9f
commit 8d3c0d3
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 34 deletions.
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
@@ -1466,7 +1466,7 @@ struct aspath *aspath_prepend(struct aspath *as1, struct aspath *as2)
 	/* Not reached */
 }
 
-/* Iterate over AS_PATH segments and wipe all occurences of the
+/* Iterate over AS_PATH segments and wipe all occurrences of the
  * listed AS numbers. Hence some segments may lose some or even
  * all data on the way, the operation is implemented as a smarter
  * version of aspath_dup(), which allocates memory to hold the new

diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c
@@ -1180,7 +1180,7 @@ DEFPY (show_rpki_prefix,
 {
 
 	if (!is_synchronized()) {
-		vty_out(vty, "No Conection to RPKI cache server.\n");
+		vty_out(vty, "No Connection to RPKI cache server.\n");
 		return CMD_WARNING;
 	}
 

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
@@ -6069,7 +6069,7 @@ DEFUN (neighbor_allowas_in,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Accept as-path with my AS present in it\n"
-       "Number of occurences of AS number\n"
+       "Number of occurrences of AS number\n"
        "Only accept my AS in the as-path if the route was originated in my AS\n")
 {
 	int idx_peer = 1;
@@ -6103,7 +6103,7 @@ ALIAS_HIDDEN(
 	"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 occurences of AS number\n"
+	"Number of occurrences 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,
@@ -6113,7 +6113,7 @@ DEFUN (no_neighbor_allowas_in,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "allow local ASN appears in aspath attribute\n"
-       "Number of occurences of AS number\n"
+       "Number of occurrences of AS number\n"
        "Only accept my AS in the as-path if the route was originated in my AS\n")
 {
 	int idx_peer = 2;
@@ -6135,7 +6135,7 @@ ALIAS_HIDDEN(
 	"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 occurences of AS number\n"
+	"Number of occurrences 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,

diff --git a/lib/libfrr.c b/lib/libfrr.c
@@ -410,7 +410,7 @@ static int frr_opt(int opt)
 		}
 		if (di->zpathspace)
 			fprintf(stderr,
-				"-N option overriden by -z for zebra named socket path\n");
+				"-N option overridden by -z for zebra named socket path\n");
 
 		if (strchr(optarg, '/') || strchr(optarg, '.')) {
 			fprintf(stderr,

diff --git a/lib/thread.c b/lib/thread.c
@@ -714,7 +714,7 @@ static int fd_poll(struct thread_master *m, struct pollfd *pfds, nfds_t pfdsize,
 {
 	/* If timer_wait is null here, that means poll() should block
 	 * indefinitely,
-	 * unless the thread_master has overriden it by setting
+	 * unless the thread_master has overridden it by setting
 	 * ->selectpoll_timeout.
 	 * If the value is positive, it specifies the maximum number of
 	 * milliseconds

diff --git a/ospf6d/ospf6_zebra.c b/ospf6d/ospf6_zebra.c
@@ -258,7 +258,7 @@ DEFUN (show_zebra,
 		return CMD_SUCCESS;
 	}
 
-	vty_out(vty, "Zebra Infomation\n");
+	vty_out(vty, "Zebra Information\n");
 	vty_out(vty, "  fail: %d\n", zclient->fail);
 	vty_out(vty, "  redistribute default: %d\n",
 		vrf_bitmap_check(zclient->default_information[AFI_IP6],

diff --git a/ospfd/ospf_errors.c b/ospfd/ospf_errors.c
@@ -39,7 +39,7 @@ static struct log_ref ferr_ospf_warn[] = {
 	},
 	{
 		.code = EC_OSPF_PACKET,
-		.title = "OSPF has detected packet information missmatch",
+		.title = "OSPF has detected packet information mismatch",
 		.description = "OSPF has detected that packet information received is incorrect",
 		.suggestion = "Ensure interface configuration is correct, gather log files from here and the peer and open an Issue",
 	},

diff --git a/pbrd/pbrd.conf.sample b/pbrd/pbrd.conf.sample
@@ -1,3 +1,19 @@
+! Sample pbrd configuration file
+!
+! A quick example of what a pbr configuration might look like
 !
 !
 log stdout
+!
+! nexthop-group TEST
+!   nexthop 4.5.6.7
+!   nexthop 5.6.7.8
+! !
+! pbr-map BLUE seq 100
+!   match dst-ip 9.9.9.0/24
+!   match src-ip 10.10.10.0/24
+!   set nexthop-group TEST
+! !
+! int swp1
+!   pbr-policy BLUE
+!
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
@@ -711,11 +711,11 @@ static bool pim_bsm_frag_send(uint8_t *buf, uint32_t len, struct interface *ifp,
 	/* MTU  passed here is PIM MTU (IP MTU less IP Hdr) */
 	if (pim_mtu < (PIM_MIN_BSM_LEN)) {
 		zlog_warn(
-			"%s: mtu(pim mtu: %d) size less than minimum bootsrap len",
+			"%s: mtu(pim mtu: %d) size less than minimum bootstrap len",
 			__PRETTY_FUNCTION__, pim_mtu);
 		if (PIM_DEBUG_BSM)
 			zlog_debug(
-				"%s: mtu (pim mtu:%d) less than minimum bootsrap len",
+				"%s: mtu (pim mtu:%d) less than minimum bootstrap len",
 				__PRETTY_FUNCTION__, pim_mtu);
 		return false;
 	}

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
@@ -479,7 +479,7 @@ static int pim_update_upstream_nh_helper(struct hash_bucket *bucket, void *arg)
 		zlog_debug("%s: NHT upstream %s(%s) old ifp %s new ifp %s",
 			__PRETTY_FUNCTION__, up->sg_str, pim->vrf->name,
 			old.source_nexthop.interface
-			? old.source_nexthop.interface->name : "Unknwon",
+			? old.source_nexthop.interface->name : "Unknown",
 			up->rpf.source_nexthop.interface->name);
 	}
 

diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in
@@ -1,6 +1,6 @@
 # configure options
 #
-# Some can be overriden on rpmbuild commandline with:
+# Some can be overridden on rpmbuild commandline with:
 # rpmbuild --define 'variable value'
 #   (use any value, ie 1 for flag "with_XXXX" definitions)
 #

diff --git a/sharpd/sharpd.conf.sample b/sharpd/sharpd.conf.sample
@@ -1,3 +1,6 @@
+! Default sharpd configuration sample
 !
+! There are no `default` configuration commands for sharpd
+! all commands are at the view or enable level.
 !
 log stdout
diff --git a/staticd/staticd.conf.sample b/staticd/staticd.conf.sample
@@ -1,3 +1,5 @@
-!
+! Default staticd configuration sample
 !
 log stdout
+!
+! ip route 4.5.6.7/32 10.10.10.10
diff --git a/yang/frr-bfdd.yang b/yang/frr-bfdd.yang
@@ -264,22 +264,22 @@ module frr-bfdd {
 
     leaf session-down-count {
       type uint32;
-      description "Amount of times the session went down";
+      description "Number of times the session went down";
     }
 
     leaf session-up-count {
       type uint32;
-      description "Amount of times the session went up";
+      description "Number of times the session went up";
     }
 
     leaf control-packet-input-count {
       type uint64;
-      description "Amount of control packets received";
+      description "Number of control packets received";
     }
 
     leaf control-packet-output-count {
       type uint64;
-      description "Amount of control packets sent";
+      description "Number of control packets sent";
     }
 
     /*
@@ -296,12 +296,12 @@ module frr-bfdd {
      */
     leaf echo-packet-input-count {
       type uint64;
-      description "Amount of echo packets received";
+      description "Number of echo packets received";
     }
 
     leaf echo-packet-output-count {
       type uint64;
-      description "Amount of echo packets sent";
+      description "Number of echo packets sent";
     }
   }
 

diff --git a/yang/frr-isisd.yang b/yang/frr-isisd.yang
@@ -1024,7 +1024,7 @@ module frr-isisd {
       "This notification is sent when we attempt to propagate
        an LSP that is larger than the dataLinkBlockSize for the
        circuit.  The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1090,7 +1090,7 @@ module frr-isisd {
       "This notification is sent when we receive a PDU
        with a different value for the System ID length.
        The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1114,7 +1114,7 @@ module frr-isisd {
       "This notification is sent when we receive a PDU
        with a different value for the Maximum Area Addresses.
        The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1170,7 +1170,7 @@ module frr-isisd {
       "This notification is sent when the system receives a
        PDU with the wrong authentication type field.
        The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1188,7 +1188,7 @@ module frr-isisd {
       "This notification is sent when the system receives
        a PDU with the wrong authentication information.
        The notification generation must be throttled with
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1206,7 +1206,7 @@ module frr-isisd {
       "This notification is sent when the system receives a
        PDU with a different protocol version number.
        The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1230,7 +1230,7 @@ module frr-isisd {
       "This notification is sent when the system receives a
        Hello PDU from an IS that does not share any area
        address. The notification generation must be throttled
-       with at least 5 seconds betweeen successive
+       with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1248,7 +1248,7 @@ module frr-isisd {
       "This notification is sent when the system receives a
        Hello PDU from an IS but does not establish an adjacency
        for some reason. The notification generation must be
-       throttled with at least 5 seconds betweeen successive
+       throttled with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1273,7 +1273,7 @@ module frr-isisd {
     description
       "This notification is sent when the system  receives an
        LSP with a parse error. The notification generation must
-       be throttled with at least 5 seconds betweeen successive
+       be throttled with at least 5 seconds between successive
        notifications.";
     uses notification-instance-hdr;
 
@@ -1350,7 +1350,7 @@ module frr-isisd {
     description
       "This notification is sent when an LSP is received.
        The notification generation must be throttled with at
-       least 5 seconds betweeen successive notifications.";
+       least 5 seconds between successive notifications.";
     uses notification-instance-hdr;
 
     uses notification-interface-hdr;
@@ -1384,7 +1384,7 @@ module frr-isisd {
     description
       "This notification is sent when an LSP is regenerated.
        The notification generation must be throttled with at
-       least 5 seconds betweeen successive notifications.";
+       least 5 seconds between successive notifications.";
     uses notification-instance-hdr;
 
     leaf lsp-id {

diff --git a/zebra/zebra_errors.c b/zebra/zebra_errors.c
@@ -659,7 +659,7 @@ static struct log_ref ferr_zebra_err[] = {
 	{
 		.code = EC_ZEBRA_RTM_VERSION_MISMATCH,
 		.title =
-			"Zebra received kernel message with uknown version",
+			"Zebra received kernel message with unknown version",
 		.description =
 			"Zebra received a message from the kernel with a message version that does not match Zebra's internal version. Depending on version compatibility, this may cause issues sending and receiving messages to the kernel.",
 		.suggestion =

diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
@@ -6772,7 +6772,7 @@ int zebra_vxlan_clear_dup_detect_vni_ip(struct vty *vty,
 
 	if (!CHECK_FLAG(nbr->flags, ZEBRA_NEIGH_DUPLICATE)) {
 		vty_out(vty,
-			"%% Requsted host IP %s is not duplicate detected\n",
+			"%% Requested host IP %s is not duplicate detected\n",
 			buf);
 		return CMD_WARNING;
 	}