Trivial: Clean up some typos.

Change-Id: I085615fde1f966490f30ed5d32017b8b088cfd59
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

75 files changed, 154 insertions, 154 deletions

diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index 80a5d05aaf4..90e7e60a329 100644
--- a/src/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
@@ -524,7 +524,7 @@ adj_show (vlib_main_t * vm,
 
     if (summary)
     {
-        vlib_cli_output (vm, "Number of adjacenies: %d", pool_elts(adj_pool));
+        vlib_cli_output (vm, "Number of adjacencies: %d", pool_elts(adj_pool));
         vlib_cli_output (vm, "Per-adjacency counters: %s",
                          (adj_are_counters_enabled() ?
                           "enabled":
diff --git a/src/vnet/buffer.h b/src/vnet/buffer.h
index 7e4387bf32b..2a6feb52b05 100644
--- a/src/vnet/buffer.h
+++ b/src/vnet/buffer.h
@@ -197,8 +197,8 @@ typedef struct
       /* Rewrite length */
       u32 save_rewrite_length;
       /*
-       * BIER - the nubmer of bytes in the header.
-       *  the len field inthe header is not authoritative. It's the
+       * BIER - the number of bytes in the header.
+       *  the len field in the header is not authoritative. It's the
        * value in the table that counts.
        */
       struct
@@ -335,7 +335,7 @@ typedef struct
 } vnet_buffer_opaque_t;
 
 /*
- * The opaque field of the vlib_buffer_t is intepreted as a
+ * The opaque field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque_t. Hence it should be big enough to accommodate one.
  */
 STATIC_ASSERT (sizeof (vnet_buffer_opaque_t) <=
@@ -390,7 +390,7 @@ typedef struct
 #define vnet_buffer2(b) ((vnet_buffer_opaque2_t *) (b)->opaque2)
 
 /*
- * The opaque2 field of the vlib_buffer_t is intepreted as a
+ * The opaque2 field of the vlib_buffer_t is interpreted as a
  * vnet_buffer_opaque2_t. Hence it should be big enough to accommodate one.
  */
 STATIC_ASSERT (sizeof (vnet_buffer_opaque2_t) <=
diff --git a/src/vnet/handoff.c b/src/vnet/handoff.c
index 4e635e5d1b0..ffac47e22df 100644
--- a/src/vnet/handoff.c
+++ b/src/vnet/handoff.c
@@ -122,7 +122,7 @@ worker_handoff_node_fn (vlib_main_t * vm,
       hash = (u32) clib_xxhash (hash_key);
 
       /* if input node did not specify next index, then packet
-         should go to eternet-input */
+         should go to ethernet-input */
 
       if (PREDICT_TRUE (is_pow2 (vec_len (ihd0->workers))))
 	index0 = hash & (vec_len (ihd0->workers) - 1);
diff --git a/src/vnet/interface.api b/src/vnet/interface.api
index f91af420f0a..a8d4d71d838 100644
--- a/src/vnet/interface.api
+++ b/src/vnet/interface.api
@@ -100,7 +100,7 @@ autoreply define want_interface_events
     @param interface_name - name of the interface
     @param link_duplex - 1 if half duplex, 2 if full duplex
     @param link_speed - 1 = 10M, 2 = 100M, 4 = 1G, 8 = 10G, 16 = 40G, 32 = 100G
-    @param link_MTU - max. transmittion unit
+    @param link_MTU - max. transmission unit
     @param sub_if_id - A number 0-N to uniquely identify this subif on super if
     @param sub_dot1ad - 0 = dot1q, 1 = dot1ad
     @param sub_dot1ah - 1 = dot1ah, 0 = otherwise
diff --git a/src/vnet/interface.c b/src/vnet/interface.c
index e04ba9b10af..60f11bc3957 100644
--- a/src/vnet/interface.c
+++ b/src/vnet/interface.c
@@ -425,7 +425,7 @@ vnet_sw_interface_set_flags_helper (vnet_main_t * vnm, u32 sw_if_index,
 	    }
 	}
 
-      /* Donot change state for slave link of bonded interfaces */
+      /* Do not change state for slave link of bonded interfaces */
       if (si->flags & VNET_SW_INTERFACE_FLAG_BOND_SLAVE)
 	{
 	  error = clib_error_return
@@ -1366,7 +1366,7 @@ vnet_interface_init (vlib_main_t * vm)
 	    vlib_node_fn_registration_t *fnr = c->tx_fn_registrations;
 	    int priority = -1;
 
-	    /* to avoid confusion, please remove ".tx_function" statiement
+	    /* to avoid confusion, please remove ".tx_function" statement
 	       from VNET_DEVICE_CLASS() if using function candidates */
 	    ASSERT (c->tx_function == 0);
 
@@ -1652,7 +1652,7 @@ default_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
     case IP_LOOKUP_NEXT_ARP:
     case IP_LOOKUP_NEXT_BCAST:
       /*
-       * default rewirte in neighbour adj
+       * default rewrite in neighbour adj
        */
       adj_nbr_update_rewrite
 	(ai,
diff --git a/src/vnet/interface.h b/src/vnet/interface.h
index 30023ebded3..6ca2b0d6cee 100644
--- a/src/vnet/interface.h
+++ b/src/vnet/interface.h
@@ -90,7 +90,7 @@ typedef enum
   VNET_FLOW_DEV_OP_RESET_COUNTER,
 } vnet_flow_dev_op_t;
 
-/* Interface flow opeations callback. */
+/* Interface flow operations callback. */
 typedef int (vnet_flow_dev_ops_function_t) (struct vnet_main_t * vnm,
 					    vnet_flow_dev_op_t op,
 					    u32 hw_if_index, u32 index,
@@ -429,7 +429,7 @@ typedef struct _vnet_hw_interface_class
 			u32 sw_if_index,
 			vnet_link_t link_type, const void *dst_hw_address);
 
-  /* Update an adjacecny added by FIB (as opposed to via the
+  /* Update an adjacency added by FIB (as opposed to via the
    * neighbour resolution protocol). */
   void (*update_adjacency) (struct vnet_main_t * vnm,
 			    u32 sw_if_index, u32 adj_index);
@@ -686,7 +686,7 @@ extern vnet_mtu_t vnet_link_to_mtu (vnet_link_t link);
 
 typedef enum vnet_sw_interface_flags_t_
 {
-  /* Interface is "up" meaning adminstratively up.
+  /* Interface is "up" meaning administratively up.
      Up in the sense of link state being up is maintained by hardware interface. */
   VNET_SW_INTERFACE_FLAG_ADMIN_UP = (1 << 0),
 
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 03434eab671..4ee3372ae28 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -445,7 +445,7 @@ ip_table_bind (fib_protocol_t fproto,
        * If the interface already has in IP address, then a change int
        * VRF is not allowed. The IP address applied must first be removed.
        * We do not do that automatically here, since VPP has no knowledge
-       * of whether thoses subnets are valid in the destination VRF.
+       * of whether those subnets are valid in the destination VRF.
        */
       /* *INDENT-OFF* */
       foreach_ip_interface_address (&ip6_main.lookup_main,
@@ -496,7 +496,7 @@ ip_table_bind (fib_protocol_t fproto,
        * If the interface already has in IP address, then a change int
        * VRF is not allowed. The IP address applied must first be removed.
        * We do not do that automatically here, since VPP has no knowledge
-       * of whether thoses subnets are valid in the destination VRF.
+       * of whether those subnets are valid in the destination VRF.
        */
       /* *INDENT-OFF* */
       foreach_ip_interface_address (&ip4_main.lookup_main,
@@ -1250,7 +1250,7 @@ static void
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/interface_cli.c b/src/vnet/interface_cli.c
index 9271f5b78c5..f234bec9061 100644
--- a/src/vnet/interface_cli.c
+++ b/src/vnet/interface_cli.c
@@ -814,14 +814,14 @@ done:
  * subinterfaces to handle a range of VLAN IDs.
  *
  * - <b>create sub-interfaces <interface> <subId> dot1q|dot1ad <vlanId>|any [exact-match]</b> -
- * Use this command to specify the outer VLAN ID, to either be explicited or to make the
+ * Use this command to specify the outer VLAN ID, to either be explicit or to make the
  * VLAN ID different from the '<em>subId</em>'.
  *
  * - <b>create sub-interfaces <interface> <subId> dot1q|dot1ad <vlanId>|any inner-dot1q
  * <vlanId>|any [exact-match]</b> - Use this command to specify the outer VLAN ID and
- * the innner VLAN ID.
+ * the inner VLAN ID.
  *
- * When '<em>dot1q</em>' or '<em>dot1ad</em>' is explictly entered, subinterfaces
+ * When '<em>dot1q</em>' or '<em>dot1ad</em>' is explicitly entered, subinterfaces
  * can be configured as either exact-match or non-exact match. Non-exact match is the CLI
  * default. If '<em>exact-match</em>' is specified, packets must have the same number of
  * VLAN tags as the configuration. For non-exact-match, packets must at least that number
@@ -964,7 +964,7 @@ set_unnumbered (vlib_main_t * vm,
   if (~0 == unnumbered_sw_if_index)
     return clib_error_return (0, "Specify the unnumbered interface");
   if (enable && ~0 == inherit_from_sw_if_index)
-    return clib_error_return (0, "When enabling unnumberered specify the"
+    return clib_error_return (0, "When enabling unnumbered specify the"
 			      " IP enabled interface that it uses");
 
   vnet_sw_interface_update_unnumbered (unnumbered_sw_if_index,
diff --git a/src/vnet/ipsec-gre/ipsec_gre.c b/src/vnet/ipsec-gre/ipsec_gre.c
index a699a2b5fd8..abf81e05bb9 100644
--- a/src/vnet/ipsec-gre/ipsec_gre.c
+++ b/src/vnet/ipsec-gre/ipsec_gre.c
@@ -89,7 +89,7 @@ format_ipsec_gre_tx_trace (u8 * s, va_list * args)
  * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
  *     - Reset output sw_if_index.
  *
- * <em>Nexd Index:</em>
+ * <em>Next Index:</em>
  * - Dispatches the packet to the esp-encrypt node.
 */
 static uword
diff --git a/src/vnet/ipsec-gre/ipsec_gre_api.c b/src/vnet/ipsec-gre/ipsec_gre_api.c
index 01cc6d75d41..c29b9b8816e 100644
--- a/src/vnet/ipsec-gre/ipsec_gre_api.c
+++ b/src/vnet/ipsec-gre/ipsec_gre_api.c
@@ -138,7 +138,7 @@ static void vl_api_ipsec_gre_tunnel_dump_t_handler
 /*
  * ipsec_gre_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/ipsec/ikev2.c b/src/vnet/ipsec/ikev2.c
index 05a4bab2bc6..bb6818e311c 100644
--- a/src/vnet/ipsec/ikev2.c
+++ b/src/vnet/ipsec/ikev2.c
@@ -3023,7 +3023,7 @@ ikev2_initiate_sa_init (vlib_main_t * vm, u8 * name)
     vec_free (sig_hash_algo);
 
 
-    /* Buffer update and bolierplate */
+    /* Buffer update and boilerplate */
     len += vec_len (chain->data);
     ike0->nextpayload = chain->first_payload_type;
     ike0->length = clib_host_to_net_u32 (len);
@@ -3346,7 +3346,7 @@ ikev2_mngr_process_child_sa (ikev2_sa_t * sa, ikev2_child_sa_t * csa)
 	  else if (csa->rekey_retries > 0)
 	    {
 	      csa->rekey_retries--;
-	      clib_warning ("Rekeing Child SA 0x%x, retries left %d",
+	      clib_warning ("Rekeying Child SA 0x%x, retries left %d",
 			    csa->i_proposals->spi, csa->rekey_retries);
 	      if (csa->rekey_retries == 0)
 		{
diff --git a/src/vnet/ipsec/ikev2.h b/src/vnet/ipsec/ikev2.h
index 84a8be538e9..55731bff975 100644
--- a/src/vnet/ipsec/ikev2.h
+++ b/src/vnet/ipsec/ikev2.h
@@ -193,7 +193,7 @@ typedef enum
 } ikev2_notify_msg_type_t;
 
 #define foreach_ikev2_transform_type       \
-  _(0, UNDEFINED, "undefinded") \
+  _(0, UNDEFINED, "undefined") \
   _(1, ENCR,  "encr")           \
   _(2, PRF,   "prf")            \
   _(3, INTEG, "integ")          \
diff --git a/src/vnet/ipsec/ipsec.api b/src/vnet/ipsec/ipsec.api
index 076583928de..4279e208ec1 100644
--- a/src/vnet/ipsec/ipsec.api
+++ b/src/vnet/ipsec/ipsec.api
@@ -364,7 +364,7 @@ autoreply define ikev2_set_esp_transforms
 
     @param name - IKEv2 profile name
     @param lifetime - SA maximum life time in seconds (0 to disable)
-    @param lifetime_jitter - Jitter added to prevent simultaneounus rekeying
+    @param lifetime_jitter - Jitter added to prevent simultaneous rekeying
     @param handover - Hand over time
     @param lifetime_maxdata - SA maximum life time in bytes (0 to disable)
     
diff --git a/src/vnet/ipsec/ipsec.h b/src/vnet/ipsec/ipsec.h
index 07944a1d227..f9ceae55a05 100644
--- a/src/vnet/ipsec/ipsec.h
+++ b/src/vnet/ipsec/ipsec.h
@@ -286,13 +286,13 @@ typedef struct
   uword *ipsec_if_pool_index_by_key;
   uword *ipsec_if_real_dev_by_show_dev;
 
-  /* node indeces */
+  /* node indices */
   u32 error_drop_node_index;
   u32 esp_encrypt_node_index;
   u32 esp_decrypt_node_index;
   u32 ah_encrypt_node_index;
   u32 ah_decrypt_node_index;
-  /* next node indeces */
+  /* next node indices */
   u32 esp_encrypt_next_index;
   u32 esp_decrypt_next_index;
   u32 ah_encrypt_next_index;
diff --git a/src/vnet/ipsec/ipsec_api.c b/src/vnet/ipsec/ipsec_api.c
index c4284b91478..ffc7f59fb8c 100644
--- a/src/vnet/ipsec/ipsec_api.c
+++ b/src/vnet/ipsec/ipsec_api.c
@@ -889,7 +889,7 @@ static void
 /*
  * ipsec_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/ipsec/ipsec_cli.c b/src/vnet/ipsec/ipsec_cli.c
index 5603fae368a..9cbd2493ed4 100644
--- a/src/vnet/ipsec/ipsec_cli.c
+++ b/src/vnet/ipsec/ipsec_cli.c
@@ -515,7 +515,7 @@ show_ipsec_command_fn (vlib_main_t * vm,
                         format_ip4_address, &p->laddr.start.ip4,
                         format_ip4_address, &p->laddr.stop.ip4,
                         p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
                         format_ip4_address, &p->raddr.start.ip4,
                         format_ip4_address, &p->raddr.stop.ip4,
                         p->rport.start, p->rport.stop);
@@ -570,7 +570,7 @@ show_ipsec_command_fn (vlib_main_t * vm,
                         format_ip4_address, &p->laddr.start.ip4,
                         format_ip4_address, &p->laddr.stop.ip4,
                         p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
                         format_ip4_address, &p->raddr.start.ip4,
                         format_ip4_address, &p->raddr.stop.ip4,
                         p->rport.start, p->rport.stop);
@@ -597,7 +597,7 @@ show_ipsec_command_fn (vlib_main_t * vm,
                         format_ip4_address, &p->laddr.start.ip4,
                         format_ip4_address, &p->laddr.stop.ip4,
                         p->lport.start, p->lport.stop);
-        vlib_cli_output(vm, "   remte addr range %U - %U port range %u - %u",
+        vlib_cli_output(vm, "   remote addr range %U - %U port range %u - %u",
                         format_ip4_address, &p->raddr.start.ip4,
                         format_ip4_address, &p->raddr.stop.ip4,
                         p->rport.start, p->rport.stop);
diff --git a/src/vnet/l2/l2.api b/src/vnet/l2/l2.api
index 3c898db9407..fdb7db7551d 100644
--- a/src/vnet/l2/l2.api
+++ b/src/vnet/l2/l2.api
@@ -135,7 +135,7 @@ autoreply define l2fib_add_del
   u8 bvi_mac;
 };
 
-/** \brief Register to recive L2 MAC events for leanred and aged MAC
+/** \brief Register to receive L2 MAC events for learned and aged MAC
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param learn_limit - MAC learn limit, 0 => default to 1000
@@ -173,7 +173,7 @@ typeonly define mac_entry
 /** \brief L2 MAC event for a list of learned or aged MACs
     @param client_index - opaque cookie to identify the sender
     @param pid - client pid registered to receive notification
-    @param n_macs - number of learned/aged MAC enntries
+    @param n_macs - number of learned/aged MAC entries
     @param mac - array of learned/aged MAC entries
 */
 define l2_macs_event
@@ -240,7 +240,7 @@ autoreply define bridge_domain_set_mac_age
     @param context - sender context, to match reply w/ request
     @param bd_id - the bridge domain to create
     @param flood - enable/disable bcast/mcast flooding in the bd
-    @param uu_flood - enable/disable uknown unicast flood in the bd
+    @param uu_flood - enable/disable unknown unicast flood in the bd
     @param forward - enable/disable forwarding on all interfaces in the bd
     @param learn - enable/disable learning on all interfaces in the bd
     @param arp_term - enable/disable arp termination in the bd
@@ -289,7 +289,7 @@ typeonly manual_print manual_endian define bridge_domain_sw_if
 /** \brief L2 bridge domain operational state response
     @param bd_id - the bridge domain id
     @param flood - bcast/mcast flooding state on all interfaces in the bd
-    @param uu_flood - uknown unicast flooding state on all interfaces in the bd
+    @param uu_flood - unknown unicast flooding state on all interfaces in the bd
     @param forward - forwarding state on all interfaces in the bd
     @param learn - learning state on all interfaces in the bd
     @param arp_term - arp termination state on all interfaces in the bd
diff --git a/src/vnet/l2/l2_api.c b/src/vnet/l2/l2_api.c
index 3a37938e915..ab3a7c6fd64 100644
--- a/src/vnet/l2/l2_api.c
+++ b/src/vnet/l2/l2_api.c
@@ -887,7 +887,7 @@ vl_api_sw_interface_set_vpath_t_handler (vl_api_sw_interface_set_vpath_t * mp)
 /*
  * l2_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/l2/l2_bd.c b/src/vnet/l2/l2_bd.c
index 3a71091a4f3..973beb71cd0 100644
--- a/src/vnet/l2/l2_bd.c
+++ b/src/vnet/l2/l2_bd.c
@@ -727,7 +727,7 @@ VLIB_CLI_COMMAND (bd_arp_term_cli, static) = {
  * 6-byte MAC address directly in the hash table entry uword.
  *
  * @warning This only works for 64-bit processor with 8-byte uword;
- * which means this code *WILL NOT WORK* for a 32-bit prcessor with
+ * which means this code *WILL NOT WORK* for a 32-bit processor with
  * 4-byte uword.
  */
 u32
@@ -742,7 +742,7 @@ bd_add_del_ip_mac (u32 bd_index,
   ASSERT (sizeof (uword) == sizeof (u64));	/* make sure uword is 8 bytes */
   ASSERT (bd_is_valid (bd_cfg));
 
-  mac16[3] = 0;			/* Clear last 2 unsed bytes of the 8-byte MAC address */
+  mac16[3] = 0;			/* Clear last 2 unused bytes of the 8-byte MAC address */
   if (is_ip6)
     {
       ip6_address_t *ip6_addr_key;
@@ -751,7 +751,7 @@ bd_add_del_ip_mac (u32 bd_index,
       if (is_add)
 	{
 	  if (old_mac == 0)
-	    {			/* new entry - allocate and craete ip6 address key */
+	    {			/* new entry - allocate and create ip6 address key */
 	      ip6_addr_key = clib_mem_alloc (sizeof (ip6_address_t));
 	      clib_memcpy (ip6_addr_key, ip_addr, sizeof (ip6_address_t));
 	    }
@@ -760,7 +760,7 @@ bd_add_del_ip_mac (u32 bd_index,
 	      return 0;
 	    }
 	  else
-	    {			/* updat mac for ip6 address */
+	    {			/* update mac for ip6 address */
 	      hp = hash_get_pair (bd_cfg->mac_by_ip6, ip_addr);
 	      ip6_addr_key = (ip6_address_t *) hp->key;
 	    }
diff --git a/src/vnet/l2/l2_fib.c b/src/vnet/l2/l2_fib.c
index dcfee7bf6e2..aa325052487 100644
--- a/src/vnet/l2/l2_fib.c
+++ b/src/vnet/l2/l2_fib.c
@@ -287,7 +287,7 @@ show_l2fib (vlib_main_t * vm,
 }
 
 /*?
- * This command dispays the MAC Address entries of the L2 FIB table.
+ * This command displays the MAC Address entries of the L2 FIB table.
  * Output can be filtered to just get the number of MAC Addresses or display
  * each MAC Address for all bridge domains or just a single bridge domain.
  *
@@ -389,7 +389,7 @@ l2fib_add_entry (const u8 * mac, u32 bd_index,
   /* set up key */
   key.raw = l2fib_make_key (mac, bd_index);
 
-  /* check if entry alread exist */
+  /* check if entry already exist */
   if (BV (clib_bihash_search) (&fm->mac_table, &kv, &kv))
     {
       /* decrement counter if overwriting a learned mac  */
@@ -1070,7 +1070,7 @@ l2fib_scan (vlib_main_t * vm, f64 start_time, u8 event_only)
 		}
 
 	      if (event_only || l2fib_entry_result_is_set_AGE_NOT (&result))
-		continue;	/* skip aging - static_mac alsways age_not */
+		continue;	/* skip aging - static_mac always age_not */
 
 	      /* start aging processing */
 	      u32 bd_index = key.fields.bd_index;
diff --git a/src/vnet/l2/l2_fib.h b/src/vnet/l2/l2_fib.h
index a5050c44bb9..626fbe51a33 100644
--- a/src/vnet/l2/l2_fib.h
+++ b/src/vnet/l2/l2_fib.h
@@ -55,7 +55,7 @@ typedef struct
   /* delay between event scans, default to 100 msec */
   f64 event_scan_delay;
 
-  /* max macs in evet message, default to 100 entries */
+  /* max macs in event message, default to 100 entries */
   u32 max_macs_in_event;
 
   /* convenience variables */
diff --git a/src/vnet/l2/l2_flood.c b/src/vnet/l2/l2_flood.c
index 5d9873e0304..ee3d6d4621f 100644
--- a/src/vnet/l2/l2_flood.c
+++ b/src/vnet/l2/l2_flood.c
@@ -214,7 +214,7 @@ l2flood_node_fn (vlib_main_t * vm,
 	  vec_reset_length (msm->clones[thread_index]);
 
 	  /*
-	   * the header offset needs to be large enoguh to incorporate
+	   * the header offset needs to be large enough to incorporate
 	   * all the L3 headers that could be touched when doing BVI
 	   * processing. So take the current l2 length plus 2 * IPv6
 	   * headers (for tunnel encap)
diff --git a/src/vnet/l2/l2_fwd.c b/src/vnet/l2/l2_fwd.c
index 7744fcdfa2f..0fad124b89f 100644
--- a/src/vnet/l2/l2_fwd.c
+++ b/src/vnet/l2/l2_fwd.c
@@ -515,9 +515,9 @@ done:
  * manage interfaces. It is enabled by default.
  *
  * @cliexpar
- * Example of how to enable fowarding:
+ * Example of how to enable forwarding:
  * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0}
- * Example of how to disable fowarding:
+ * Example of how to disable forwarding:
  * @cliexcmd{set interface l2 forward GigabitEthernet0/8/0 disable}
 ?*/
 /* *INDENT-OFF* */
diff --git a/src/vnet/l2/l2_input.c b/src/vnet/l2/l2_input.c
index 7e41c886dec..1c9ddaac04a 100644
--- a/src/vnet/l2/l2_input.c
+++ b/src/vnet/l2/l2_input.c
@@ -969,7 +969,7 @@ done:
 
 /*?
  * Use this command put an interface into Layer 2 cross-connect mode.
- * Both interfaces must be in this mode for bi-directioal traffic. All
+ * Both interfaces must be in this mode for bi-directional traffic. All
  * packets received on one interface will be transmitted to the other.
  * To remove the Layer 2 cross-connect, put the interface in a different
  * mode, for example Layer 3 mode.
@@ -1122,11 +1122,11 @@ done:
 }
 
 /*?
- * Show the packet processing mode (Layer2 xcross-onnect, Layer 2 bridge,
+ * Show the packet processing mode (Layer2 cross-connect, Layer 2 bridge,
  * Layer 3 routed) of all interfaces and sub-interfaces, or limit the
  * output to just the provided list of interfaces and sub-interfaces.
  * The output shows the mode, the interface, and if the interface is
- * a member of a bridge, the bridge-domain-id and the split horizen group (shg).
+ * a member of a bridge, the bridge-domain-id and the split horizon group (shg).
  *
  * @cliexpar
  * Example of displaying the mode of all interfaces:
@@ -1141,7 +1141,7 @@ done:
  * l2 xconnect GigabitEthernet0/8/0.300 GigabitEthernet0/9/0.300
  * l2 xconnect GigabitEthernet0/9/0.300 GigabitEthernet0/8/0.300
  * @cliexend
- * Example of displaying the mode of a seleted list of interfaces:
+ * Example of displaying the mode of a selected list of interfaces:
  * @cliexstart{show mode GigabitEthernet0/8/0 GigabitEthernet0/8/0.200}
  * l3 GigabitEthernet0/8/0
  * l2 bridge GigabitEthernet0/8/0.200 bd_id 200 shg 0
diff --git a/src/vnet/l2/l2_input.h b/src/vnet/l2/l2_input.h
index 4b303482df9..fb601334f37 100644
--- a/src/vnet/l2/l2_input.h
+++ b/src/vnet/l2/l2_input.h
@@ -222,7 +222,7 @@ vnet_update_l2_len (vlib_buffer_t * b)
   u16 ethertype;
   u8 vlan_count = 0;
 
-  /* point at currrent l2 hdr */
+  /* point at current l2 hdr */
   eth = vlib_buffer_get_current (b);
 
   /*
@@ -253,7 +253,7 @@ vnet_update_l2_len (vlib_buffer_t * b)
  * Compute flow hash of an ethernet packet, use 5-tuple hash if L3 packet
  * is ip4 or ip6. Otherwise hash on smac/dmac/etype.
  * The vlib buffer current pointer is expected to be at ethernet header
- * and vnet l2.l2_len is exppected to be setup already.
+ * and vnet l2.l2_len is expected to be setup already.
  */
 static inline u32
 vnet_l2_compute_flow_hash (vlib_buffer_t * b)
diff --git a/src/vnet/l2/l2_output.c b/src/vnet/l2/l2_output.c
index 321a531e19f..ca95c614cef 100644
--- a/src/vnet/l2/l2_output.c
+++ b/src/vnet/l2/l2_output.c
@@ -480,7 +480,7 @@ typedef enum
  * this sw_if_index, l2-output will send packets for this sw_if_index to the
  * l2-output-bad-intf node which just setup the proper drop reason before
  * sending packets to the error-drop node to drop the packet. Then, stale L2FIB
- * entries for delted tunnels won't cause possible packet or memory corrpution.
+ * entries for deleted tunnels won't cause possible packet or memory corruption.
  */
 
 VLIB_NODE_FN (l2output_bad_intf_node) (vlib_main_t * vm,
diff --git a/src/vnet/l2/l2_output_classify.c b/src/vnet/l2/l2_output_classify.c
index 338fe849660..49a589ccc7d 100644
--- a/src/vnet/l2/l2_output_classify.c
+++ b/src/vnet/l2/l2_output_classify.c
@@ -99,7 +99,7 @@ static char *l2_output_classify_error_strings[] = {
  * @em Uses:
  * - <code>(l2_output_classify_runtime_t *)
  *         rt->classify_table_index_by_sw_if_index</code>
- *	   Head of the per-interface, perprotocol classifier table chain
+ *	   Head of the per-interface, per-protocol classifier table chain
  * 	   for a specific interface. ~0 => send pkts to the next
  * 	   feature in the L2 feature chain.
  * - <code>vnet_buffer(b)->sw_if_index[VLIB_TX]</code>
diff --git a/src/vnet/l2/l2_rw.c b/src/vnet/l2/l2_rw.c
index fec04774056..0b5e970944d 100644
--- a/src/vnet/l2/l2_rw.c
+++ b/src/vnet/l2/l2_rw.c
@@ -22,7 +22,7 @@
  * @brief Layer 2 Rewrite.
  *
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  */
 
 
@@ -439,7 +439,7 @@ l2_rw_entry_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -511,7 +511,7 @@ l2_rw_interface_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -546,7 +546,7 @@ l2_rw_show_interfaces_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
@@ -580,7 +580,7 @@ l2_rw_show_entries_cli_fn (vlib_main_t * vm,
 
 /*?
  * Layer 2-Rewrite node uses classify tables to match packets. Then, using
- * the provisioned mask and value, modfies the packet header.
+ * the provisioned mask and value, modifies the packet header.
  *
  * @cliexpar
  * @todo This is incomplete. This needs a detailed description and a
diff --git a/src/vnet/l2/l2_vtr.c b/src/vnet/l2/l2_vtr.c
index 02a68991376..7096891381d 100644
--- a/src/vnet/l2/l2_vtr.c
+++ b/src/vnet/l2/l2_vtr.c
@@ -177,7 +177,7 @@ l2vtr_configure (vlib_main_t * vlib_main, vnet_main_t * vnet_main, u32 sw_if_ind
   vtr_tag1 = clib_net_to_host_u16 (vtr_tag1);
   vtr_tag2 = clib_net_to_host_u16 (vtr_tag2);
 
-  /* Determine number of vlan tags with explictly configured values */
+  /* Determine number of vlan tags with explicitly configured values */
   cfg_tags = 0;
   if (hw_no_tags || si->sub.eth.flags.no_tags)
     {
diff --git a/src/vnet/l2tp/l2tp.c b/src/vnet/l2tp/l2tp.c
index a59c7893503..300bd53a430 100644
--- a/src/vnet/l2tp/l2tp.c
+++ b/src/vnet/l2tp/l2tp.c
@@ -626,7 +626,7 @@ l2tpv3_interface_enable_disable (vnet_main_t * vnm,
   return 0;
 }
 
-/* Enable/disable L2TPv3 intercept on IP6 fowarding path */
+/* Enable/disable L2TPv3 intercept on IP6 forwarding path */
 static clib_error_t *
 set_ip6_l2tpv3 (vlib_main_t * vm,
 		unformat_input_t * input, vlib_cli_command_t * cmd)
diff --git a/src/vnet/l2tp/l2tp_api.c b/src/vnet/l2tp/l2tp_api.c
index 3c7c19d96b2..0e0e2c2186e 100644
--- a/src/vnet/l2tp/l2tp_api.c
+++ b/src/vnet/l2tp/l2tp_api.c
@@ -217,7 +217,7 @@ out:
 /*
  * l2tp_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index b2c8cd0dfaa..67b1fc4822a 100644
--- a/src/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
@@ -1303,7 +1303,7 @@ vnet_lisp_add_mapping (vnet_lisp_add_del_mapping_args_t * a,
   mi = gid_dictionary_lookup (&lcm->mapping_index_by_gid, &a->eid);
   old_map = ((u32) ~ 0 != mi) ? pool_elt_at_index (lcm->mapping_pool, mi) : 0;
 
-  /* check if none of the locators match localy configured address */
+  /* check if none of the locators match locally configured address */
   vec_foreach (loc, rlocs)
   {
     ip_prefix_t *p = &gid_address_ippref (&loc->address);
@@ -1380,7 +1380,7 @@ vnet_lisp_add_mapping (vnet_lisp_add_del_mapping_args_t * a,
 /**
  * Removes a mapping. Does not program forwarding.
  *
- * @param eid end-host indetifier
+ * @param eid end-host identifier
  * @param res_map_index index of the removed mapping
  * @return return code
  */
@@ -3509,7 +3509,7 @@ lisp_cp_lookup_inline (vlib_main_t * vm,
 	      goto enqueue;
 	    }
 
-	  /* if we have remote mapping for destination already in map-chache
+	  /* if we have remote mapping for destination already in map-cache
 	     add forwarding tunnel directly. If not send a map-request */
 	  di = gid_dictionary_sd_lookup (&lcm->mapping_index_by_gid, &dst,
 					 &src);
@@ -4167,7 +4167,7 @@ send_map_reply (lisp_cp_main_t * lcm, u32 mi, ip_address_t * dst,
 
   if (!ip_fib_get_first_egress_ip_for_dst (lcm, dst, &src))
     {
-      clib_warning ("can't find inteface address for %U", format_ip_address,
+      clib_warning ("can't find interface address for %U", format_ip_address,
 		    dst);
       return -1;
     }
diff --git a/src/vnet/lisp-cp/control.h b/src/vnet/lisp-cp/control.h
index e7040949dda..d8318b5530c 100644
--- a/src/vnet/lisp-cp/control.h
+++ b/src/vnet/lisp-cp/control.h
@@ -265,7 +265,7 @@ typedef struct
   /* enable/disable rloc-probing */
   u8 rloc_probing;
 
-  /* timing wheel for mappping timeouts */
+  /* timing wheel for mapping timeouts */
   timing_wheel_t wheel;
 
   /** Per thread pool of records shared with thread0 */
diff --git a/src/vnet/lisp-cp/gid_dictionary.c b/src/vnet/lisp-cp/gid_dictionary.c
index c3b93301a41..73aecbe3408 100644
--- a/src/vnet/lisp-cp/gid_dictionary.c
+++ b/src/vnet/lisp-cp/gid_dictionary.c
@@ -893,7 +893,7 @@ add_del_sd (gid_dictionary_t * db, u32 vni, source_dest_t * key, u32 value,
 			  sd_src_mac (key), value, is_add);
 
     default:
-      clib_warning ("SD address type %d not supprted!", sd_dst_type (key));
+      clib_warning ("SD address type %d not supported!", sd_dst_type (key));
       break;
     }
 
diff --git a/src/vnet/lisp-cp/lisp.api b/src/vnet/lisp-cp/lisp.api
index b1bea092273..708510cec87 100644
--- a/src/vnet/lisp-cp/lisp.api
+++ b/src/vnet/lisp-cp/lisp.api
@@ -276,7 +276,7 @@ define show_lisp_map_register_state_reply
     @param context - sender context, to match reply w/ request
     @param mode - new map-request mode. Supported values are:
       0 - destination only
-      1 - source/destaination
+      1 - source/destination
 */
 autoreply define lisp_map_request_mode
 {
@@ -594,7 +594,7 @@ define lisp_adjacencies_get
 
 /** \brief Shows relationship between vni and vrf/bd
     @param dp_table - VRF index or bridge domain index
-    @param vni - vitual network instance
+    @param vni - virtual network instance
   */
 define lisp_eid_table_map_details
 {
diff --git a/src/vnet/lisp-cp/lisp_api.c b/src/vnet/lisp-cp/lisp_api.c
index cb21dd1b155..b116ecf4239 100644
--- a/src/vnet/lisp-cp/lisp_api.c
+++ b/src/vnet/lisp-cp/lisp_api.c
@@ -1267,7 +1267,7 @@ vl_api_show_lisp_pitr_t_handler (vl_api_show_lisp_pitr_t * mp)
 /*
  * lisp_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/lisp-cp/lisp_cli.c b/src/vnet/lisp-cp/lisp_cli.c
index b75f0345075..a044d23ed53 100644
--- a/src/vnet/lisp-cp/lisp_cli.c
+++ b/src/vnet/lisp-cp/lisp_cli.c
@@ -834,7 +834,7 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm,
     }
 
   vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
-		   "EID", "type", "locators", "ttl", "autoritative");
+		   "EID", "type", "locators", "ttl", "authoritative");
 
   if (print_all)
     {
diff --git a/src/vnet/lisp-cp/lisp_msg_serdes.c b/src/vnet/lisp-cp/lisp_msg_serdes.c
index aee4f25e6a6..25188b46189 100644
--- a/src/vnet/lisp-cp/lisp_msg_serdes.c
+++ b/src/vnet/lisp-cp/lisp_msg_serdes.c
@@ -119,7 +119,7 @@ nonce_build (u32 seed)
   struct timespec ts;
 
   /* Put nanosecond clock in lower 32-bits and put an XOR of the nanosecond
-   * clock with the seond clock in the upper 32-bits. */
+   * clock with the second clock in the upper 32-bits. */
   syscall (SYS_clock_gettime, CLOCK_REALTIME, &ts);
   nonce_lower = ts.tv_nsec;
   nonce_upper = ts.tv_sec ^ clib_host_to_net_u32 (nonce_lower);
diff --git a/src/vnet/lisp-cp/lisp_types.c b/src/vnet/lisp-cp/lisp_types.c
index d118717ae10..fb3fa6cc33e 100644
--- a/src/vnet/lisp-cp/lisp_types.c
+++ b/src/vnet/lisp-cp/lisp_types.c
@@ -871,7 +871,7 @@ ip_address_copy (ip_address_t * dst, const ip_address_t * src)
 {
   if (IP4 == ip_addr_version (src))
     {
-      /* don't copy any garbe from the union */
+      /* don't copy any garbage from the union */
       memset (dst, 0, sizeof (*dst));
       dst->ip.v4 = src->ip.v4;
       dst->version = IP4;
diff --git a/src/vnet/lisp-cp/one.api b/src/vnet/lisp-cp/one.api
index 7f0f5a9fbb1..f02caf2be96 100644
--- a/src/vnet/lisp-cp/one.api
+++ b/src/vnet/lisp-cp/one.api
@@ -324,7 +324,7 @@ define show_one_map_register_state_reply
     @param context - sender context, to match reply w/ request
     @param mode - new map-request mode. Supported values are:
       0 - destination only
-      1 - source/destaination
+      1 - source/destination
 */
 autoreply define one_map_request_mode
 {
@@ -488,7 +488,7 @@ manual_print manual_endian define one_ndp_entries_get_reply
 /** \brief Set ONE transport protocol
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
-    @param protocol - supported vaules:
+    @param protocol - supported values:
       1: UDP based LISP (default)
       2: binary API
 */
@@ -803,7 +803,7 @@ define one_adjacencies_get
 
 /** \brief Shows relationship between vni and vrf/bd
     @param dp_table - VRF index or bridge domain index
-    @param vni - vitual network instance
+    @param vni - virtual network instance
   */
 define one_eid_table_map_details
 {
diff --git a/src/vnet/lisp-cp/one_api.c b/src/vnet/lisp-cp/one_api.c
index cc8839d66e6..85c5d7e1945 100644
--- a/src/vnet/lisp-cp/one_api.c
+++ b/src/vnet/lisp-cp/one_api.c
@@ -1806,7 +1806,7 @@ vl_api_one_show_petr_mode_t_handler (vl_api_one_show_petr_mode_t * mp)
 /*
  * one_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/lisp-cp/one_cli.c b/src/vnet/lisp-cp/one_cli.c
index d812d00e66b..a11138f822a 100644
--- a/src/vnet/lisp-cp/one_cli.c
+++ b/src/vnet/lisp-cp/one_cli.c
@@ -898,7 +898,7 @@ lisp_map_register_fallback_threshold_show_command_fn (vlib_main_t * vm,
 						      cmd)
 {
   u32 val = vnet_lisp_map_register_fallback_threshold_get ();
-  vlib_cli_output (vm, "map register fallback treshold value: %d", val);
+  vlib_cli_output (vm, "map register fallback threshold value: %d", val);
   return 0;
 }
 
@@ -1150,7 +1150,7 @@ lisp_show_eid_table_command_fn (vlib_main_t * vm,
     }
 
   vlib_cli_output (vm, "%-35s%-20s%-30s%-20s%-s",
-		   "EID", "type", "locators", "ttl", "autoritative");
+		   "EID", "type", "locators", "ttl", "authoritative");
 
   if (print_all)
     {
diff --git a/src/vnet/lldp/lldp_api.c b/src/vnet/lldp/lldp_api.c
index 16904c1db89..28706194513 100644
--- a/src/vnet/lldp/lldp_api.c
+++ b/src/vnet/lldp/lldp_api.c
@@ -123,7 +123,7 @@ vl_api_sw_interface_set_lldp_t_handler (vl_api_sw_interface_set_lldp_t * mp)
 /*
  *  * lldp_api_hookup
  *   * Add vpe's API message handlers to the table.
- *    * vlib has alread mapped shared memory and
+ *    * vlib has already mapped shared memory and
  *     * added the client registration handlers.
  *      * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  *       */
diff --git a/src/vnet/lldp/lldp_node.c b/src/vnet/lldp/lldp_node.c
index acaa5e10e36..2d169b98924 100644
--- a/src/vnet/lldp/lldp_node.c
+++ b/src/vnet/lldp/lldp_node.c
@@ -173,7 +173,7 @@ lldp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
 	{
 	  continue;
 	}
-      /* send packet(s) and schedule another timeut */
+      /* send packet(s) and schedule another timeout */
       const f64 now = vlib_time_now (lm->vlib_main);
       while (1)
 	{
diff --git a/src/vnet/lldp/lldp_output.c b/src/vnet/lldp/lldp_output.c
index 3714e8ff77e..cffe7ba9804 100644
--- a/src/vnet/lldp/lldp_output.c
+++ b/src/vnet/lldp/lldp_output.c
@@ -137,11 +137,11 @@ lldp_add_mgmt_addr (const lldp_intf_t * n, const vnet_hw_interface_t * hw,
     {
       /*
          If no management address is configured, the interface port's MAC
-         addressis sent in one TLV.
+         address is sent in one TLV.
        */
 
       lldp_build_mgmt_addr_tlv (t0p, 1,	/* address subtype: Ipv4 */
-				6,	/* address string lenth */
+				6,	/* address string length */
 				hw->hw_address,	/* address */
 				hw->hw_if_index,	/* if index */
 				vec_len (n->mgmt_oid),	/* OID length */
@@ -152,7 +152,7 @@ lldp_add_mgmt_addr (const lldp_intf_t * n, const vnet_hw_interface_t * hw,
   if (len_ip4)
     {
       lldp_build_mgmt_addr_tlv (t0p, 1,	/* address subtype: Ipv4 */
-				len_ip4,	/* address string lenth */
+				len_ip4,	/* address string length */
 				n->mgmt_ip4,	/* address */
 				hw->hw_if_index,	/* if index */
 				vec_len (n->mgmt_oid),	/* OID length */
@@ -162,7 +162,7 @@ lldp_add_mgmt_addr (const lldp_intf_t * n, const vnet_hw_interface_t * hw,
   if (len_ip6)
     {
       lldp_build_mgmt_addr_tlv (t0p, 2,	/* address subtype: Ipv6 */
-				len_ip6,	/* address string lenth */
+				len_ip6,	/* address string length */
 				n->mgmt_ip6,	/* address */
 				hw->hw_if_index,	/* if index */
 				vec_len (n->mgmt_oid),	/* OID length */
diff --git a/src/vnet/mpls/mpls_tunnel.c b/src/vnet/mpls/mpls_tunnel.c
index 5ccd2b7a37c..1d85c3bc78c 100644
--- a/src/vnet/mpls/mpls_tunnel.c
+++ b/src/vnet/mpls/mpls_tunnel.c
@@ -922,7 +922,7 @@ show_mpls_tunnel_command_fn (vlib_main_t * vm,
     else
     {
         if (pool_is_free_index(mpls_tunnel_pool, mti))
-            return clib_error_return (0, "Not atunnel index %d", mti);
+            return clib_error_return (0, "Not a tunnel index %d", mti);
 
         mt = pool_elt_at_index(mpls_tunnel_pool, mti);
 
diff --git a/src/vnet/policer/node_funcs.c b/src/vnet/policer/node_funcs.c
index 5c185991e8b..594afca2b1b 100644
--- a/src/vnet/policer/node_funcs.c
+++ b/src/vnet/policer/node_funcs.c
@@ -492,7 +492,7 @@ format_policer_classify_trace (u8 * s, va_list * args)
 #define foreach_policer_classify_error                 \
 _(MISS, "Policer classify misses")                     \
 _(HIT, "Policer classify hits")                        \
-_(CHAIN_HIT, "Polcier classify hits after chain walk") \
+_(CHAIN_HIT, "Policer classify hits after chain walk") \
 _(DROP, "Policer classify action drop")
 
 typedef enum
diff --git a/src/vnet/policer/police.h b/src/vnet/policer/police.h
index 34bcf9ca5a8..7065adb6e30 100644
--- a/src/vnet/policer/police.h
+++ b/src/vnet/policer/police.h
@@ -39,7 +39,7 @@ typedef enum
 // The token_per_period computation takes into account the clock speed.
 //
 // The 32-bit bucket/limit supports about 850ms of burst on a 40GE port,
-// or 340ms on a 100GE port. If a larger burst is configued, then the
+// or 340ms on a 100GE port. If a larger burst is configured, then the
 // programmed value is simply capped at 2^32-1. If we needed to support
 // more than that, the bucket and limit fields could be expanded.
 //
diff --git a/src/vnet/policer/policer_api.c b/src/vnet/policer/policer_api.c
index 77efe852e59..d6d6b07ac34 100644
--- a/src/vnet/policer/policer_api.c
+++ b/src/vnet/policer/policer_api.c
@@ -185,7 +185,7 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp)
 /*
  * policer_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/policer/xlate.c b/src/vnet/policer/xlate.c
index af8bc5a9900..5905aa53351 100644
--- a/src/vnet/policer/xlate.c
+++ b/src/vnet/policer/xlate.c
@@ -128,7 +128,7 @@
 #define SSE2_QOS_POL_DEF_BURST_BYTE    100
 
 /*
- * Minimum burst needs to be such that the largest packet size is accomodated
+ * Minimum burst needs to be such that the largest packet size is accommodated
  */
 // Do we need to get it from some lib?
 #define SSE2_QOS_POL_MIN_BURST_BYTE    9*1024
@@ -566,7 +566,7 @@ sse2_pol_convert_cfg_rates_to_hw (sse2_qos_pol_cfg_params_st * cfg,
  *   sse2_pol_get_bkt_max
  *
  * PARAMETERS
- *  rate_hw    - either the averate rate or peak rate
+ *  rate_hw    - either the average rate or peak rate
  *  bkt_max    - bit width in the current bucket or extended bucket
  *
  * RETURNS
@@ -605,7 +605,7 @@ sse2_pol_get_bkt_max (u64 rate_hw, u64 bkt_max)
  *   sse2_pol_get_bkt_value
  *
  * PARAMETERS
- *  rate_hw    - either the averate rate or peak rate
+ *  rate_hw    - either the average rate or peak rate
  *  byte_value - bytes for this token bucket
  *
  * RETURNS
@@ -973,7 +973,7 @@ compute_policer_params (u64 hz,	// CPU speed in clocks per second
   internal_cir_bytes_per_period = (double) cir_rate / period;
   internal_pir_bytes_per_period = (double) pir_rate / period;
 
-  // Scale if possible. Scaling helps rate accuracy, but is contrained
+  // Scale if possible. Scaling helps rate accuracy, but is constrained
   // by the scaled rates and limits fitting in 32-bits.
   // In addition, we need to insure the scaled rate is no larger than
   // 2^22 tokens per period. This allows the dataplane to ignore overflow
diff --git a/src/vnet/policer/xlate.h b/src/vnet/policer/xlate.h
index 16742f80a47..d03930b8813 100644
--- a/src/vnet/policer/xlate.h
+++ b/src/vnet/policer/xlate.h
@@ -82,7 +82,7 @@ typedef enum
  *
  * element: action_type
  *      Action type (see sse2_qos_action_type_en).
- * elemtnt: dscp
+ * element: dscp
  *      DSCP value to set when action is SSE2_QOS_ACTION_MARK_AND_TRANSMIT.
  */
 typedef struct sse2_qos_pol_action_params_st_
diff --git a/src/vnet/qos/qos.api b/src/vnet/qos/qos.api
index 720c41789bd..1960ccb9548 100644
--- a/src/vnet/qos/qos.api
+++ b/src/vnet/qos/qos.api
@@ -34,7 +34,7 @@ enum qos_source
     The QoS bits from the packet at the specified input layer are copied
     into the packet. Recording should be used in conjunction with marking
     @param sw_if_index - The interface on which recording is enabled.
-    @param enable - enable=1 or disable the feautre
+    @param enable - enable=1 or disable the feature
     @param input_source - The input source/layer at which the QoS bits
                           are copied from the packet. See qos_source_t.
 */
@@ -86,7 +86,7 @@ autoreply define qos_egress_map_delete
     into the header of the 'output-source'. Marking should be used in
     conjunction with recording
     @param sw_if_index - The interface on which recording is enabled.
-    @param enable - enable=1 or disable the feautre
+    @param enable - enable=1 or disable the feature
     @param output_source - The output source/layer at which the QoS bits
                            are written into the packet. See qos_source_t.
     @param map_id - The ID of the MAP in which the translation from input
diff --git a/src/vnet/qos/qos_egress_map.h b/src/vnet/qos/qos_egress_map.h
index 92baf6bf3b2..3b6e0b45a43 100644
--- a/src/vnet/qos/qos_egress_map.h
+++ b/src/vnet/qos/qos_egress_map.h
@@ -32,7 +32,7 @@
 typedef u32 qos_egress_map_id_t;
 
 /**
- * For a given output source a table maps each value of every input sorce.
+ * For a given output source a table maps each value of every input source.
  */
 typedef struct qos_egress_map_t_
 {
@@ -55,7 +55,7 @@ extern u8 *format_qos_egress_map (u8 * s, va_list * args);
  * then the configuration is for the 'default' table.
  * If the table is ~0, this is a removal.
  * the egress mapping is applied. For example, is output is MPLS then
- * the QoS markings will occur for MPLS pakcets.
+ * the QoS markings will occur for MPLS packets.
  */
 extern void qos_egress_map_update (qos_egress_map_id_t tid,
 				   qos_source_t input_source,
diff --git a/src/vnet/qos/qos_record.c b/src/vnet/qos/qos_record.c
index 3f43f48d8df..03956345c27 100644
--- a/src/vnet/qos/qos_record.c
+++ b/src/vnet/qos/qos_record.c
@@ -101,7 +101,7 @@ qos_record_disable (u32 sw_if_index, qos_source_t input_source)
 }
 
 /*
- * Disable recording feautre for all protocols when the interface
+ * Disable recording feature for all protocols when the interface
  * is deleted
  */
 static clib_error_t *
@@ -544,7 +544,7 @@ qos_record_cli (vlib_main_t * vm,
 /*?
  * Enable QoS bit recording on an interface using the packet's input DSCP bits
  * Which input QoS bits to use are either; IP, MPLS or VLAN. If more than
- * one protocol is chosen (which is foolish) the higer layers override the
+ * one protocol is chosen (which is foolish) the higher layers override the
  * lower.
  *
  * @cliexpar
diff --git a/src/vnet/qos/qos_types.c b/src/vnet/qos/qos_types.c
index 9fe10cb483d..f5c516feb02 100644
--- a/src/vnet/qos/qos_types.c
+++ b/src/vnet/qos/qos_types.c
@@ -16,7 +16,7 @@
  */
 
 /**
- * QoS tyeps
+ * QoS types
  */
 
 #include <vnet/qos/qos_types.h>
diff --git a/src/vnet/qos/qos_types.h b/src/vnet/qos/qos_types.h
index 6934d041cd8..17bf1d2c443 100644
--- a/src/vnet/qos/qos_types.h
+++ b/src/vnet/qos/qos_types.h
@@ -16,7 +16,7 @@
  */
 
 /**
- * QoS tyeps
+ * QoS types
  */
 
 #ifndef __QOS_TYPES_H__
diff --git a/src/vnet/span/node.c b/src/vnet/span/node.c
index 4ac3a1db496..67f1d6e42bb 100644
--- a/src/vnet/span/node.c
+++ b/src/vnet/span/node.c
@@ -44,7 +44,7 @@ format_span_trace (u8 * s, va_list * args)
 }
 
 #define foreach_span_error                      \
-_(HITS, "SPAN incomming packets processed")
+_(HITS, "SPAN incoming packets processed")
 
 typedef enum
 {
diff --git a/src/vnet/span/span.api b/src/vnet/span/span.api
index 7b2e47c9af5..90812438105 100644
--- a/src/vnet/span/span.api
+++ b/src/vnet/span/span.api
@@ -19,7 +19,7 @@ option version = "1.0.0";
  /** \brief Enable/Disable span to mirror traffic from one interface to another
     @param client_index - opaque cookie to identify the sender
     @param context - sender context which was passed in the request
-    @param sw_if_index_from - interface to be mirorred
+    @param sw_if_index_from - interface to be mirrored
     @param sw_if_index_to - interface where the traffic is mirrored
     @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
     @param is_l2 - 0 = mirror at hw device level, 1 = mirror at L2
@@ -46,7 +46,7 @@ define sw_interface_span_dump {
 
 /** \brief Reply to SPAN dump request
     @param context - sender context which was passed in the request
-    @param sw_if_index_from - mirorred interface
+    @param sw_if_index_from - mirrored interface
     @param sw_if_index_to - interface where the traffic is mirrored
     @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled
     @param is_l2 - 0 = mirrored at hw device level, 1 = mirrored at l2
diff --git a/src/vnet/span/span_api.c b/src/vnet/span/span_api.c
index f96d2677cf7..f05a1c5093e 100644
--- a/src/vnet/span/span_api.c
+++ b/src/vnet/span/span_api.c
@@ -110,7 +110,7 @@ vl_api_sw_interface_span_dump_t_handler (vl_api_sw_interface_span_dump_t * mp)
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/span/span_doc.md b/src/vnet/span/span_doc.md
index 46480b2801a..9f1db0a6c90 100644
--- a/src/vnet/span/span_doc.md
+++ b/src/vnet/span/span_doc.md
@@ -6,11 +6,11 @@ Everything that is not directly obvious should come here.
 
 ## Switched Port Analyzer (SPAN)
 Port mirroring is used on a network switch to send a copy of network packets seen on one switch port to a network monitoring connection on another switch port.
-Can be used by network engineers or administrators to measure performnce, analyze and debug data or diagnose errors on a network.
+Can be used by network engineers or administrators to measure performance, analyze and debug data or diagnose errors on a network.
 
 ### RX traffic node
-There is one static node to mirror incomming packets.
-* span-input: Creates a copy of incomming buffer due to incomming buffers can be reused internally.
+There is one static node to mirror incoming packets.
+* span-input: Creates a copy of incoming buffer due to incoming buffers can be reused internally.
 
 Chaining: dpdk-input -> span-input ->
 * original buffer is sent to ethernet-input for processing
@@ -26,7 +26,7 @@ SPAN supports the following CLI configuration commands:
 destination <if-name>: monitoring interface name
 disable: delete mirroring
 
-#### Enable/Disabl SPAN (API)
+#### Enable/Disable SPAN (API)
 SPAN supports the following API configuration command:
 	sw_interface_span_enable_disable src GigabitEthernet0/8/0 dst GigabitEthernet0/9/0
 	sw_interface_span_enable_disable src_sw_if_index 1 dst_sw_if_index 2
diff --git a/src/vnet/udp/udp_encap.h b/src/vnet/udp/udp_encap.h
index ac8e88b9643..a4cc2a2f3fe 100644
--- a/src/vnet/udp/udp_encap.h
+++ b/src/vnet/udp/udp_encap.h
@@ -21,7 +21,7 @@
 #include <vnet/fib/fib_node.h>
 
 /**
- * UDP encapsualtion.
+ * UDP encapsulation.
  * A representation of the encapsulation of packets in UDP-over-IP.
  * This is encapsulation only, there is no tunnel interface, hence
  * it is uni-directional. For decap register a handler with the UDP port
@@ -29,7 +29,7 @@
  */
 
 /**
- * Fixup behaviour. Actions performed on the encap in the data-plance
+ * Fixup behaviour. Actions performed on the encap in the data-plane
  */
 typedef enum udp_encap_fixup_flags_t_
 {
@@ -41,7 +41,7 @@ typedef enum udp_encap_fixup_flags_t_
 } udp_encap_fixup_flags_t;
 
 /**
- * The UDP encap represenation
+ * The UDP encap representation
  */
 typedef struct udp_encap_t_
 {
@@ -83,7 +83,7 @@ typedef struct udp_encap_t_
   fib_protocol_t ue_ip_proto;
 
   /**
-   * The seond cacheline contains control-plane data
+   * The second cacheline contains control-plane data
    */
     CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
 
diff --git a/src/vnet/unix/tap.api b/src/vnet/unix/tap.api
index 861d4793191..00a1d08ac25 100644
--- a/src/vnet/unix/tap.api
+++ b/src/vnet/unix/tap.api
@@ -21,12 +21,12 @@
 
 option version = "1.0.0";
 
-/** \brief Initialize a new tap interface with the given paramters 
+/** \brief Initialize a new tap interface with the given parameters
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param use_random_mac - let the system generate a unique mac address
     @param tap_name - name to associate with the new interface
-    @param mac_address - mac addr to assign to the interface if use_radom not set
+    @param mac_address - mac addr to assign to the interface if use_random not set
 */
 define tap_connect
 {
@@ -58,13 +58,13 @@ define tap_connect_reply
   u32 sw_if_index;
 };
 
-/** \brief Modify a tap interface with the given paramters 
+/** \brief Modify a tap interface with the given parameters
     @param client_index - opaque cookie to identify the sender
     @param context - sender context, to match reply w/ request
     @param sw_if_index - interface index of existing tap interface
     @param use_random_mac - let the system generate a unique mac address
     @param tap_name - name to associate with the new interface
-    @param mac_address - mac addr to assign to the interface if use_radom not set
+    @param mac_address - mac addr to assign to the interface if use_random not set
 */
 define tap_modify
 {
diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c
index fc1ecb20abd..4a9bd46c31c 100644
--- a/src/vnet/unix/tuntap.c
+++ b/src/vnet/unix/tuntap.c
@@ -711,7 +711,7 @@ tuntap_ip4_add_del_interface_address (ip4_main_t * im,
 
   /* if the address is being applied to an interface that is not in
    * the same table/VRF as this tap, then ignore it.
-   * If we don't do this overlapping address spaces in the diferent tables
+   * If we don't do this overlapping address spaces in the different tables
    * breaks the linux host's routing tables */
   if (fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP4,
 					   sw_if_index) !=
@@ -796,7 +796,7 @@ struct in6_ifreq
  * @brief Add or Del tun/tap interface address.
  *
  * Both the v6 interface address API and the way ifconfig
- * displays subinterfaces differ from their v4 couterparts.
+ * displays subinterfaces differ from their v4 counterparts.
  * The code given here seems to work but YMMV.
  *
  * @param *im - ip6_main_t
@@ -827,7 +827,7 @@ tuntap_ip6_add_del_interface_address (ip6_main_t * im,
 
   /* if the address is being applied to an interface that is not in
    * the same table/VRF as this tap, then ignore it.
-   * If we don't do this overlapping address spaces in the diferent tables
+   * If we don't do this overlapping address spaces in the different tables
    * breaks the linux host's routing tables */
   if (fib_table_get_index_for_sw_if_index (FIB_PROTOCOL_IP6,
 					   sw_if_index) !=
diff --git a/src/vnet/util/throttle.h b/src/vnet/util/throttle.h
index 0c518d3555b..97ebb2597b3 100644
--- a/src/vnet/util/throttle.h
+++ b/src/vnet/util/throttle.h
@@ -21,7 +21,7 @@
 /**
  * @brief A throttle
  *  Used in the data plane to decide if a given hash should be throttled,
- *  i.e. that the hash has been seen alreay 'recently'. Recent is the time
+ *  i.e. that the hash has been seen already 'recently'. Recent is the time
  *  given in the throttle's initialisation.
  */
 typedef struct throttle_t_
diff --git a/src/vnet/vxlan-gbp/decap.c b/src/vnet/vxlan-gbp/decap.c
index 0dc6b545c57..12097986af5 100644
--- a/src/vnet/vxlan-gbp/decap.c
+++ b/src/vnet/vxlan-gbp/decap.c
@@ -274,7 +274,7 @@ vxlan_gbp_input (vlib_main_t * vm,
 	  u8 error0 = 0, error1 = 0;
 	  u8 flags0 = vxlan_gbp_get_flags (vxlan_gbp0);
 	  u8 flags1 = vxlan_gbp_get_flags (vxlan_gbp1);
-	  /* Validate VXLAN_GBP tunnel encap-fib index agaist packet */
+	  /* Validate VXLAN_GBP tunnel encap-fib index against packet */
 	  if (PREDICT_FALSE
 	      (t0 == 0 || flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)))
 	    {
@@ -311,7 +311,7 @@ vxlan_gbp_input (vlib_main_t * vm,
 	      pkts_decapsulated++;
 	    }
 
-	  /* Validate VXLAN_GBP tunnel encap-fib index agaist packet */
+	  /* Validate VXLAN_GBP tunnel encap-fib index against packet */
 	  if (PREDICT_FALSE
 	      (t1 == 0 || flags1 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)))
 	    {
@@ -415,7 +415,7 @@ vxlan_gbp_input (vlib_main_t * vm,
 	  u32 next0;
 	  u8 error0 = 0;
 	  u8 flags0 = vxlan_gbp_get_flags (vxlan_gbp0);
-	  /* Validate VXLAN_GBP tunnel encap-fib index agaist packet */
+	  /* Validate VXLAN_GBP tunnel encap-fib index against packet */
 	  if (PREDICT_FALSE
 	      (t0 == 0 || flags0 != (VXLAN_GBP_FLAGS_I | VXLAN_GBP_FLAGS_G)))
 	    {
diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.c b/src/vnet/vxlan-gbp/vxlan_gbp.c
index 253261dc9e5..d01a16799ef 100644
--- a/src/vnet/vxlan-gbp/vxlan_gbp.c
+++ b/src/vnet/vxlan-gbp/vxlan_gbp.c
@@ -506,8 +506,8 @@ int vnet_vxlan_gbp_tunnel_add_del
       else
 	{
 	  /* Multicast tunnel -
-	   * as the same mcast group can be used for mutiple mcast tunnels
-	   * with different VNIs, create the output fib adjecency only if
+	   * as the same mcast group can be used for multiple mcast tunnels
+	   * with different VNIs, create the output fib adjacency only if
 	   * it does not already exist
 	   */
 	  fib_protocol_t fp = fib_ip_proto (is_ip6);
@@ -820,7 +820,7 @@ vxlan_gbp_tunnel_add_del_command_fn (vlib_main_t * vm,
  * Example of how to create a VXLAN Tunnel with a known name, vxlan_gbp_tunnel42:
  * @cliexcmd{create vxlan_gbp tunnel src 10.0.3.1 dst 10.0.3.3 instance 42}
  * Example of how to create a multicast VXLAN Tunnel with a known name, vxlan_gbp_tunnel23:
- * @cliexcmd{create vxlan_gbp tunnel src 10.0.3.1 group 239.1.1.1 GigabitEtherner0/8/0 instance 23}
+ * @cliexcmd{create vxlan_gbp tunnel src 10.0.3.1 group 239.1.1.1 GigabitEthernet0/8/0 instance 23}
  * Example of how to delete a VXLAN Tunnel:
  * @cliexcmd{create vxlan_gbp tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del}
  ?*/
@@ -986,7 +986,7 @@ set_ip4_vxlan_gbp_bypass (vlib_main_t * vm,
  *                                   ip4-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
@@ -1043,7 +1043,7 @@ set_ip6_vxlan_gbp_bypass (vlib_main_t * vm,
  *                                   ip6-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
diff --git a/src/vnet/vxlan-gbp/vxlan_gbp.h b/src/vnet/vxlan-gbp/vxlan_gbp.h
index 472866ecd6d..755205fc9ea 100644
--- a/src/vnet/vxlan-gbp/vxlan_gbp.h
+++ b/src/vnet/vxlan-gbp/vxlan_gbp.h
@@ -109,7 +109,7 @@ typedef struct
   adj_index_t mcast_adj_index;
 
   /**
-   * The tunnel is a child of the FIB entry for its destintion. This is
+   * The tunnel is a child of the FIB entry for its destination. This is
    * so it receives updates when the forwarding information for that entry
    * changes.
    * The tunnels sibling index on the FIB entry's dependency list.
diff --git a/src/vnet/vxlan-gbp/vxlan_gbp_api.c b/src/vnet/vxlan-gbp/vxlan_gbp_api.c
index 1bba74d6370..cf3f7fe9670 100644
--- a/src/vnet/vxlan-gbp/vxlan_gbp_api.c
+++ b/src/vnet/vxlan-gbp/vxlan_gbp_api.c
@@ -187,7 +187,7 @@ static void vl_api_vxlan_gbp_tunnel_dump_t_handler
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index ceec2529063..b511a7dbdd4 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -631,8 +631,8 @@ int vnet_vxlan_gpe_add_del_tunnel
       else
 	{
 	  /* Multicast tunnel -
-	   * as the same mcast group can be used for mutiple mcast tunnels
-	   * with different VNIs, create the output fib adjecency only if
+	   * as the same mcast group can be used for multiple mcast tunnels
+	   * with different VNIs, create the output fib adjacency only if
 	   * it does not already exist
 	   */
 	  fib_protocol_t fp = fib_ip_proto (is_ip6);
@@ -972,7 +972,7 @@ done:
  * center or be separated geographically as long as they are reachable
  * through the underlay L3 network.
  *
- * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE sengment.
+ * You can refer to this kind of L2 overlay bridge domain as a VXLAN-GPE segment.
  *
  * @cliexpar
  * Example of how to create a VXLAN-GPE Tunnel:
@@ -1130,7 +1130,7 @@ set_ip4_vxlan_gpe_bypass (vlib_main_t * vm,
  *                                 ip4-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
@@ -1187,7 +1187,7 @@ set_ip6_vxlan_gpe_bypass (vlib_main_t * vm,
  *                                 ip6-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h
index 794ed7ef706..b93487b08fe 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe.h
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.h
@@ -155,7 +155,7 @@ typedef struct
   adj_index_t mcast_adj_index;
 
   /**
-   * The tunnel is a child of the FIB entry for its desintion. This is
+   * The tunnel is a child of the FIB entry for its destination. This is
    * so it receives updates when the forwarding information for that entry
    * changes.
    * The tunnels sibling index on the FIB entry's dependency list.
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe_api.c b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
index a710bb5e2a1..e23b2fed033 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe_api.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe_api.c
@@ -217,7 +217,7 @@ static void vl_api_vxlan_gpe_tunnel_dump_t_handler
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/vxlan/decap.c b/src/vnet/vxlan/decap.c
index 7c1b6b1c26c..3ae70c9f011 100644
--- a/src/vnet/vxlan/decap.c
+++ b/src/vnet/vxlan/decap.c
@@ -266,7 +266,7 @@ vxlan_input (vlib_main_t * vm,
       u32 len0 = vlib_buffer_length_in_chain (vm, b[0]);
       u32 len1 = vlib_buffer_length_in_chain (vm, b[1]);
 
-      /* Validate VXLAN tunnel encap-fib index agaist packet */
+      /* Validate VXLAN tunnel encap-fib index against packet */
       if (PREDICT_FALSE (error0 != 0))
 	{
 	  next[0] = VXLAN_INPUT_NEXT_DROP;
@@ -293,7 +293,7 @@ vxlan_input (vlib_main_t * vm,
 	    (rx_counter, thread_index, stats_t0->sw_if_index, 1, len0);
 	}
 
-      /* Validate VXLAN tunnel encap-fib index agaist packet */
+      /* Validate VXLAN tunnel encap-fib index against packet */
       if (PREDICT_FALSE (error1 != 0))
 	{
 	  next[1] = VXLAN_INPUT_NEXT_DROP;
@@ -371,7 +371,7 @@ vxlan_input (vlib_main_t * vm,
       error0 = t0 == 0 ? VXLAN_ERROR_NO_SUCH_TUNNEL : error0;
       uword len0 = vlib_buffer_length_in_chain (vm, b[0]);
 
-      /* Validate VXLAN tunnel encap-fib index agaist packet */
+      /* Validate VXLAN tunnel encap-fib index against packet */
       if (PREDICT_FALSE (error0 != 0))
 	{
 	  next[0] = VXLAN_INPUT_NEXT_DROP;
diff --git a/src/vnet/vxlan/vxlan.c b/src/vnet/vxlan/vxlan.c
index ce565541a37..0d5337ea146 100644
--- a/src/vnet/vxlan/vxlan.c
+++ b/src/vnet/vxlan/vxlan.c
@@ -513,8 +513,8 @@ int vnet_vxlan_add_del_tunnel
       else
 	{
 	  /* Multicast tunnel -
-	   * as the same mcast group can be used for mutiple mcast tunnels
-	   * with different VNIs, create the output fib adjecency only if
+	   * as the same mcast group can be used for multiple mcast tunnels
+	   * with different VNIs, create the output fib adjacency only if
 	   * it does not already exist
 	   */
 	  fib_protocol_t fp = fib_ip_proto (is_ip6);
@@ -830,7 +830,7 @@ vxlan_add_del_tunnel_command_fn (vlib_main_t * vm,
  * Example of how to create a VXLAN Tunnel with a known name, vxlan_tunnel42:
  * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 instance 42}
  * Example of how to create a multicast VXLAN Tunnel with a known name, vxlan_tunnel23:
- * @cliexcmd{create vxlan tunnel src 10.0.3.1 group 239.1.1.1 GigabitEtherner0/8/0 instance 23}
+ * @cliexcmd{create vxlan tunnel src 10.0.3.1 group 239.1.1.1 GigabitEthernet0/8/0 instance 23}
  * Example of how to delete a VXLAN Tunnel:
  * @cliexcmd{create vxlan tunnel src 10.0.3.1 dst 10.0.3.3 vni 13 del}
  ?*/
@@ -996,7 +996,7 @@ set_ip4_vxlan_bypass (vlib_main_t * vm,
  *                                 ip4-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
@@ -1053,7 +1053,7 @@ set_ip6_vxlan_bypass (vlib_main_t * vm,
  *                                 ip6-lookup [2]
  * @cliexend
  *
- * Example of how to display the feature enabed on an interface:
+ * Example of how to display the feature enabled on an interface:
  * @cliexstart{show ip interface features GigabitEthernet2/0/0}
  * IP feature paths configured on GigabitEthernet2/0/0...
  * ...
@@ -1186,7 +1186,7 @@ vxlan_offload_command_fn (vlib_main_t * vm,
 VLIB_CLI_COMMAND (vxlan_offload_command, static) = {
     .path = "set flow-offload vxlan",
     .short_help =
-    "set flow-offload vxlan hw <inerface-name> rx <tunnel-name> [del]",
+    "set flow-offload vxlan hw <interface-name> rx <tunnel-name> [del]",
     .function = vxlan_offload_command_fn,
 };
 /* *INDENT-ON* */
diff --git a/src/vnet/vxlan/vxlan.h b/src/vnet/vxlan/vxlan.h
index 2c309bb8242..7399b19e387 100644
--- a/src/vnet/vxlan/vxlan.h
+++ b/src/vnet/vxlan/vxlan.h
@@ -100,7 +100,7 @@ typedef struct
   adj_index_t mcast_adj_index;
 
   /**
-   * The tunnel is a child of the FIB entry for its desintion. This is
+   * The tunnel is a child of the FIB entry for its destination. This is
    * so it receives updates when the forwarding information for that entry
    * changes.
    * The tunnels sibling index on the FIB entry's dependency list.
@@ -178,7 +178,7 @@ typedef struct
   u8 is_add;
 
   /* we normally use is_ip4, but since this adds to the
-   * structure, this seems less of abreaking change */
+   * structure, this seems less of a breaking change */
   u8 is_ip6;
   u32 instance;
   ip46_address_t src, dst;
diff --git a/src/vnet/vxlan/vxlan_api.c b/src/vnet/vxlan/vxlan_api.c
index 41de44eba15..512cc896650 100644
--- a/src/vnet/vxlan/vxlan_api.c
+++ b/src/vnet/vxlan/vxlan_api.c
@@ -244,7 +244,7 @@ static void vl_api_vxlan_tunnel_dump_t_handler
 /*
  * vpe_api_hookup
  * Add vpe's API message handlers to the table.
- * vlib has alread mapped shared memory and
+ * vlib has already mapped shared memory and
  * added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */