fixing typos

Change-Id: I215e1e0208a073db80ec6f87695d734cf40fabe3
Signed-off-by: Jim Thompson <jim@netgate.com>

41 files changed, 61 insertions, 61 deletions

diff --git a/docs/usecases/vmxnet3.rst b/docs/usecases/vmxnet3.rst
index 3fde0f45ae5..f3ec8d4b6f6 100644
--- a/docs/usecases/vmxnet3.rst
+++ b/docs/usecases/vmxnet3.rst
@@ -52,7 +52,7 @@ These instructions describe how to change the e1000 driver for VMware fusion.
 * Find the name associated with the VM you are using, right click on it and
   select **Show Package Contents**
 * Find the **.vmx** file and edit it.
-* Find all the occurences of **e1000** and change them to **vmxnet3**
+* Find all the occurrences of **e1000** and change them to **vmxnet3**
 
 If you are concerned more with configuration not performance the vmxnet3 driver
 can be set to **interrupt** mode in VPP. This will save a great deal on battery
diff --git a/extras/libmemif/docs/devperftest_doc.md b/extras/libmemif/docs/devperftest_doc.md
index 45741457b6c..92f21c0b09d 100644
--- a/extras/libmemif/docs/devperftest_doc.md
+++ b/extras/libmemif/docs/devperftest_doc.md
@@ -16,7 +16,7 @@ icmpr-epoll:
 ```
 conn 0 0 1
 ```
