Fix some spelling & grammar.

Change-Id: Iedeaa411caa0823922dd79c27897a2349d4e6907
Reviewed-on: https://code.wireshark.org/review/4054
Reviewed-by: Bill Meier <wmeier@newsguy.com>

25 files changed, 52 insertions, 52 deletions

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index bd8b521c70..193bef7fff 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -820,18 +820,18 @@ dissect_ase(tvbuff_t *tvb, int offset, guint ase_len, proto_tree *ext_tree)
         proto_tree *exts_tree;
         guint8      srid           = tvb_get_guint8(tvb, offset+1);
         guint16     service_option = tvb_get_ntohs(tvb,  offset+2);
-        guint8      entry_lenght;
+        guint8      entry_length;
         int         entry_start_offset;
 
         /* Entry Length */
         entry_start_offset = offset;
-        entry_lenght = tvb_get_guint8(tvb, offset);
+        entry_length = tvb_get_guint8(tvb, offset);
 
         if (registration_request_msg && ((service_option == 64) || (service_option == 67)))
-            exts_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, entry_lenght+1,
+            exts_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, entry_length+1,
                         ett_a11_ase, NULL, "GRE Key Entry (SRID: %d)", srid);
         else
-            exts_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, entry_lenght,
+            exts_tree = proto_tree_add_subtree_format(ext_tree, tvb, offset, entry_length,
                         ett_a11_ase, NULL, "GRE Key Entry (SRID: %d)", srid);
 
         proto_tree_add_item(exts_tree, hf_a11_ase_len_type, tvb, offset, 1, ENC_BIG_ENDIAN);
@@ -857,7 +857,7 @@ dissect_ase(tvbuff_t *tvb, int offset, guint ase_len, proto_tree *ext_tree)
         proto_tree_add_item(exts_tree, hf_a11_ase_pcf_addr_key, tvb, offset, 4, ENC_BIG_ENDIAN);
         offset += 4;
 
