*: spelchek

Signed-off-by: David Lamparter <equinox@diac24.net>

44 files changed, 73 insertions, 73 deletions

diff --git a/babeld/babel_interface.h b/babeld/babel_interface.h
index 17d9bfb93..d9e274582 100644
--- a/babeld/babel_interface.h
+++ b/babeld/babel_interface.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #define CONFIG_NO 1
 #define CONFIG_YES 2
 
-/* babeld interface informations */
+/* babeld interface information */
 struct babel_interface {
     unsigned short flags;                     /* see below */
     unsigned short cost;
diff --git a/babeld/babel_main.c b/babeld/babel_main.c
index d02d86f77..f26d3a887 100644
--- a/babeld/babel_main.c
+++ b/babeld/babel_main.c
@@ -385,7 +385,7 @@ show_babel_main_configuration (struct vty *vty)
     vty_out (vty,
             "state file              = %s\n"
             "configuration file      = %s\n"
-            "protocol informations:\n"
+            "protocol information:\n"
             "  multicast address     = %s\n"
             "  port                  = %d\n"
             "vty address             = %s\n"
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 9523cca87..65a46bb96 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1697,7 +1697,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args,
 				 * - for consistency in rx processing
 				 *
 				 * The following comment is to signal GCC this intention
-				 * and supress the warning
+				 * and suppress the warning
 				 */
 	/* FALLTHRU */
 	case BGP_ATTR_NHLEN_IPV4:
@@ -2624,7 +2624,7 @@ bgp_attr_parse_ret_t bgp_attr_parse(struct peer *peer, struct attr *attr,
 			return ret;
 		}
 
-		/* If hard error occured immediately return to the caller. */
+		/* If hard error occurred immediately return to the caller. */
 		if (ret == BGP_ATTR_PARSE_ERROR) {
 			flog_warn(EC_BGP_ATTRIBUTE_PARSE_ERROR,
 				  "%s: Attribute %s, parse error", peer->host,
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 86cee39a6..cf085e46f 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -689,7 +689,7 @@ int bgp_show_dampening_parameters(struct vty *vty, afi_t afi, safi_t safi)
 		vty_out(vty, "Suppress penalty: %d\n", damp->suppress_value);
 		vty_out(vty, "Max suppress time: %lld min\n",
 			(long long)damp->max_suppress_time / 60);
-		vty_out(vty, "Max supress penalty: %u\n", damp->ceiling);
+		vty_out(vty, "Max suppress penalty: %u\n", damp->ceiling);
 		vty_out(vty, "\n");
 	} else
 		vty_out(vty, "dampening not enabled for %s\n",
diff --git a/bgpd/bgp_errors.c b/bgpd/bgp_errors.c
index 7cebd0e48..753ee6baf 100644
--- a/bgpd/bgp_errors.c
+++ b/bgpd/bgp_errors.c
@@ -171,7 +171,7 @@ static struct log_ref ferr_bgp_warn[] = {
 	},
 	{
 		.code = EC_BGP_CAPABILITY_VENDOR,
-		.title = "BGP has recieved capability data specific to a particular vendor",
+		.title = "BGP has received capability data specific to a particular vendor",
 		.description = "BGP has received a capability that is vendor specific and as such we have no knowledge of how to use this capability in FRR",
 		.suggestion = "On peer turn off this feature"
 	},
@@ -197,43 +197,43 @@ static struct log_ref ferr_bgp_err[] = {
 		.code = EC_BGP_ATTR_FLAG,
 		.title = "BGP attribute flag is incorrect",
 		.description = "BGP attribute flag is set to the wrong value (Optional/Transitive/Partial)",
-		.suggestion = "Determine the soure of the attribute and determine why the attribute flag has been set incorrectly"
+		.suggestion = "Determine the source of the attribute and determine why the attribute flag has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_LEN,
 		.title = "BGP attribute length is incorrect",
 		.description = "BGP attribute length is incorrect",
-		.suggestion = "Determine the soure of the attribute and determine why the attribute length has been set incorrectly"
+		.suggestion = "Determine the source of the attribute and determine why the attribute length has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_ORIGIN,
 		.title = "BGP attribute origin value invalid",
 		.description = "BGP attribute origin value is invalid",
-		.suggestion = "Determine the soure of the attribute and determine why the origin attribute has been set incorrectly"
+		.suggestion = "Determine the source of the attribute and determine why the origin attribute has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_MAL_AS_PATH,
 		.title = "BGP as path is invalid",
 		.description = "BGP as path has been malformed",
-		.suggestion = "Determine the soure of the update and determine why the as path has been set incorrectly"
+		.suggestion = "Determine the source of the update and determine why the as path has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_FIRST_AS,
 		.title = "BGP as path first as is invalid",
 		.description = "BGP update has invalid first as in as path",
-		.suggestion = "Determine the soure of the update and determine why the as path first as value has been set incorrectly"
+		.suggestion = "Determine the source of the update and determine why the as path first as value has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_PMSI_TYPE,
 		.title = "BGP PMSI tunnel attribute type is invalid",
 		.description = "BGP update has invalid type for PMSI tunnel",
-		.suggestion = "Determine the soure of the update and determine why the PMSI tunnel attribute type has been set incorrectly"
+		.suggestion = "Determine the source of the update and determine why the PMSI tunnel attribute type has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_ATTR_PMSI_LEN,
 		.title = "BGP PMSI tunnel attribute length is invalid",
 		.description = "BGP update has invalid length for PMSI tunnel",
-		.suggestion = "Determine the soure of the update and determine why the PMSI tunnel attribute length has been set incorrectly"
+		.suggestion = "Determine the source of the update and determine why the PMSI tunnel attribute length has been set incorrectly"
 	},
 	{
 		.code = EC_BGP_PEER_GROUP,
@@ -269,7 +269,7 @@ static struct log_ref ferr_bgp_err[] = {
 		.code = EC_BGP_JSON_MEM_ERROR,
 		.title = "BGP unable to allocate memory for JSON output",
 		.description = "BGP attempted to generate JSON output and was unable to allocate the memory required",
-		.suggestion = "Ensure that the device has adequate memory to suport the required functions"
+		.suggestion = "Ensure that the device has adequate memory to support the required functions"
 	},
 	{
 		.code = EC_BGP_UPDGRP_ATTR_LEN,
diff --git a/bgpd/bgp_evpn.c b/bgpd/bgp_evpn.c
index b67d93d4f..574ece8cc 100644
--- a/bgpd/bgp_evpn.c
+++ b/bgpd/bgp_evpn.c
@@ -1449,7 +1449,7 @@ static int update_evpn_type5_route_entry(struct bgp *bgp_def,
 	}
 
 	/*
-	 * create a new route entry if one doesnt exist.
+	 * create a new route entry if one doesn't exist.
 	 * Otherwise see if route attr has changed
 	 */
 	if (!local_pi) {
@@ -5288,7 +5288,7 @@ int bgp_evpn_local_l3vni_add(vni_t l3vni, vrf_id_t vrf_id, struct ethaddr *rmac,
 	}
 	as = bgp_def->as;
 
-	/* if the BGP vrf instance doesnt exist - create one */
+	/* if the BGP vrf instance doesn't exist - create one */
 	bgp_vrf = bgp_lookup_by_name(vrf_id_to_name(vrf_id));
 	if (!bgp_vrf) {
 
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index 90c9db3df..29f9f64cc 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -3999,7 +3999,7 @@ DEFUN(test_withdraw_evpn_type4_route,
 	}
 
 	if (!bgp->peer_self) {
-		vty_out(vty, "%%BGP instance doesnt have self peer\n");
+		vty_out(vty, "%%BGP instance doesn't have self peer\n");
 		return CMD_WARNING;
 	}
 
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index d17426e3f..8aa35eddf 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -931,7 +931,7 @@ static void bgp_update_delay_process_status_change(struct peer *peer)
 	}
 }
 
-/* Called after event occured, this function change status and reset
+/* Called after event occurred, this function change status and reset
    read/write and timer thread. */
 void bgp_fsm_change_status(struct peer *peer, int status)
 {
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 96f3c8324..73a07c823 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -272,7 +272,7 @@ static void bgp_update_explicit_eors(struct peer *peer)
 					   PEER_STATUS_EOR_RECEIVED)) {
 				if (bgp_debug_neighbor_events(peer))
 					zlog_debug(
-						"   afi %d safi %d didnt receive EOR",
+						"   afi %d safi %d didn't receive EOR",
 						afi, safi);
 				return;
 			}
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index a1c50a720..ecbe33ff8 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -2301,7 +2301,7 @@ DEFUN (bgp_default_show_hostname,
        "bgp default show-hostname",
        "BGP specific commands\n"
        "Configure BGP defaults\n"
-       "Show hostname in certain command ouputs\n")
+       "Show hostname in certain command outputs\n")
 {
 	VTY_DECLVAR_CONTEXT(bgp, bgp);
 	bgp_flag_set(bgp, BGP_FLAG_SHOW_HOSTNAME);
@@ -2314,7 +2314,7 @@ DEFUN (no_bgp_default_show_hostname,
        NO_STR
        "BGP specific commands\n"
        "Configure BGP defaults\n"
-       "Show hostname in certain command ouputs\n")
+       "Show hostname in certain command outputs\n")
 {
 	VTY_DECLVAR_CONTEXT(bgp, bgp);
 	bgp_flag_unset(bgp, BGP_FLAG_SHOW_HOSTNAME);
@@ -6016,7 +6016,7 @@ DEFUN (neighbor_allowas_in,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Accept as-path with my AS present in it\n"
-       "Number of occurances of AS number\n"
+       "Number of occurences 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;
@@ -6050,7 +6050,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 occurances of AS number\n"
+	"Number of occurences 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,
@@ -6060,7 +6060,7 @@ DEFUN (no_neighbor_allowas_in,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "allow local ASN appears in aspath attribute\n"
-       "Number of occurances of AS number\n"
+       "Number of occurences 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;
@@ -6082,7 +6082,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 occurances of AS number\n"
+	"Number of occurences 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,
@@ -9607,7 +9607,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
 								json_object_string_add(
 									json_nxt,
 									print_store,
-									"recieved");
+									"received");
 							}
 						}
 						json_object_object_add(
@@ -10215,7 +10215,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json,
 			json_object_object_add(
 				json_neigh, "gracefulRestartInfo", json_grace);
 		} else {
-			vty_out(vty, "  Graceful restart informations:\n");
+			vty_out(vty, "  Graceful restart information:\n");
 			if (p->status == Established) {
 				vty_out(vty, "    End-of-RIB send: ");
 				FOREACH_AFI_SAFI (afi, safi) {
diff --git a/doc/manpages/common-options.rst b/doc/manpages/common-options.rst
index 74d3eb7bb..a5977a6eb 100644
--- a/doc/manpages/common-options.rst
+++ b/doc/manpages/common-options.rst
@@ -136,7 +136,7 @@ These following options control the daemon's VTY (interactive command line) inte
 
    NB: Unlike the other options, this option specifies a directory, not a full path.
 
-   This option is primarily used by the SNAP packaging system, its semantics may change.  It should not be neccessary in most other scenarios.
+   This option is primarily used by the SNAP packaging system, its semantics may change.  It should not be necessary in most other scenarios.
 
 MODULE LOADING
 --------------
diff --git a/doc/manpages/zebra.rst b/doc/manpages/zebra.rst
index a8a930158..cfb368bf4 100644
--- a/doc/manpages/zebra.rst
+++ b/doc/manpages/zebra.rst
@@ -33,7 +33,7 @@ OPTIONS available for the |DAEMON| command:
 
    Set netlink receive buffer size. There are cases where zebra daemon can't handle flood of netlink messages from kernel. If you ever see "recvmsg overrun" messages in zebra log, you are in trouble.
 
-   Solution is to increase receive buffer of netlink socket. Note that kernel < 2.6.14 doesn't allow to increase it over maximum value defined in /proc/sys/net/core/rmem_max. If you want to do it, you have to increase maximum before starting zebra.
+   Solution is to increase receive buffer of netlink socket. Note that kernel < 2.6.14 doesn't allow increasing it over maximum value defined in /proc/sys/net/core/rmem_max. If you want to do it, you have to increase maximum before starting zebra.
 
    Note that this affects Linux only.
 
diff --git a/eigrpd/eigrp_const.h b/eigrpd/eigrp_const.h
index 3d84c8217..895a141e4 100644
--- a/eigrpd/eigrp_const.h
+++ b/eigrpd/eigrp_const.h
@@ -152,7 +152,7 @@ enum eigrp_fsm_states {
 enum eigrp_fsm_events {
 	/*
 	 * Input event other than query from succ,
-	 * FC is not satisified
+	 * FC is not satisfied
 	 */
 	EIGRP_FSM_EVENT_NQ_FCN,
 
@@ -171,7 +171,7 @@ enum eigrp_fsm_events {
 	/* Query from succ while in active state */
 	EIGRP_FSM_EVENT_QACT,
 
-	/* last reply, FC not satisified */
+	/* last reply, FC not satisfied */
 	EIGRP_FSM_EVENT_LR_FCN,
 
 	/*
diff --git a/eigrpd/eigrp_dump.c b/eigrpd/eigrp_dump.c
index bbe2b8822..27e02630a 100644
--- a/eigrpd/eigrp_dump.c
+++ b/eigrpd/eigrp_dump.c
@@ -228,7 +228,7 @@ void show_ip_eigrp_interface_detail(struct vty *vty, struct eigrp *eigrp,
 		"Un/reliable mcasts: ", 0, "/", 0, "Un/reliable ucasts: ", 0,
 		"/", 0);
 	vty_out(vty, "%-2s %s %d %s %d %s %d \n", "", "Mcast exceptions: ", 0,
-		"  CR packets: ", 0, "  ACKs supressed: ", 0);
+		"  CR packets: ", 0, "  ACKs suppressed: ", 0);
 	vty_out(vty, "%-2s %s %d %s %d \n", "", "Retransmissions sent: ", 0,
 		"Out-of-sequence rcvd: ", 0);
 	vty_out(vty, "%-2s %s %s %s \n", "", "Authentication mode is ", "not",
diff --git a/eigrpd/eigrp_fsm.c b/eigrpd/eigrp_fsm.c
index f955e6df0..374114cf5 100644
--- a/eigrpd/eigrp_fsm.c
+++ b/eigrpd/eigrp_fsm.c
@@ -222,9 +222,9 @@ static const char *fsm_state2str(enum eigrp_fsm_events event)
 	case EIGRP_FSM_EVENT_LR:
 		return "Last Reply Event";
 	case EIGRP_FSM_EVENT_Q_FCN:
-		return "Query Event Feasability not satisified";
+		return "Query Event Feasability not satisfied";
 	case EIGRP_FSM_EVENT_LR_FCS:
-		return "Last Reply Event Feasability satisified";
+		return "Last Reply Event Feasability satisfied";
 	case EIGRP_FSM_EVENT_DINC:
 		return "Distance Increase Event";
 	case EIGRP_FSM_EVENT_QACT:
diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c
index 1c4ca249e..b6f751463 100644
--- a/isisd/isis_spf.c
+++ b/isisd/isis_spf.c
@@ -887,7 +887,7 @@ static int isis_spf_preload_tent(struct isis_spftree *spftree,
 				case ISIS_SYSTYPE_UNKNOWN:
 				default:
 					zlog_warn(
-						"isis_spf_preload_tent unknow adj type");
+						"isis_spf_preload_tent unknown adj type");
 				}
 			}
 			list_delete(&adj_list);
diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index 8eed08990..c24e1917c 100644
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -156,7 +156,7 @@ DEFPY  (ldp_dual_stack_transport_connection_prefer_ipv4,
 	NO_STR
 	"Configure dual stack parameters\n"
 	"Configure TCP transport parameters\n"
-	"Configure prefered address family for TCP transport connection with neighbor\n"
+	"Configure preferred address family for TCP transport connection with neighbor\n"
 	"IPv4\n")
 {
 	return (ldp_vty_trans_pref_ipv4(vty, no));
diff --git a/ldpd/util.c b/ldpd/util.c
index 12f9cb0cc..b4d74f195 100644
--- a/ldpd/util.c
+++ b/ldpd/util.c
@@ -259,7 +259,7 @@ embedscope(struct sockaddr_in6 *sin6)
 	if (IN6_IS_SCOPE_EMBED(&sin6->sin6_addr)) {
 		memcpy(&tmp16, &sin6->sin6_addr.s6_addr[2], sizeof(tmp16));
 		if (tmp16 != 0) {
-			log_warnx("%s: address %s already has embeded scope %u",
+			log_warnx("%s: address %s already has embedded scope %u",
 			    __func__, log_sockaddr(sin6), ntohs(tmp16));
 		}
 		tmp16 = htons(sin6->sin6_scope_id);
diff --git a/lib/bfd.c b/lib/bfd.c
index 1dfe583ca..178c203f5 100644
--- a/lib/bfd.c
+++ b/lib/bfd.c
@@ -134,7 +134,7 @@ void bfd_peer_sendmsg(struct zclient *zclient, struct bfd_info *bfd_info,
 	int ret;
 	int len;
 
-	/* Individual reg/dereg messages are supressed during shutdown. */
+	/* Individual reg/dereg messages are suppressed during shutdown. */
 	if (CHECK_FLAG(bfd_gbl.flags, BFD_GBL_FLAG_IN_SHUTDOWN)) {
 		if (bfd_debug)
 			zlog_debug(
diff --git a/lib/command.h b/lib/command.h
index fbff1e67f..de65c8bd9 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -355,7 +355,7 @@ struct cmd_node {
 #define IN_STR  "Filter incoming routing updates\n"
 #define V4NOTATION_STR "specify by IPv4 address notation(e.g. 0.0.0.0)\n"
 #define OSPF6_NUMBER_STR "Specify by number\n"
-#define INTERFACE_STR "Interface infomation\n"
+#define INTERFACE_STR "Interface information\n"
 #define IFNAME_STR "Interface name(e.g. ep0)\n"
 #define IP6_STR "IPv6 Information\n"
 #define OSPF6_STR "Open Shortest Path First (OSPF) for IPv6\n"
diff --git a/lib/lib_errors.c b/lib/lib_errors.c
index 03ad974da..ad83ef1e5 100644
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@@ -89,8 +89,8 @@ static struct log_ref ferr_lib_err[] = {
 	{
 		.code = EC_LIB_SOCKET,
 		.title = "Socket Error",
-		.description = "When attempting to access a socket a system error has occured and we were unable to properly complete the request",
-		.suggestion = "Ensure that there are sufficient system resources available and ensure that the frr user has sufficient permisions to work.  If necessary open an Issue",
+		.description = "When attempting to access a socket a system error has occurred and we were unable to properly complete the request",
+		.suggestion = "Ensure that there are sufficient system resources available and ensure that the frr user has sufficient permissions to work.  If necessary open an Issue",
 	},
 	{
 		.code = EC_LIB_ZAPI_MISSMATCH,
diff --git a/lib/mpls.h b/lib/mpls.h
index c9dd60dce..614698561 100644
--- a/lib/mpls.h
+++ b/lib/mpls.h
@@ -171,7 +171,7 @@ static inline char *label2str(mpls_label_t label, char *buf, size_t len)
 		strlcpy(buf, "Router Alert", len);
 		return (buf);
 	case MPLS_LABEL_IPV6_EXPLICIT_NULL:
-		strlcpy(buf, "IPv6 Explict Null", len);
+		strlcpy(buf, "IPv6 Explicit Null", len);
 		return (buf);
 	case MPLS_LABEL_IMPLICIT_NULL:
 		strlcpy(buf, "implicit-null", len);
diff --git a/lib/sockunion.c b/lib/sockunion.c
index bee82a067..af4f41f37 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -356,7 +356,7 @@ int sockopt_ttl(int family, int sock, int ttl)
  * Which on linux is a no-op since it is enabled by
  * default and on BSD it uses TCP_NOPUSH to do
  * the same thing( which it was not configured to
- * use).  This cleanup of the api occured on 8/1/17
+ * use).  This cleanup of the api occurred on 8/1/17
  * I imagine if after more than 1 year of no-one
  * complaining, and a major upgrade release we
  * can deprecate and remove this function call
diff --git a/m4/ax_sys_weak_alias.m4 b/m4/ax_sys_weak_alias.m4
index 27b0f0c4f..37cbe9187 100644
--- a/m4/ax_sys_weak_alias.m4
+++ b/m4/ax_sys_weak_alias.m4
@@ -22,7 +22,7 @@
 #   another object file.
 #
 #   There are four known schemes of declaring weak symbols; each scheme is
-#   checked in turn, and the first one found is prefered. Note that only one
+#   checked in turn, and the first one found is preferred. Note that only one
 #   of the mentioned preprocessor macros will be defined!
 #
 #   1. Function attributes
diff --git a/ospf6d/ospf6_abr.c b/ospf6d/ospf6_abr.c
index 1890e9bdc..53d545a24 100644
--- a/ospf6d/ospf6_abr.c
+++ b/ospf6d/ospf6_abr.c
@@ -321,7 +321,7 @@ int ospf6_abr_originate_summary_to_area(struct ospf6_route *route,
 
 	/* if this is a route to ASBR */
 	if (route->type == OSPF6_DEST_TYPE_ROUTER) {
-		/* Only the prefered best path is considered */
+		/* Only the preferred best path is considered */
 		if (!CHECK_FLAG(route->flag, OSPF6_ROUTE_BEST)) {
 			if (is_debug)
 				zlog_debug(
diff --git a/ospf6d/ospf6_area.c b/ospf6d/ospf6_area.c
index c848a16aa..bc5286431 100644
--- a/ospf6d/ospf6_area.c
+++ b/ospf6d/ospf6_area.c
@@ -772,7 +772,7 @@ DEFUN (show_ipv6_ospf6_spf_tree,
        SHOW_STR
        IP6_STR
        OSPF6_STR
-       "Shortest Path First caculation\n"
+       "Shortest Path First calculation\n"
        "Show SPF tree\n")
 {
 	struct listnode *node;
@@ -807,7 +807,7 @@ DEFUN (show_ipv6_ospf6_area_spf_tree,
        OSPF6_STR
        OSPF6_AREA_STR
        OSPF6_AREA_ID_STR
-       "Shortest Path First caculation\n"
+       "Shortest Path First calculation\n"
        "Show SPF tree\n")
 {
 	int idx_ipv4 = 4;
diff --git a/ospfd/ospf_ism.c b/ospfd/ospf_ism.c
index ad9b3efe6..9fd9a70c7 100644
--- a/ospfd/ospf_ism.c
+++ b/ospfd/ospf_ism.c
@@ -277,7 +277,7 @@ static int ospf_wait_timer(struct thread *thread)
 	return 0;
 }
 
-/* Hook function called after ospf ISM event is occured. And vty's
+/* Hook function called after ospf ISM event is occurred. And vty's
    network command invoke this function after making interface
    structure. */
 static void ism_timer_set(struct ospf_interface *oi)
diff --git a/ospfd/ospf_nsm.c b/ospfd/ospf_nsm.c
index 91d187f41..f7c73fee3 100644
--- a/ospfd/ospf_nsm.c
+++ b/ospfd/ospf_nsm.c
@@ -94,7 +94,7 @@ static int ospf_db_desc_timer(struct thread *thread)
 	return 0;
 }
 
-/* Hook function called after ospf NSM event is occured.
+/* Hook function called after ospf NSM event is occurred.
  *
  * Set/clear any timers whose condition is implicit to the neighbour
  * state. There may be other timers which are set/unset according to other
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index 7f9629976..147773ce2 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -500,7 +500,7 @@ struct opaque_info_per_type {
 	/* Collection of callback functions for this opaque-type. */
 	struct ospf_opaque_functab *functab;
 
-	/* List of Opaque-LSA control informations per opaque-id. */
+	/* List of Opaque-LSA control information per opaque-id. */
 	struct list *id_list;
 };
 
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 79b464880..3bb3b79a6 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -3368,7 +3368,7 @@ static int ospf_make_db_desc(struct ospf_interface *oi,
 				if (IS_OPAQUE_LSA(lsa->data->type)
 				    && (!CHECK_FLAG(options, OSPF_OPTION_O))) {
 					/* Suppress advertising
-					 * opaque-informations. */
+					 * opaque-information. */
 					/* Remove LSA from DB summary list. */
 					ospf_lsdb_delete(lsdb, lsa);
 					continue;
diff --git a/ospfd/ospf_ri.c b/ospfd/ospf_ri.c
index 3b0319b59..bef16761f 100644
--- a/ospfd/ospf_ri.c
+++ b/ospfd/ospf_ri.c
@@ -591,7 +591,7 @@ static int is_mandated_params_set(struct ospf_router_info ori)
  * @param enable To activate or not Segment Routing router Information flooding
  * @param size   Size of Label Range i.e. SRGB size
  * @param lower  Lower bound of the Label Range i.e. SRGB first label
- * @param msd    Maximum label Stack Depth suported by the router
+ * @param msd    Maximum label Stack Depth supported by the router
  *
  * @return none
  */
diff --git a/ospfd/ospf_te.c b/ospfd/ospf_te.c
index f43038ab8..02698d770 100644
--- a/ospfd/ospf_te.c
+++ b/ospfd/ospf_te.c
@@ -2406,7 +2406,7 @@ DEFUN (no_ospf_mpls_te_inter_as,
 				ospf_mpls_te_lsa_schedule(lp, FLUSH_THIS_LSA);
 	}
 
-	/* Deregister the Callbacks for Inter-AS suport */
+	/* Deregister the Callbacks for Inter-AS support */
 	ospf_mpls_te_unregister();
 
 	return CMD_SUCCESS;
diff --git a/ospfd/ospfd.c b/ospfd/ospfd.c
index dc54f04c0..aa40dd0eb 100644
--- a/ospfd/ospfd.c
+++ b/ospfd/ospfd.c
@@ -171,7 +171,7 @@ void ospf_router_id_update(struct ospf *ospf)
 
 		/* Flush (inline) all external LSAs which now match the new
 		   router-id,
-		   need to adjust the OSPF_LSA_SELF flag, so the flush doesnt
+		   need to adjust the OSPF_LSA_SELF flag, so the flush doesn't
 		   hit
 		   asserts in ospf_refresher_unregister_lsa(). This step is
 		   needed
diff --git a/pbrd/pbr_zebra.c b/pbrd/pbr_zebra.c
index 25d64238b..b7391a171 100644
--- a/pbrd/pbr_zebra.c
+++ b/pbrd/pbr_zebra.c
@@ -207,13 +207,13 @@ static int rule_notify_owner(int command, struct zclient *zclient,
 
 	switch (note) {
 	case ZAPI_RULE_FAIL_INSTALL:
-		DEBUGD(&pbr_dbg_zebra, "%s: Recieved RULE_FAIL_INSTALL",
+		DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_FAIL_INSTALL",
 		       __PRETTY_FUNCTION__);
 		pbrms->installed &= ~installed;
 		break;
 	case ZAPI_RULE_INSTALLED:
 		pbrms->installed |= installed;
-		DEBUGD(&pbr_dbg_zebra, "%s: Recived RULE_INSTALLED",
+		DEBUGD(&pbr_dbg_zebra, "%s: Received RULE_INSTALLED",
 		       __PRETTY_FUNCTION__);
 		break;
 	case ZAPI_RULE_FAIL_REMOVE:
diff --git a/pimd/pim_msdp.c b/pimd/pim_msdp.c
index 807ad2bd1..7e072e6ad 100644
--- a/pimd/pim_msdp.c
+++ b/pimd/pim_msdp.c
@@ -74,7 +74,7 @@ static int pim_msdp_sa_adv_timer_cb(struct thread *t)
 	struct pim_instance *pim = THREAD_ARG(t);
 
 	if (PIM_DEBUG_MSDP_EVENTS) {
-		zlog_debug("MSDP SA advertisment timer expired");
+		zlog_debug("MSDP SA advertisement timer expired");
 	}
 
 	pim_msdp_sa_adv_timer_setup(pim, true /* start */);
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index e5f5b34f2..cd5b632de 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -462,7 +462,7 @@ static int pim_upstream_could_register(struct pim_upstream *up)
 	return 0;
 }
 
-/* Source registration is supressed for SSM groups. When the SSM range changes
+/* Source registration is suppressed for SSM groups. When the SSM range changes
  * we re-revaluate register setup for existing upstream entries */
 void pim_upstream_register_reevaluate(struct pim_instance *pim)
 {
diff --git a/ripd/ripd.c b/ripd/ripd.c
index 444a09914..dd0d17ee4 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -1238,7 +1238,7 @@ static void rip_response_process(struct rip_packet *packet, int size,
 		   Ciscos before the 'ip subnet zero' option, it would be almost
 		   right too :-)
 
-		   Cisco summarize ripv1 advertisments to the classful boundary
+		   Cisco summarize ripv1 advertisements to the classful boundary
 		   (/16 for class B's) except when the RIP packet does to inside
 		   the classful network in question.  */
 
@@ -2513,7 +2513,7 @@ static void rip_update_process(int route_type)
 						      VRF_DEFAULT);
 			if (!connected) {
 				zlog_warn(
-					"Neighbor %s doesnt have connected interface!",
+					"Neighbor %s doesn't have connected interface!",
 					inet_ntoa(p->u.prefix4));
 				continue;
 			}
diff --git a/ripngd/ripngd.c b/ripngd/ripngd.c
index 08dc3d8b4..2cbbbae7f 100644
--- a/ripngd/ripngd.c
+++ b/ripngd/ripngd.c
@@ -1560,7 +1560,7 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to,
 		    && rinfo->suppress == 0) {
 			/* If no route-map are applied, the RTE will be these
 			 * following
-			 * informations.
+			 * information.
 			 */
 			p = (struct prefix_ipv6 *)&rp->p;
 			rinfo->metric_out = rinfo->metric;
@@ -1701,7 +1701,7 @@ void ripng_output_process(struct interface *ifp, struct sockaddr_in6 *to,
 		    && aggregate->suppress == 0) {
 			/* If no route-map are applied, the RTE will be these
 			 * following
-			 * informations.
+			 * information.
 			 */
 			p = (struct prefix_ipv6 *)&rp->p;
 			aggregate->metric_set = 0;
diff --git a/tools/start-stop-daemon.c b/tools/start-stop-daemon.c
index 8daeda740..f2a1e9434 100644
--- a/tools/start-stop-daemon.c
+++ b/tools/start-stop-daemon.c
@@ -1013,7 +1013,7 @@ int main(int argc, char **argv)
 	if (background) { /* ok, we need to detach this process */
 		int i, fd;
 		if (quietmode < 0)
-			printf("Detatching to start %s...", startas);
+			printf("Detaching to start %s...", startas);
 		i = fork();
 		if (i < 0) {
 			fatal("Unable to fork.\n");
diff --git a/zebra/if_sysctl.c b/zebra/if_sysctl.c
index 3f918c361..44afd266b 100644
--- a/zebra/if_sysctl.c
+++ b/zebra/if_sysctl.c
@@ -61,7 +61,7 @@ void ifstat_update_sysctl(void)
 	/* We free this memory at the end of this function. */
 	ref = buf = XMALLOC(MTYPE_TMP, bufsiz);
 
-	/* Fetch interface informations into allocated buffer. */
+	/* Fetch interface information into allocated buffer. */
 	if (sysctl(mib, MIBSIZ, buf, &bufsiz, NULL, 0) < 0) {
 		flog_warn(EC_ZEBRA_SYSCTL_FAILED, "sysctl error by %s",
 			  safe_strerror(errno));
@@ -113,7 +113,7 @@ void interface_list(struct zebra_ns *zns)
 	/* We free this memory at the end of this function. */
 	ref = buf = XMALLOC(MTYPE_TMP, bufsiz);
 
-	/* Fetch interface informations into allocated buffer. */
+	/* Fetch interface information into allocated buffer. */
 	if (sysctl(mib, MIBSIZ, buf, &bufsiz, NULL, 0) < 0) {
 		flog_err_sys(EC_ZEBRA_IFLIST_FAILED,
 			     "Could not enumerate interfaces: %s",
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index 2b5bf04ad..bebccd716 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -97,7 +97,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
 
 	if (len != iplen) {
 		flog_err(EC_ZEBRA_IRDP_LEN_MISMATCH,
-			 "IRDP: RX length doesnt match IP length");
+			 "IRDP: RX length doesn't match IP length");
 		return;
 	}
 
@@ -108,7 +108,7 @@ static void parse_irdp_packet(char *p, int len, struct interface *ifp)
 		return;
 	}
 
-	/* XXX: RAW doesnt receive link-layer, surely? ??? */
+	/* XXX: RAW doesn't receive link-layer, surely? ??? */
 	/* Check so we don't checksum packets longer than oure RX_BUF - (ethlen
 	 +
 	 len of IP-header) 14+20 */
diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 8df5a3764..9c3d9adef 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -469,7 +469,7 @@ int ifm_read(struct if_msghdr *ifm)
 		if (ifnlen && (strncmp(ifp->name, ifname, IFNAMSIZ) != 0)) {
 			if (IS_ZEBRA_DEBUG_KERNEL)
 				zlog_debug(
-					"%s: ifp name %s doesnt match sdl name %s",
+					"%s: ifp name %s doesn't match sdl name %s",
 					__func__, ifp->name, ifname);
 			ifp = NULL;
 		}
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index fdedb30f8..cf704f24b 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -295,7 +295,7 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
 				if (vrf)
 					vty_out(vty, "(vrf %s)", vrf->name);
 				else
-					vty_out(vty, "(vrf UKNOWN)");
+					vty_out(vty, "(vrf UNKNOWN)");
 			}
 
 			if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_DUPLICATE))
@@ -670,7 +670,7 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
 			if (vrf)
 				vty_out(vty, "(vrf %s)", vrf->name);
 			else
-				vty_out(vty, "(vrf UKNOWN)");
+				vty_out(vty, "(vrf UNKNOWN)");
 		}
 
 		if (!CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c
index fe182780b..974b4d5be 100644
--- a/zebra/zebra_vxlan.c
+++ b/zebra/zebra_vxlan.c
@@ -1855,7 +1855,7 @@ static int zvni_gw_macip_del(struct interface *ifp, zebra_vni_t *zvni,
 	/* mac entry should be present */
 	mac = zvni_mac_lookup(zvni, &n->emac);
 	if (!mac) {
-		zlog_debug("MAC %s doesnt exists for neigh %s on VNI %u",
+		zlog_debug("MAC %s doesn't exist for neigh %s on VNI %u",
 			   prefix_mac2str(&n->emac, buf1, sizeof(buf1)),
 			   ipaddr2str(ip, buf2, sizeof(buf2)), zvni->vni);
 		return -1;
@@ -4564,7 +4564,7 @@ void zebra_vxlan_print_specific_rmac_l3vni(struct vty *vty, vni_t l3vni,
 		if (use_json)
 			vty_out(vty, "{}\n");
 		else
-			vty_out(vty, "%% L3-VNI %u doesnt exist\n", l3vni);
+			vty_out(vty, "%% L3-VNI %u doesn't exist\n", l3vni);
 		return;
 	}
 
@@ -4574,7 +4574,7 @@ void zebra_vxlan_print_specific_rmac_l3vni(struct vty *vty, vni_t l3vni,
 			vty_out(vty, "{}\n");
 		else
 			vty_out(vty,
-				"%% Requested RMAC doesnt exist in L3-VNI %u",
+				"%% Requested RMAC doesn't exist in L3-VNI %u",
 				l3vni);
 		return;
 	}