-> Last argument specifies interrupt function to use. This function only respondes to ARP requests. This is important because, packet generation and transmitting is handled by a separate thread. Calling memif_tx_burst from multiple threads writing on same queue could transmit uninitialized buffers.
+> Last argument specifies interrupt function to use. This function only responds to ARP requests. This is important because, packet generation and transmitting is handled by a separate thread. Calling memif_tx_burst from multiple threads writing on same queue could transmit uninitialized buffers.
 Once connection is established, you can send ping from VPP to icmpr-epoll app to learn its mac address.
 ```
 DBGvpp# ping 192.168.1.2
diff --git a/extras/vom/vom/bond_interface.hpp b/extras/vom/vom/bond_interface.hpp
index 4584bd14be2..74bc08bbbba 100644
--- a/extras/vom/vom/bond_interface.hpp
+++ b/extras/vom/vom/bond_interface.hpp
@@ -51,7 +51,7 @@ public:
      */
     const static mode_t LACP;
     /**
-     * Unspecificed bond interface mode
+     * Unspecified bond interface mode
      */
     const static mode_t UNSPECIFIED;
 
@@ -85,7 +85,7 @@ public:
      */
     const static lb_t L23;
     /**
-     * Unspecificed bond interface lb
+     * Unspecified bond interface lb
      */
     const static lb_t UNSPECIFIED;
 
diff --git a/extras/vom/vom/gbp_bridge_domain.hpp b/extras/vom/vom/gbp_bridge_domain.hpp
index 64429fc730e..44cf29956ef 100644
--- a/extras/vom/vom/gbp_bridge_domain.hpp
+++ b/extras/vom/vom/gbp_bridge_domain.hpp
@@ -30,7 +30,7 @@ class gbp_bridge_domain : public object_base
 {
 public:
   /**
-   * The key for a bridge_domain is the pari of EPG-IDs
+   * The key for a bridge_domain is the pair of EPG-IDs
    */
   typedef bridge_domain::key_t key_t;
 
diff --git a/extras/vom/vom/gbp_contract.hpp b/extras/vom/vom/gbp_contract.hpp
index 7775638bb9f..a8e15fb7976 100644
--- a/extras/vom/vom/gbp_contract.hpp
+++ b/extras/vom/vom/gbp_contract.hpp
@@ -37,7 +37,7 @@ public:
   typedef std::set<gbp_rule> gbp_rules_t;
 
   /**
-   * The key for a contract is the pari of EPG-IDs
+   * The key for a contract is the pair of EPG-IDs
    */
   typedef std::pair<sclass_t, sclass_t> key_t;
 
diff --git a/extras/vom/vom/gbp_route_domain.hpp b/extras/vom/vom/gbp_route_domain.hpp
index 3d877d47e57..d2dc049deff 100644
--- a/extras/vom/vom/gbp_route_domain.hpp
+++ b/extras/vom/vom/gbp_route_domain.hpp
@@ -30,7 +30,7 @@ class gbp_route_domain : public object_base
 {
 public:
   /**
-   * The key for a route_domain is the pari of EPG-IDs
+   * The key for a route_domain is the pair of EPG-IDs
    */
   typedef route_domain::key_t key_t;
 
diff --git a/src/plugins/l2e/l2e_api.c b/src/plugins/l2e/l2e_api.c
index d2658ddc51e..92a13f855f3 100644
--- a/src/plugins/l2e/l2e_api.c
+++ b/src/plugins/l2e/l2e_api.c
@@ -82,7 +82,7 @@ vl_api_l2_emulation_t_handler (vl_api_l2_emulation_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/plugins/unittest/fib_test.c b/src/plugins/unittest/fib_test.c
index fada2f81f52..d631350aa89 100644
--- a/src/plugins/unittest/fib_test.c
+++ b/src/plugins/unittest/fib_test.c
@@ -4585,7 +4585,7 @@ fib_test_v6 (void)
     adj_unlock(locked_ai);
 
     /*
-     * no more entires. +1 shared path-list
+     * no more entries. +1 shared path-list
      */
     FIB_TEST((1 == fib_path_list_db_size()),   "path list DB population:%d",
              fib_path_list_db_size());
@@ -4613,7 +4613,7 @@ fib_test_v6 (void)
              "Default route is DROP");
 
     /*
-     * no more entires. -1 shared path-list
+     * no more entries. -1 shared path-list
      */
     FIB_TEST((0 == fib_path_list_db_size()),   "path list DB population:%d",
              fib_path_list_db_size());
@@ -5534,7 +5534,7 @@ fib_test_ae (void)
 
     /*
      * remove the attached route from the 2nd FIB. expect the imported
-     * entires to be removed
+     * entries to be removed
      */
     local_pfx.fp_len = 24;
     fib_table_entry_delete(import_fib_index2,
@@ -5561,7 +5561,7 @@ fib_test_ae (void)
 
     /*
      * modify the route in FIB1 so it is no longer attached. expect the imported
-     * entires to be removed
+     * entries to be removed
      */
     local_pfx.fp_len = 24;
     fib_table_entry_update_one_path(import_fib_index1,
@@ -7828,7 +7828,7 @@ fib_test_walk (void)
     FOR_EACH_TEST_CHILD(tc)
     {
         /*
-         * we don't really care how many times the children are visisted, as long as
+         * we don't really care how many times the children are visited, as long as
          * it is more than once.
          */
         FIB_TEST(1 <= vec_len(tc->ctxs),
@@ -7850,7 +7850,7 @@ fib_test_walk (void)
     FOR_EACH_TEST_CHILD(tc)
     {
         /*
-         * we don't really care how many times the children are visisted, as long as
+         * we don't really care how many times the children are visited, as long as
          * it is more than once.
          */
         FIB_TEST(1 <= vec_len(tc->ctxs),
diff --git a/src/vnet/adj/adj_nbr.c b/src/vnet/adj/adj_nbr.c
index aa36b64f6bf..cbd6691f78f 100644
--- a/src/vnet/adj/adj_nbr.c
+++ b/src/vnet/adj/adj_nbr.c
@@ -291,7 +291,7 @@ adj_nbr_add_or_lock_w_rewrite (fib_protocol_t nh_proto,
  * adj_nbr_update_rewrite
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewrite is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
@@ -333,7 +333,7 @@ adj_nbr_update_rewrite (adj_index_t adj_index,
  * adj_nbr_update_rewrite_internal
  *
  * Update the adjacency's rewrite string. A NULL string implies the
- * rewrite is reset (i.e. when ARP/ND etnry is gone).
+ * rewrite is reset (i.e. when ARP/ND entry is gone).
  * NB: the adj being updated may be handling traffic in the DP.
  */
 void
diff --git a/src/vnet/adj/adj_nbr.h b/src/vnet/adj/adj_nbr.h
index 5d0f8444ec3..3a89dc89a22 100644
--- a/src/vnet/adj/adj_nbr.h
+++ b/src/vnet/adj/adj_nbr.h
@@ -91,7 +91,7 @@ typedef enum adj_nbr_rewrite_flag_t_
 
     /**
      * An indication that the rewrite is complete, i.e. that it fully describes
-     * the link-layer addressing for the desintation.
+     * the link-layer addressing for the destintation.
      * The opposite of this is an incomplete rewrite that describes the ARP/ND
      * rewrite when probing.
      */
diff --git a/src/vnet/bier/bier_disp_entry.c b/src/vnet/bier/bier_disp_entry.c
index 98508addfe0..c1437768dd6 100644
--- a/src/vnet/bier/bier_disp_entry.c
+++ b/src/vnet/bier/bier_disp_entry.c
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 /**
- * bier_dispositon : The BIER disposition object
+ * bier_disposition : The BIER disposition object
  *
  * A BIER disposition object is present in the IP mcast output list
  * and represents the disposition of a BIER bitmask. After BIER header
diff --git a/src/vnet/bier/bier_disp_entry.h b/src/vnet/bier/bier_disp_entry.h
index 1647a7e166a..db381a84d36 100644
--- a/src/vnet/bier/bier_disp_entry.h
+++ b/src/vnet/bier/bier_disp_entry.h
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 /**
- * bier_dispositon : The BIER dispositon object
+ * bier_disposition : The BIER disposition object
  *
- * A BIER dispositon object is used to pop the BIER header for for-us
+ * A BIER disposition object is used to pop the BIER header for for-us
  * packets and steer the packet down the payload protocol specific graph
  */
 
@@ -27,7 +27,7 @@
 #include <vnet/dpo/dpo.h>
 
 /**
- * The BIER dispositon object
+ * The BIER disposition object
  */
 typedef struct bier_disp_entry_t_ {
     /**
diff --git a/src/vnet/bier/bier_imp.h b/src/vnet/bier/bier_imp.h
index cdc4dbb4fc1..f458772b668 100644
--- a/src/vnet/bier/bier_imp.h
+++ b/src/vnet/bier/bier_imp.h
@@ -17,7 +17,7 @@
  *
  * A BIER imposition object is present in the IP mcast output list
  * and represents the imposition of a BIER bitmask. After BIER header
- * imposition the packet is forward within the appropriate/specifid
+ * imposition the packet is forward within the appropriate/specified
  * BIER table
  */
 
diff --git a/src/vnet/bier/bier_lookup.c b/src/vnet/bier/bier_lookup.c
index c57c81d7aa9..402bcbce7dc 100644
--- a/src/vnet/bier/bier_lookup.c
+++ b/src/vnet/bier/bier_lookup.c
@@ -67,7 +67,7 @@ typedef enum {
 vlib_node_registration_t bier_lookup_node;
 
 /**
- * @brief Packet trace recoed for a BIER lookup
+ * @brief Packet trace record for a BIER lookup
  */
 typedef struct bier_lookup_trace_t_
 {
diff --git a/src/vnet/classify/classify_api.c b/src/vnet/classify/classify_api.c
index 08defd4ecdd..98f4366bf9e 100644
--- a/src/vnet/classify/classify_api.c
+++ b/src/vnet/classify/classify_api.c
@@ -638,7 +638,7 @@ static void vl_api_output_acl_set_interface_t_handler
 /*
  * classify_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/cop/cop_api.c b/src/vnet/cop/cop_api.c
index 95d5a9fea7a..0b8a5a26ce9 100644
--- a/src/vnet/cop/cop_api.c
+++ b/src/vnet/cop/cop_api.c
@@ -91,7 +91,7 @@ static void vl_api_cop_whitelist_enable_disable_t_handler
 /*
  * cop_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/devices/af_packet/af_packet_api.c b/src/vnet/devices/af_packet/af_packet_api.c
index 3dc18b1e96a..48f0588b3a1 100644
--- a/src/vnet/devices/af_packet/af_packet_api.c
+++ b/src/vnet/devices/af_packet/af_packet_api.c
@@ -151,7 +151,7 @@ vl_api_af_packet_dump_t_handler (vl_api_af_packet_dump_t * mp)
 /*
  * af_packet_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/devices/netmap/netmap_api.c b/src/vnet/devices/netmap/netmap_api.c
index 9a393b1fda4..3959615fb99 100644
--- a/src/vnet/devices/netmap/netmap_api.c
+++ b/src/vnet/devices/netmap/netmap_api.c
@@ -87,7 +87,7 @@ vl_api_netmap_delete_t_handler (vl_api_netmap_delete_t * mp)
 /*
  * netmap_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/devices/pipe/pipe_api.c b/src/vnet/devices/pipe/pipe_api.c
index 1dcb8bc76c6..1466681949f 100644
--- a/src/vnet/devices/pipe/pipe_api.c
+++ b/src/vnet/devices/pipe/pipe_api.c
@@ -127,7 +127,7 @@ vl_api_pipe_dump_t_handler (vl_api_pipe_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/devices/virtio/vhost_user_api.c b/src/vnet/devices/virtio/vhost_user_api.c
index acfb3e089f4..8142cf352ed 100644
--- a/src/vnet/devices/virtio/vhost_user_api.c
+++ b/src/vnet/devices/virtio/vhost_user_api.c
@@ -213,7 +213,7 @@ static void
 /*
  * vhost-user_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/dpo/punt_dpo.c b/src/vnet/dpo/punt_dpo.c
index d1661dcc8e0..3ad91e10fc6 100644
--- a/src/vnet/dpo/punt_dpo.c
+++ b/src/vnet/dpo/punt_dpo.c
@@ -41,7 +41,7 @@ punt_dpo_lock (dpo_id_t *dpo)
     /*
      * not maintaining a lock count on the punt
      * more trouble than it's worth.
-     * There always needs to be one around. no point it managaing its lifetime
+     * There always needs to be one around. no point it managing its lifetime
      */
 }
 static void
diff --git a/src/vnet/ethernet/p2p_ethernet_api.c b/src/vnet/ethernet/p2p_ethernet_api.c
index f2c730b4d25..3f537168a8e 100644
--- a/src/vnet/ethernet/p2p_ethernet_api.c
+++ b/src/vnet/ethernet/p2p_ethernet_api.c
@@ -87,7 +87,7 @@ vl_api_p2p_ethernet_del_t_handler (vl_api_p2p_ethernet_del_t * mp)
 /*
  * p2p_ethernet_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/fib/fib_bfd.c b/src/vnet/fib/fib_bfd.c
index 734ee8cc91c..ae7ceec1a6b 100644
--- a/src/vnet/fib/fib_bfd.c
+++ b/src/vnet/fib/fib_bfd.c
@@ -161,7 +161,7 @@ fib_bfd_notify (bfd_listen_event_e event,
         {
             /*
              * has an associated BFD tracking delegate
-             * usource the entry and remove the BFD tracking deletgate
+             * usource the entry and remove the BFD tracking delegate
              */
             fib_entry_delegate_remove(fib_entry_get(fei),
                                       FIB_ENTRY_DELEGATE_BFD);
diff --git a/src/vnet/fib/fib_path_list.c b/src/vnet/fib/fib_path_list.c
index 4e110fba9f0..f1d54430d66 100644
--- a/src/vnet/fib/fib_path_list.c
+++ b/src/vnet/fib/fib_path_list.c
@@ -29,7 +29,7 @@
 /**
  * The magic number of child entries that make a path-list popular.
  * There's a trade-off here between convergnece and forwarding speed.
- * Popular path-lists generate load-balance maps for the entires that
+ * Popular path-lists generate load-balance maps for the entries that
  * use them. If the map is present there is a switch path cost to indirect
  * through the map - this indirection provides the fast convergence - so
  * without the map convergence is slower.
diff --git a/src/vnet/fib/fib_walk.c b/src/vnet/fib/fib_walk.c
index a2674562b3b..fca1bfe13d8 100644
--- a/src/vnet/fib/fib_walk.c
+++ b/src/vnet/fib/fib_walk.c
@@ -87,7 +87,7 @@ typedef struct fib_walk_t_
     /**
      * The reasons this walk is occuring.
      * This is a vector ordered in time. The reasons and the front were started
-     * first, and so should be acted first when a node is visisted.
+     * first, and so should be acted first when a node is visited.
      */
     fib_node_back_walk_ctx_t *fw_ctx;
 } fib_walk_t;
@@ -161,7 +161,7 @@ static fib_walk_queues_t fib_walk_queues;
 static const char * const fib_walk_priority_names[] = FIB_WALK_PRIORITIES;
 
 /**
- * @brief Histogram stats on the lenths of each walk in elemenets visisted.
+ * @brief Histogram stats on the lenths of each walk in elemenets visited.
  * Store upto 1<<23 elements in increments of 1<<10
  */
 #define HISTOGRAM_VISITS_PER_WALK_MAX (1<<23)
@@ -445,7 +445,7 @@ static u64 fib_walk_work_time_taken[N_TIME_BUCKETS];
  * Histogram on the number of nodes visted in each quota
  */
 #define N_ELTS_BUCKETS 128
-static u32 fib_walk_work_nodes_visisted_incr = 2;
+static u32 fib_walk_work_nodes_visited_incr = 2;
 static u64 fib_walk_work_nodes_visited[N_ELTS_BUCKETS];
 
 /**
@@ -524,12 +524,12 @@ that_will_do_for_now:
 
     /*
      * collect the stats:
-     *  - for the number of nodes visisted we store 128 increments
+     *  - for the number of nodes visited we store 128 increments
      *  - for the time consumed we store quota/TIME_INCREMENTS increments.
      */
-    bucket = ((n_elts/fib_walk_work_nodes_visisted_incr) > N_ELTS_BUCKETS ?
+    bucket = ((n_elts/fib_walk_work_nodes_visited_incr) > N_ELTS_BUCKETS ?
 	      N_ELTS_BUCKETS-1 :
-	      n_elts/fib_walk_work_nodes_visisted_incr);
+	      n_elts/fib_walk_work_nodes_visited_incr);
     ++fib_walk_work_nodes_visited[bucket];
 
     bucket = (consumed_time - quota) / (quota / TIME_INCREMENTS);
@@ -1041,7 +1041,7 @@ fib_walk_show (vlib_main_t * vm,
     {
 	if (0 != fib_walk_work_nodes_visited[ii])
 	    s = format(s, "%d:%d ",
-		       (ii * fib_walk_work_nodes_visisted_incr),
+		       (ii * fib_walk_work_nodes_visited_incr),
 		       fib_walk_work_nodes_visited[ii]);
     }
     vlib_cli_output(vm, "  %v", s);
@@ -1162,7 +1162,7 @@ fib_walk_set_histogram_elements_size (vlib_main_t * vm,
 
     if (unformat (input, "%d", &new))
     {
-	fib_walk_work_nodes_visisted_incr = new;
+	fib_walk_work_nodes_visited_incr = new;
     }
     else
     {
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c
index 45ccb4f273d..57fc23b6b19 100644
--- a/src/vnet/fib/ip4_fib.c
+++ b/src/vnet/fib/ip4_fib.c
@@ -360,7 +360,7 @@ ip4_fib_table_entry_remove (ip4_fib_t *fib,
     if (NULL == result)
     {
 	/*
-	 * removing a non-existant entry. i'll allow it.
+	 * removing a non-existent entry. i'll allow it.
 	 */
     }
     else 
diff --git a/src/vnet/geneve/geneve_api.c b/src/vnet/geneve/geneve_api.c
index 6aa9fa43db2..0bada58710e 100644
--- a/src/vnet/geneve/geneve_api.c
+++ b/src/vnet/geneve/geneve_api.c
@@ -183,7 +183,7 @@ static void vl_api_geneve_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/gre/gre_api.c b/src/vnet/gre/gre_api.c
index c5658b52660..0de6a9ff464 100644
--- a/src/vnet/gre/gre_api.c
+++ b/src/vnet/gre/gre_api.c
@@ -167,7 +167,7 @@ vl_api_gre_tunnel_dump_t_handler (vl_api_gre_tunnel_dump_t * mp)
 /*
  * 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/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 985db21d6b0..4a2d413f53a 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -2299,7 +2299,7 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
 	}
 
       /* Don't adjust the buffer for ttl issue; icmp-error node wants
-       * to see the IP headerr */
+       * to see the IP header */
       if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
 	{
 	  u32 next_index = adj0[0].rewrite_header.next_index;
@@ -2435,7 +2435,7 @@ ip4_rewrite_inline_with_gso (vlib_main_t * vm,
 	}
 
       /* Don't adjust the buffer for ttl issue; icmp-error node wants
-       * to see the IP headerr */
+       * to see the IP header */
       if (PREDICT_TRUE (error0 == IP4_ERROR_NONE))
 	{
 	  u32 next_index = adj0[0].rewrite_header.next_index;
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 511fc9329e8..f1f291da8a2 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -1794,7 +1794,7 @@ ip6_rewrite_inline_with_gso (vlib_main_t * vm,
 			 is_locally_originated1, &next1, &error1);
 
 	  /* Don't adjust the buffer for hop count issue; icmp-error node
-	   * wants to see the IP headerr */
+	   * wants to see the IP header */
 	  if (PREDICT_TRUE (error0 == IP6_ERROR_NONE))
 	    {
 	      p0->current_data -= rw_len0;
diff --git a/src/vnet/ip/ip6_neighbor.c b/src/vnet/ip/ip6_neighbor.c
index 86b1800c46c..4f9e0820999 100755
--- a/src/vnet/ip/ip6_neighbor.c
+++ b/src/vnet/ip/ip6_neighbor.c
@@ -264,7 +264,7 @@ ip6_neighbor_get_link_local_address (u32 sw_if_index)
 
 /**
  * @brief publish wildcard arp event
- * @param sw_if_index The interface on which the ARP entires are acted
+ * @param sw_if_index The interface on which the ARP entries are acted
  */
 static int
 vnet_nd_wc_publish (u32 sw_if_index,
@@ -687,7 +687,7 @@ ip6_ethernet_update_adjacency (vnet_main_t * vnm, u32 sw_if_index, u32 ai)
 	 * Complete the remaining fields of the adj's rewrite to direct the
 	 * complete of the rewrite at switch time by copying in the IP
 	 * dst address's bytes.
-	 * Ofset is 2 bytes into the desintation address.
+	 * Ofset is 2 bytes into the destintation address.
 	 */
 	offset = vec_len (rewrite) - 2;
 	adj_mcast_update_rewrite (ai, rewrite, offset);
diff --git a/src/vnet/ip/ip_api.c b/src/vnet/ip/ip_api.c
index 749cb889be9..9ecdfc8e244 100644
--- a/src/vnet/ip/ip_api.c
+++ b/src/vnet/ip/ip_api.c
@@ -833,7 +833,7 @@ add_del_route_t_handler (u8 is_multipath,
   fib_entry_flag_t entry_flags = FIB_ENTRY_FLAG_NONE;
 
   /*
-   * the special INVALID label meams we are not recursing via a
+   * the special INVALID label means we are not recursing via a
    * label. Exp-null value is never a valid via-label so that
    * also means it's not a via-label and means clients that set
    * it to 0 by default get the expected behaviour
@@ -2415,7 +2415,7 @@ enum
 static uword
 wc_arp_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
 {
-  /* These cross the longjmp  boundry (vlib_process_wait_for_event)
+  /* These cross the longjmp boundary (vlib_process_wait_for_event)
    * and need to be volatile - to prevent them from being optimized into
    * a register - which could change during suspension */
 
diff --git a/src/vnet/ipfix-export/flow_api.c b/src/vnet/ipfix-export/flow_api.c
index 5df968414c8..e89f1a63ce6 100644
--- a/src/vnet/ipfix-export/flow_api.c
+++ b/src/vnet/ipfix-export/flow_api.c
@@ -346,7 +346,7 @@ static void
 /*
  * flow_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/ipip/ipip_api.c b/src/vnet/ipip/ipip_api.c
index 94ba1bb4623..2abac0b9772 100644
--- a/src/vnet/ipip/ipip_api.c
+++ b/src/vnet/ipip/ipip_api.c
@@ -211,7 +211,7 @@ vl_api_ipip_6rd_del_tunnel_t_handler (vl_api_ipip_6rd_del_tunnel_t * mp)
 /*
  * ipip_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-gpe/lisp_gpe_api.c b/src/vnet/lisp-gpe/lisp_gpe_api.c
index 86328fc2cf8..515f4844a02 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_api.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_api.c
@@ -547,7 +547,7 @@ vl_api_gpe_native_fwd_rpaths_get_t_handler (vl_api_gpe_native_fwd_rpaths_get_t
 /*
  * gpe_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/mfib/ip4_mfib.c b/src/vnet/mfib/ip4_mfib.c
index d20d1f6c2b9..87603715d83 100644
--- a/src/vnet/mfib/ip4_mfib.c
+++ b/src/vnet/mfib/ip4_mfib.c
@@ -303,7 +303,7 @@ ip4_mfib_table_entry_remove (ip4_mfib_t *mfib,
     if (NULL == result)
     {
         /*
-         * removing a non-existant entry. i'll allow it.
+         * removing a non-existent entry. i'll allow it.
          */
     }
     else
diff --git a/src/vnet/mpls/mpls_api.c b/src/vnet/mpls/mpls_api.c
index 4ac5ea72821..440dc9c4640 100644
--- a/src/vnet/mpls/mpls_api.c
+++ b/src/vnet/mpls/mpls_api.c
@@ -588,7 +588,7 @@ vl_api_mpls_fib_dump_t_handler (vl_api_mpls_fib_dump_t * mp)
 /*
  * mpls_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/session/session_api.c b/src/vnet/session/session_api.c
index 780c765cca5..8e37d428982 100755
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -1344,7 +1344,7 @@ setup_message_id_table (api_main_t * am)
 /*
  * session_api_hookup
  * Add uri'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 .../open-repo/vlib/memclnt_vlib.c:memclnt_process()
  */
diff --git a/src/vnet/srmpls/sr_mpls_api.c b/src/vnet/srmpls/sr_mpls_api.c
index 4cbc6a5cf63..f3bfc27a4d2 100644
--- a/src/vnet/srmpls/sr_mpls_api.c
+++ b/src/vnet/srmpls/sr_mpls_api.c
@@ -161,7 +161,7 @@ static void vl_api_sr_mpls_policy_assign_endpoint_color_t_handler
 
 /*
  * sr_mpls_api_hookup Add vpe's API message handlers to the table. vlib has
- * alread mapped shared memory and added the client registration handlers.
+ * already mapped shared memory and added the client registration handlers.
  * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process()
  */
 #define vl_msg_name_crc_list
diff --git a/src/vnet/srv6/sr_api.c b/src/vnet/srv6/sr_api.c
index 46fb8293c64..37a4fab4332 100644
--- a/src/vnet/srv6/sr_api.c
+++ b/src/vnet/srv6/sr_api.c
@@ -361,7 +361,7 @@ static void vl_api_sr_steering_pol_dump_t_handler
 /*
  * sr_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/test/test_gre.py b/test/test_gre.py
index cee7eea120f..85ef88fb25e 100644
--- a/test/test_gre.py
+++ b/test/test_gre.py
@@ -437,7 +437,7 @@ class TestGRE(VppTestCase):
 
         #
         # Send a packet stream that is routed into the tunnel
-        #  - they are all dropped since the tunnel's desintation IP
+        #  - they are all dropped since the tunnel's destintation IP
         #    is unresolved - or resolves via the default route - which
         #    which is a drop.
         #
@@ -581,7 +581,7 @@ class TestGRE(VppTestCase):
 
         #
         # Send a packet stream that is routed into the tunnel
-        #  - they are all dropped since the tunnel's desintation IP
+        #  - they are all dropped since the tunnel's destintation IP
         #    is unresolved - or resolves via the default route - which
         #    which is a drop.
         #