-        if ((entry_lenght>14)&&(registration_request_msg)) {
+        if ((entry_length>14)&&(registration_request_msg)) {
             if (service_option == 0x0043) {
                 proto_tree *extv_tree;
                 guint8      profile_count = tvb_get_guint8(tvb, offset+6);
@@ -922,9 +922,9 @@ dissect_ase(tvbuff_t *tvb, int offset, guint ase_len, proto_tree *ext_tree)
             }/* Service option */
 
         }/* if */
-        clen += entry_lenght + 1;
+        clen += entry_length + 1;
         /* Set offset = start of next entry in case of padding */
-        offset = entry_start_offset + entry_lenght+1;
+        offset = entry_start_offset + entry_length+1;
 
     } /* while */
 
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 0735243b2e..daa812cfec 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -294,7 +294,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){
 
   if ((!pinfo->fd->flags.visited)&&(ansi_tcap_private.TransactionID_str)){
 
-          /* Only do this once XXX I hope its the right thing to do */
+          /* Only do this once XXX I hope it's the right thing to do */
           /* The hash string needs to contain src and dest to distiguish differnt flows */
           switch(ansi_tcap_response_matching_type){
                         case 0:
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index d5a7b175ba..938e45e9ef 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -4220,7 +4220,7 @@ proto_register_artnet(void) {
         NULL, HFILL }},
 
     { &hf_artnet_directory_reply_length,
-      { "Lenght",
+      { "Length",
         "artnet.directory_reply.length",
         FT_UINT64, BASE_DEC, NULL, 0x0,
         NULL, HFILL }},
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index c9ffc07219..6ee1eb0e62 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7573,7 +7573,7 @@ camelsrt_request_call_matching(tvbuff_t *tvb, packet_info *pinfo,
       if (p_camelsrt_call->category[srt_type].req_num != pinfo->fd->num) {
 
 	if (srt_type!=CAMELSRT_VOICE_DISC) {
-	  /* No, so it's a duplicate resquest. Mark it as such. */
+	  /* No, so it's a duplicate request. Mark it as such. */
 #ifdef DEBUG_CAMELSRT
 	  dbg(21,"Display_duplicate with req %d ", p_camelsrt_call->category[srt_type].req_num);
 #endif
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index c05e810db7..c74352e2f2 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -2066,7 +2066,7 @@ dissect_dap_DirectoryBindArgument(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 	dissect_ber_length(actx->pinfo, tree, tvb, offset+1, &len, NULL);
 
 	if(len == 0) {
-		/* its an empty set - i.e anonymous  (assuming version is DEFAULTed) */
+		/* it's an empty set - i.e anonymous  (assuming version is DEFAULTed) */
 		proto_tree_add_expert(tree, actx->pinfo, &ei_dap_anonymous, tvb, offset, -1);
 
 		col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous");
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 0b22099a45..fca51fb9d3 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -2703,7 +2703,7 @@ dissect_epl_sdo_command_write_by_index(proto_tree *epl_tree, tvbuff_t *tvb, pack
 
 		size = tvb_reported_length_remaining(tvb, offset);
 
-		/* if the index is a R/TPDO and its not a segmentation initiated transfer */
+		/* if the index is a R/TPDO and it's not a segmentation initiated transfer */
 		if((idx == EPL_SOD_PDO_TX_MAPP && subindex > entries) ||(idx == EPL_SOD_PDO_RX_MAPP && subindex > entries))
 		{
 			psf_item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_mapping, tvb, offset, 1, ENC_NA);
@@ -2909,7 +2909,7 @@ dissect_epl_sdo_command_write_multiple_by_index(proto_tree *epl_tree, tvbuff_t *
 				dataoffset += 1;
 			}
 
-			/* if the index is a R/TPDO and its not a segmentation initiated transfer */
+			/* if the index is a R/TPDO and it's not a segmentation initiated transfer */
 			if((idx == EPL_SOD_PDO_TX_MAPP && subindex > entries) ||(idx == EPL_SOD_PDO_RX_MAPP && subindex > entries))
 			{
 				psf_item = proto_tree_add_item(epl_tree, hf_epl_asnd_sdo_cmd_data_mapping, tvb, dataoffset, 1, ENC_NA);
diff --git a/epan/dissectors/packet-gsm_a_gm.c b/epan/dissectors/packet-gsm_a_gm.c
index ba506b6298..deb8481a5c 100644
--- a/epan/dissectors/packet-gsm_a_gm.c
+++ b/epan/dissectors/packet-gsm_a_gm.c
@@ -3881,7 +3881,7 @@ de_sm_apn(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, g
 		curr_len     += step+1;
 	}
 
-	/* High light bytes including the first lenght byte */
+	/* Highlight bytes including the first length byte */
 	proto_tree_add_string(tree, hf_gsm_a_gm_apn, tvb, curr_offset, len, str+1);
 	curr_offset +=  len;
 
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 87377b9b6a..b7de941498 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -4601,7 +4601,7 @@ decode_apn(tvbuff_t * tvb, int offset, guint16 length, proto_tree * tree, proto_
         curr_len     += step+1;
     }
 
-    /* Highlight bytes including the first lenght byte */
+    /* Highlight bytes including the first length byte */
     proto_tree_add_string(tree, hf_gtp_apn, tvb, offset, length, str+1);
     if(item){
         proto_item_append_text(item, ": %s", str+1);
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 4f77dbd9a4..5d8e8d37d4 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -11807,7 +11807,7 @@ dissect_wapi_param_set(tvbuff_t *tvb, packet_info *pinfo,
   /*MIN: 2 + (2+4)+ (2+4) + 4 + 2 + 0 (BKID CNT and LIST)  =20*/
   if (tag_len < 20) {
       expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length,
-                "tag_len is  %d, its neither WAPI not BSS-AC-Access-Delay", tag_len);
+                "tag_len is  %d, it's neither WAPI not BSS-AC-Access-Delay", tag_len);
     return offset;
   }
 
@@ -19297,7 +19297,7 @@ proto_register_ieee80211 (void)
       NULL, HFILL }},
 
     {&hf_ieee80211_ff_sswf_num_rx_dmg_ants,
-     {"Sector Sweep Feedback Number of recieve DMG Antennas", "wlan.sswf.num_dmg_ants",
+     {"Sector Sweep Feedback Number of receive DMG Antennas", "wlan.sswf.num_dmg_ants",
       FT_UINT24, BASE_DEC, NULL, 0x006000,
       NULL, HFILL }},
 
@@ -19447,7 +19447,7 @@ proto_register_ieee80211 (void)
       NULL, HFILL }},
 
     {&hf_ieee80211_ff_bic_nabft,
-     {"Number of A-BFT's recieved from each Antenna", "wlan.bic.nabft",
+     {"Number of A-BFT's received from each Antenna", "wlan.bic.nabft",
       FT_UINT16, BASE_DEC, NULL, 0x07e0,
       NULL, HFILL }},
 
@@ -21516,7 +21516,7 @@ proto_register_ieee80211 (void)
     {&hf_ieee80211_ff_toa,
      {"TOA", "wlan_mgt.fixed.toa",
       FT_UINT32, BASE_DEC, NULL, 0,
-      "Previous TS of recieve antenna port", HFILL }},
+      "Previous TS of receive antenna port", HFILL }},
 
     {&hf_ieee80211_ff_max_tod_err,
      {"MAX TOD ERROR", "wlan_mgt.fixed.max_tod_err",
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 2f701a3347..33e4a81907 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -964,7 +964,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 			/* if len of igmp packet>=8 we assume it is MSNIP */
 			offset = dissect_msnip(tvb, pinfo, parent_tree, offset);
 		} else {
-			/* ok its not MSNIP, check if it might be MRDISC */
+			/* ok it's not MSNIP, check if it might be MRDISC */
 			dst = g_htonl(MC_ALL_ROUTERS);
 			if (!memcmp(pinfo->dst.data, &dst, 4)) {
 				offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset);
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index aa178fd42a..31c713aec1 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -223,7 +223,7 @@ tvb_raw_text_add(tvbuff_t *tvb, proto_tree *tree);
 static void
 dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
 static gint
-megaco_tvb_find_token(tvbuff_t* tvb, gint offset, gint maxlenght);
+megaco_tvb_find_token(tvbuff_t* tvb, gint offset, gint maxlength);
 static dissector_handle_t data_handle;
 static dissector_handle_t sdp_handle;
 static dissector_handle_t h245_handle;
diff --git a/epan/dissectors/packet-mux27010.c b/epan/dissectors/packet-mux27010.c
index 0ac249ef0c..9c717e9128 100644
--- a/epan/dissectors/packet-mux27010.c
+++ b/epan/dissectors/packet-mux27010.c
@@ -821,7 +821,7 @@ dissect_mux27010(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /*Set the variable for length of the info field to 0*/
     length_info = 0;
 
-    /*Check the frame type because in RR, RNR and REJ are no info and no lenght fields*/
+    /*Check the frame type because in RR, RNR and REJ are no info and no length fields*/
     if ((frame_type != MUX27010_FRAMETYPE_CONTROL_FLAG_RR) && (frame_type != MUX27010_FRAMETYPE_CONTROL_FLAG_RNR) &&
         (frame_type != MUX27010_FRAMETYPE_CONTROL_FLAG_REJ)){
         /*Add a subtree (=item) to the child node => in this subtree will be the details of length field*/
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index 3a692007cf..89389a5091 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -23332,7 +23332,7 @@ conversation_t   *conversation = NULL;
 int i;
 
     if (!actx->pinfo->fd->flags.visited){
-        /* Set port to zero use that as an indication of wether we have data or not */
+        /* Set port to zero use that as an indication of whether we have data or not */
         for (i = 0; i < maxNrOfCommonMACFlows; i++) {
             nbap_common_channel_info[i].crnc_port = 0;
             nbap_common_channel_info[i].rlc_mode = FP_RLC_MODE_UNKNOWN;
@@ -23347,7 +23347,7 @@ int i;
     if (actx->pinfo->fd->flags.visited){
         return offset;
     }
-    /* Set port to zero use that as an indication of wether we have data or not */
+    /* Set port to zero use that as an indication of whether we have data or not */
     SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
     for (i = 0; i < maxNrOfCommonMACFlows; i++) {
         if (nbap_common_channel_info[i].crnc_port != 0){
@@ -23666,7 +23666,7 @@ dissect_nbap_HSDSCH_MACdFlows_Information(tvbuff_t *tvb _U_, int offset _U_, asn
             /*This flow must also be added*/
             case id_HSDSCH_MACdFlows_to_Add:
                 if (!actx->pinfo->fd->flags.visited){
-                /* Set port to zero use that as an indication of wether we have data or not */
+                /* Set port to zero use that as an indication of whether we have data or not */
                     for (i = 0; i < maxNrOfMACdFlows; i++) {
                         nbap_hsdsch_channel_info[i].crnc_port = 0;
                         nbap_hsdsch_channel_info[i].rlc_mode = FP_RLC_MODE_UNKNOWN;
@@ -23775,7 +23775,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
     guint32 i;
 
     if (!actx->pinfo->fd->flags.visited){
-        /* Set port to zero use that as an indication of wether we have data or not */
+        /* Set port to zero use that as an indication of whether we have data or not */
         for (i = 0; i < maxNrOfMACdFlows; i++) {
             nbap_hsdsch_channel_info[i].crnc_port = 0;
             nbap_hsdsch_channel_info[i].rlc_mode = FP_RLC_MODE_UNKNOWN;
@@ -23792,7 +23792,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_
         return offset;
     }
 
-    /* Set port to zero use that as an indication of wether we have data or not */
+    /* Set port to zero use that as an indication of whether we have data or not */
     SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
     for (i = 0; i < maxNrOfMACdFlows; i++) {
         if (nbap_hsdsch_channel_info[i].crnc_port != 0){
@@ -24109,7 +24109,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
     guint32 i;
 
     if (!actx->pinfo->fd->flags.visited){
-        /* Set port to zero use that as an indication of wether we have data or not */
+        /* Set port to zero use that as an indication of whether we have data or not */
         for (i = 0; i < maxNrOfMACdFlows; i++) {
             nbap_hsdsch_channel_info[i].crnc_port = 0;
             nbap_hsdsch_channel_info[i].rlc_mode = FP_RLC_MODE_UNKNOWN;
@@ -24126,7 +24126,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn
         return offset;
     }
 
-    /* Set port to zero use that as an indication of wether we have data or not */
+    /* Set port to zero use that as an indication of whether we have data or not */
     SET_ADDRESS(&null_addr, AT_NONE, 0, NULL);
 
     nbap_debug1("Frame %u HSDSCH-MACdFlows-Information Start",
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index 7074df0891..27f662f0a4 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -10368,7 +10368,7 @@ void reg_callback(int cbprog)
 	/*
 	 * Register the procedure tables.  The version should be 4,
 	 * but some Linux kernels set this field to 1.  "Temporarily",
-	 * accomodate these servers.
+	 * accommodate these servers.
 	 */
 	rpc_init_proc_table(cbprog, 1, nfs_cb_proc, hf_nfs4_cb_procedure);
 	rpc_init_proc_table(cbprog, 4, nfs_cb_proc, hf_nfs4_cb_procedure);
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index 54677a5831..305054792e 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -2041,7 +2041,7 @@ opensafety_package_dissector(const gchar *protocolName, const gchar *sub_diss_ha
         /* Finding the start of the first possible safety frame */
         if ( findSafetyFrame(message_tvb, frameOffset, b_frame2First, &frameOffset, &frameLength) )
         {
-            /* frameLength is calculated/read directly from the dissected data. If frameLenght and frameOffset together
+            /* frameLength is calculated/read directly from the dissected data. If frameLength and frameOffset together
              * are bigger than the reported length, the package is not really an openSAFETY package */
             if ( ( frameOffset + frameLength ) > (guint)reported_len )
                 break;
diff --git a/epan/dissectors/packet-ptpip.c b/epan/dissectors/packet-ptpip.c
index 8b61a9d0fb..745884ad56 100644
--- a/epan/dissectors/packet-ptpip.c
+++ b/epan/dissectors/packet-ptpip.c
@@ -576,7 +576,7 @@ void dissect_ptpIP_init_command_request(tvbuff_t *tvb, packet_info *pinfo, proto
     dissect_ptpIP_unicode_name(tvb, pinfo, tree, offset);
 
     /* grabbing protocol version
-     * Note: [3] does not list this in the packet field. . [1] 2.3.1 states its the last 4
+     * Note: [3] does not list this in the packet field. . [1] 2.3.1 states it's the last 4
      * bytes of the packet.
     */
     dissect_ptpIP_protocol_version(tvb, tree, offset);
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index cbba61a22a..f7fec7e0b5 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -13198,7 +13198,7 @@ dissect_sccp_ranap_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
      * 2nd octet is the message-type e Z[0, 28]
      * (obviously there must be at least four octets)
      *
-     * If both hold true we'll assume its RANAP
+     * If both hold true we'll assume it's RANAP
      */
 
     #define LENGTH_OFFSET 3
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index 2c4f6704ce..3cc3f9f1da 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -360,7 +360,7 @@ static const value_string rdm_sensor_type_vals[] = {
 	{ RDM_SENS_RESISTANCE,		"Resistance" },
 	{ RDM_SENS_POWER,		"Power" },
 	{ RDM_SENS_MASS,		"Mass" },
-	{ RDM_SENS_LENGTH,		"Lenght" },
+	{ RDM_SENS_LENGTH,		"Length" },
 	{ RDM_SENS_AREA,		"Area" },
 	{ RDM_SENS_VOLUME,		"Volume" },
 	{ RDM_SENS_DENSITY,		"Density" },
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 9448d70f7e..a6f927f0e2 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -206,7 +206,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         case RSYNC_MODULE_LIST:
             /* there are two cases - file list, or authentication */
             if (0 == tvb_strneql(tvb, offset, RSYNCD_AUTHREQD, RSYNCD_AUTHREQD_LEN)) {
-                /* matches, so we assume its an authentication message */
+                /* matches, so we assume it's an authentication message */
                 proto_tree_add_item(rsync_tree, &hfi_rsync_rsyncdok_string, tvb, offset, -1, ENC_ASCII|ENC_NA);
 
                 col_set_str(pinfo->cinfo, COL_INFO, "Authentication");
diff --git a/epan/dissectors/packet-s7comm.c b/epan/dissectors/packet-s7comm.c
index a7b3ceecf1..79b729b39f 100644
--- a/epan/dissectors/packet-s7comm.c
+++ b/epan/dissectors/packet-s7comm.c
@@ -303,7 +303,7 @@ static const value_string item_transportsizenames[] = {
 /**************************************************************************
  * Syntax Ids of variable specification
  */
-#define S7COMM_SYNTAXID_S7ANY               0x10        /* Adress data S7-Any pointer-like DB1.DBX10.2 */
+#define S7COMM_SYNTAXID_S7ANY               0x10        /* Address data S7-Any pointer-like DB1.DBX10.2 */
 #define S7COMM_SYNTAXID_DRIVEESANY          0xa2        /* seen on Drive ES Starter with routing over S7 */
 #define S7COMM_SYNTAXID_1200SYM             0xb2        /* Symbolic address mode of S7-1200 */
 #define S7COMM_SYNTAXID_DBREAD              0xb0        /* Kind of DB block read, seen only at an S7-400 */
@@ -730,7 +730,7 @@ static gint hf_s7comm_item_transport_size = -1;             /* Transport size, 1
 static gint hf_s7comm_item_length = -1;                     /* length, 2 Bytes*/
 static gint hf_s7comm_item_db = -1;                         /* DB/M/E/A, 2 Bytes */
 static gint hf_s7comm_item_area = -1;                       /* Area code, 1 byte */
-static gint hf_s7comm_item_address = -1;                    /* Bit adress, 3 Bytes */
+static gint hf_s7comm_item_address = -1;                    /* Bit address, 3 Bytes */
 /* Special variable read with Syntax-Id 0xb0 (DBREAD) */
 static gint hf_s7comm_item_dbread_numareas = -1;            /* Number of areas following, 1 Byte*/
 static gint hf_s7comm_item_dbread_length = -1;              /* length, 1 Byte*/
@@ -1130,7 +1130,7 @@ s7comm_decode_param_item(tvbuff_t *tvb,
         proto_tree_add_uint(item_tree, hf_s7comm_item_address, tvb, offset, 3, a_address);
         bytepos = a_address / 8;
         bitpos = a_address % 8;
-        /* build a full adress to show item data directly beside the item */
+        /* build a full address to show item data directly beside the item */
         switch (area) {
             case (S7COMM_AREA_P):
                 proto_item_append_text(item_tree, " (P");
@@ -1675,7 +1675,7 @@ s7comm_decode_ud_prog_vartab_req_item(tvbuff_t *tvb,
     proto_tree_add_uint(sub_tree, hf_s7comm_vartab_req_startaddress, tvb, offset, 2, bytepos);
     offset += 2;
 
-    /* build a full adress to show item data directly beside the item */
+    /* build a full address to show item data directly beside the item */
     switch (area) {
         case S7COMM_UD_SUBF_PROG_VARTAB_AREA_MB:
             proto_item_append_text(sub_tree, " (M%d.0 BYTE %d)", bytepos, len);
@@ -2156,7 +2156,7 @@ s7comm_decode_ud_prog_subfunc(tvbuff_t *tvb,
         case S7COMM_UD_SUBF_PROG_REQDIAGDATA1:
         case S7COMM_UD_SUBF_PROG_REQDIAGDATA2:
             /* start variable table or block online view */
-            /* TODO: Can only handle requests/response, not the "following" telegrams because it's neccessary to correlate them
+            /* TODO: Can only handle requests/response, not the "following" telegrams because it's necessary to correlate them
                 with the previous request */
             if (type != S7COMM_UD_TYPE_PUSH) {
                 offset = s7comm_decode_ud_prog_reqdiagdata(tvb, data_tree, subfunc, offset);
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index ab340467b5..af661a8504 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -642,7 +642,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             } else if ((g_ascii_strncasecmp(line, "AUTH LOGIN", 10) == 0) && (linelen <= 11)) {
               /*
                * AUTH LOGIN command.
-               * Username is in a seperate frame
+               * Username is in a separate frame
                */
               spd_frame_data->pdu_type        = SMTP_PDU_CMD;
               session_state->smtp_state       = SMTP_STATE_READING_CMDS;
@@ -661,7 +661,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             } else if ((g_ascii_strncasecmp(line, "AUTH PLAIN", 10) == 0) && (linelen <= 11)) {
               /*
                * AUTH PLAIN command.
-               * Username and Password is in one seperate frame
+               * Username and Password is in one separate frame
                */
               spd_frame_data->pdu_type        = SMTP_PDU_CMD;
               session_state->smtp_state       = SMTP_STATE_READING_CMDS;
diff --git a/epan/dissectors/packet-zbee-zcl-general.c b/epan/dissectors/packet-zbee-zcl-general.c
index 0f0002c13c..b86fb12e26 100644
--- a/epan/dissectors/packet-zbee-zcl-general.c
+++ b/epan/dissectors/packet-zbee-zcl-general.c
@@ -1209,7 +1209,7 @@ static const value_string zbee_zcl_part_srv_tx_cmd_names[] = {
     { 0, NULL }
 };
 
-/* ID Lenght */
+/* ID Length */
 static const value_string zbee_zcl_part_id_length_names[] = {
     { 0,        "1-Byte length" },
     { 1,        "2-Bytes length" },
diff --git a/epan/gcp.c b/epan/gcp.c
index 9ce34331fa..7689469659 100644
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -105,14 +105,14 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
 		key[2].key =NULL;
 
         if (( m = (gcp_msg_t *)wmem_tree_lookup32_array(msgs,key) )) {
-            m->commited = TRUE;
+            m->committed = TRUE;
             return m;
         } else {
             m = wmem_new(wmem_file_scope(), gcp_msg_t);
             m->framenum = framenum;
             m->time = pinfo->fd->abs_ts;
             m->trxs = NULL;
-            m->commited = FALSE;
+            m->committed = FALSE;
 
             wmem_tree_insert32_array(msgs,key,m);
         }
@@ -120,7 +120,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
         m = wmem_new0(wmem_packet_scope(), gcp_msg_t);
         m->framenum = framenum;
         m->trxs = NULL;
-        m->commited = FALSE;
+        m->committed = FALSE;
     }
 
     if (CMP_ADDRESS(src, dst) < 0)  {
@@ -161,7 +161,7 @@ gcp_trx_t* gcp_trx(gcp_msg_t* m ,guint32 t_id , gcp_trx_type_t type, gboolean ke
     if ( !m ) return NULL;
 
     if (keep_persistent_data) {
-        if (m->commited) {
+        if (m->committed) {
 
             for ( trxmsg = m->trxs; trxmsg; trxmsg = trxmsg->next) {
                 if (trxmsg->trx && trxmsg->trx->id == t_id) {
@@ -262,7 +262,7 @@ gcp_ctx_t* gcp_ctx(gcp_msg_t* m, gcp_trx_t* t, guint32 c_id, gboolean persistent
         trx_key[3].length = 0;
         trx_key[3].key = NULL;
 
-        if (m->commited) {
+        if (m->committed) {
             if (( context = (gcp_ctx_t *)wmem_tree_lookup32_array(ctxs_by_trx,trx_key) )) {
                 return context;
             } if ((context_p = (gcp_ctx_t **)wmem_tree_lookup32_array(ctxs,ctx_key))) {
@@ -351,7 +351,7 @@ gcp_cmd_t* gcp_cmd(gcp_msg_t* m, gcp_trx_t* t, gcp_ctx_t* c, gcp_cmd_type_t type
     if ( !m || !t || !c ) return NULL;
 
     if (persistent) {
-        if (m->commited) {
+        if (m->committed) {
             DISSECTOR_ASSERT(t->cmds != NULL);
 
             for (cmdctx = t->cmds; cmdctx; cmdctx = cmdctx->next) {
@@ -423,7 +423,7 @@ gcp_term_t* gcp_cmd_add_term(gcp_msg_t* m, gcp_trx_t* tr, gcp_cmd_t* c, gcp_term
     }
 
     if (persistent) {
-        if ( c->msg->commited ) {
+        if ( c->msg->committed ) {
             if (wildcard == GCP_WILDCARD_ALL) {
                 for (ct = c->ctx->terms.next; ct; ct = ct->next) {
                     /* XXX not handling more wilcards in one msg */
diff --git a/epan/gcp.h b/epan/gcp.h
index db775fd84c..4f341cb042 100644
--- a/epan/gcp.h
+++ b/epan/gcp.h
@@ -106,7 +106,7 @@ typedef struct _gcp_msg_t {
     guint32 framenum;
     nstime_t time;
     struct _gcp_trx_msg_t* trxs;
-    gboolean commited;
+    gboolean committed;
 } gcp_msg_t;
 
 typedef struct _gcp_trx_msg_t {
diff --git a/epan/wslua/wslua_proto.c b/epan/wslua/wslua_proto.c
index 17a8e7a869..977492caf6 100644
--- a/epan/wslua/wslua_proto.c
+++ b/epan/wslua/wslua_proto.c
@@ -1898,7 +1898,7 @@ int Proto_register(lua_State* L) {
 
 /**
  * Query field abbr that is defined and bound to a Proto in lua.
- * They are not registered untill the end of the initialization.
+ * They are not registered until the end of the initialization.
  */
 int wslua_is_field_available(lua_State* L, const char* field_abbr) {
     lua_rawgeti(L, LUA_REGISTRYINDEX, protocols_table_ref);