general: Fix several misspellings

Fix misspellings found by codespell in code comments,
console output and documentation.

Resolves ipmitool/ipmitool#28

21 files changed, 107 insertions, 107 deletions

diff --git a/lib/helper.c b/lib/helper.c
index 18acd47..7cecc17 100644
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -732,7 +732,7 @@ ipmi_open_file(const char * file, int rw)
 	struct stat st1, st2;
 	FILE * fp;
 
-	/* verify existance */
+	/* verify existence */
 	if (lstat(file, &st1) < 0) {
 		if (rw) {
 			/* does not exist, ok to create */
diff --git a/lib/ipmi_channel.c b/lib/ipmi_channel.c
index fab2e54..16eefe1 100644
--- a/lib/ipmi_channel.c
+++ b/lib/ipmi_channel.c
@@ -225,7 +225,7 @@ iana_string(uint32_t iana)
  * ipmi_1_5_authtypes
  *
  * Create a string describing the supported authentication types as 
- * specificed by the parameter n
+ * specified by the parameter n
  */
 static const char *
 ipmi_1_5_authtypes(uint8_t n)
diff --git a/lib/ipmi_dcmi.c b/lib/ipmi_dcmi.c
index 6f4dc90..54ec902 100755
--- a/lib/ipmi_dcmi.c
+++ b/lib/ipmi_dcmi.c
@@ -98,7 +98,7 @@ const struct dcmi_cmd dcmi_cmd_vals[] = {
 	DCMI_CMD_END(0xFF)
 };
 
-/* get capabilites */
+/* get capabilities */
 const struct dcmi_cmd dcmi_capable_vals[] = {
 	{ 0x01, "platform",             "Lists the system capabilities" },
 	{ 0x02, "mandatory_attributes", "Lists SEL, identification and"
@@ -571,7 +571,7 @@ const struct valstr nm_ccode_vals[] = {
 	{ 0x8B, "Invalid value for Aggressive CPU correction field" },
 	{ 0xA1, "No policy is currently limiting for the specified domain ID" },
 	{ 0xC4, "No space available" },
-	{ 0xD4, "Insufficient privledge level due wrong responder LUN" },
+	{ 0xD4, "Insufficient privilege level due wrong responder LUN" },
 	{ 0xD5, "Policy exists and param unchangeable while enabled" },
 	{ 0xD6, "Command subfunction disabled or unavailable" },
 	{ 0xFF, NULL },
@@ -1314,7 +1314,7 @@ ipmi_dcmi_prnt_setmngctrlids(struct ipmi_intf * intf, uint8_t * data)
  *
  * @intf:   ipmi interface handler
  * @isnsr:  entity ID
- * @offset:   offset (Entity instace start)
+ * @offset:   offset (Entity instance start)
  * 
  * returns ipmi_rs structure
  */
@@ -1328,7 +1328,7 @@ ipmi_dcmi_discvry_snsr(struct ipmi_intf * intf, uint8_t isnsr, uint8_t offset)
 	msg_data[1] = 0x01; /* Senser Type = Temp (01h) */
 	msg_data[2] = isnsr; /* Sensor Number */
 	msg_data[3] = 0x00; /* Entity Instance, set to read all instances */
-	msg_data[4] = offset; /* Entity instace start */
+	msg_data[4] = offset; /* Entity instance start */
 
 	memset(&req, 0, sizeof(req));
 	req.msg.netfn = IPMI_NETFN_DCGRP;
@@ -1528,7 +1528,7 @@ ipmi_dcmi_setthermalpolicy(struct ipmi_intf * intf,
 	msg_data[0] = IPMI_DCMI; /* Group Extension Identification */
 	msg_data[1] = entityID; /* Inlet Temperature DCMI ID*/
 	msg_data[2] = entityInst; /* Entity Instance */
-	/* persistance and actions or disabled if no actions */
+	/* persistence and actions or disabled if no actions */
 	msg_data[3] = (((persistanceFlag ? 1 : 0) << 7) |
 	               ((actionHardPowerOff? 1 : 0) << 6) |
 	               ((actionLogToSEL ? 1 : 0) << 5));
@@ -3162,13 +3162,13 @@ ipmi_nm_alert(struct ipmi_intf * intf, int argc, char **argv)
 			return -1;
 		}
 		switch (param) {
-		case 0x01: /* channnel */
+		case 0x01: /* channel */
 			if (str2uchar(argv[1], &chan) < 0) {
 				lprintf(LOG_ERR,"Alert Lan chan must be a positive integer.\n");
 				return -1;
 			}
 			if (action == 0x03)  /* Clear */
-				chan |= 0x80;   /* deactivate alert reciever */
+				chan |= 0x80;   /* deactivate alert receiver */
 			break;
 		case 0x02:  /* dest */
 			if (str2uchar(argv[1], &dest) < 0) {
@@ -3239,7 +3239,7 @@ ipmi_nm_thresh(struct ipmi_intf * intf, int argc, char **argv)
 	if ((argv[0] == NULL) || (argc < 3) ||
 	    ((action = str2val2(argv[0], nm_thresh_cmds)) == 0xFF))
 	{
-		print_strs(nm_thresh_cmds, "Theshold commands", LOG_ERR, 0);
+		print_strs(nm_thresh_cmds, "Threshold commands", LOG_ERR, 0);
 		return -1;
 	}
 	memset(&thresh, 0, sizeof(thresh));
diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c
index bc78c1d..fe7fa35 100644
--- a/lib/ipmi_delloem.c
+++ b/lib/ipmi_delloem.c
@@ -1201,7 +1201,7 @@ ipmi_lcd_set_kvm(struct ipmi_intf * intf, char status)
 	req.msg.data_len = 5;
 	req.msg.data = data;
 	data[0] = IPMI_DELL_LCD_STATUS_SELECTOR;
-	data[1] = status; /* active- incative*/
+	data[1] = status; /* active- inactive */
 	data[2] = lcdstatus.lock_status; /* full-veiw-locked */
 	rsp = intf->sendrecv(intf, &req);
 	if (rsp == NULL) {
@@ -1223,7 +1223,7 @@ ipmi_lcd_set_kvm(struct ipmi_intf * intf, char status)
  *
  * Description:     This function sets lcd access mode
  * Input:           intf            - ipmi interface
- *                  lock    - View and modify / View only / Diabled
+ *                  lock    - View and modify / View only / Disabled
  * Output:
  * Return:          -1 on error
  *                  0 if successful
@@ -1247,7 +1247,7 @@ ipmi_lcd_set_lock(struct ipmi_intf * intf,  char lock)
 	req.msg.data_len = 5;
 	req.msg.data = data;
 	data[0] = IPMI_DELL_LCD_STATUS_SELECTOR;
-	data[1] = lcdstatus.vKVM_status; /* active- incative */
+	data[1] = lcdstatus.vKVM_status; /* active- inactive */
 	data[2] = lock; /* full- veiw-locked */
 	rsp = intf->sendrecv(intf, &req);
 	if (rsp == NULL) {
@@ -1605,14 +1605,14 @@ ipmi_macinfo_drac_idrac_virtual_mac(struct ipmi_intf* intf,uint8_t NicNum)
 			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)
 			|| (IMC_IDRAC_13G_MODULAR == IMC_Type)
 			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) {
-		/* Get the Chasiss Assigned MAC Addresss for 12g Only */
+		/* Get the Chasiss Assigned MAC Address for 12g Only */
 		memcpy(VirtualMacAddress, ((rsp->data) + 1), MACADDRESSLENGH);
 		for (i = 0; i < MACADDRESSLENGH; i++) {
 			if (VirtualMacAddress[i] != 0) {
 				UseVirtualMacAddress = 1;
 			}
 		}
-		/* Get the Server Assigned MAC Addresss for 12g Only */
+		/* Get the Server Assigned MAC Address for 12g Only */
 		if (!UseVirtualMacAddress) {
 			memcpy(VirtualMacAddress, ((rsp->data) + 1 + MACADDRESSLENGH),
 					MACADDRESSLENGH);
@@ -3426,7 +3426,7 @@ ipmi_print_power_consmpt_history(struct ipmi_intf * intf, int unit)
 		return rc;
 	}
 	printf("Power Consumption History\n\n");
-	/* The fields are alligned manually changing the spaces will alter
+	/* The fields are aligned manually changing the spaces will alter
 	 * the alignment*/
 	printf("Statistic                   Last Minute     Last Hour     "
 			"Last Day     Last Week\n\n");
@@ -3688,7 +3688,7 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val)
 		val = btuphr_to_watt_conversion(val);
 	} else if (unit == percent) {
 		if ((val < 0) || (val > 100)) {
-			lprintf(LOG_ERR, "Cap value is out of boundary conditon it "
+			lprintf(LOG_ERR, "Cap value is out of boundary condition it "
 					"should be between 0  - 100");
 			return -1;
 		}
@@ -3703,7 +3703,7 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val)
 	if (((val < ipmipowercap.MinimumPowerConsmp)
 				|| (val > ipmipowercap.MaximumPowerConsmp)) && (unit == watt)) {
 		lprintf(LOG_ERR,
-				"Cap value is out of boundary conditon it should be between %d  - %d",
+				"Cap value is out of boundary condition it should be between %d  - %d",
 				ipmipowercap.MinimumPowerConsmp, ipmipowercap.MaximumPowerConsmp);
 		return -1;
 	} else if (((val < ipmipowercap.MinimumPowerConsmp)
@@ -3711,7 +3711,7 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val)
 		minpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MinimumPowerConsmp);
 		maxpowerbtuphr = watt_to_btuphr_conversion(ipmipowercap.MaximumPowerConsmp);
 		lprintf(LOG_ERR,
-				"Cap value is out of boundary conditon it should be between %d",
+				"Cap value is out of boundary condition it should be between %d",
 				minpowerbtuphr);
 		lprintf(LOG_ERR, " -%d", maxpowerbtuphr);
 		return -1;
diff --git a/lib/ipmi_ekanalyzer.c b/lib/ipmi_ekanalyzer.c
index 76049cf..07b5c1d 100644
--- a/lib/ipmi_ekanalyzer.c
+++ b/lib/ipmi_ekanalyzer.c
@@ -194,7 +194,7 @@ struct ipmi_ek_amc_p2p_connectivity_record{
    struct fru_picmgext_amc_channel_desc_record * ch_desc;
    unsigned char link_desc_count;
    struct fru_picmgext_amc_link_desc_record * link_desc;
-   int * matching_result; /*For link descriptor comparision*/
+   int * matching_result; /*For link descriptor comparison*/
 };
 
 /*****************************************************************************
@@ -451,7 +451,7 @@ ipmi_ek_get_file_type(char *argument)
 *
 * Global: None
 *
-* Return:   OK_STATUS as succes or ERROR_STATUS as error
+* Return:   OK_STATUS as success or ERROR_STATUS as error
 *
 ***************************************************************************/
 int
@@ -590,7 +590,7 @@ ipmi_ekanalyzer_main(struct ipmi_intf *intf, int argc, char **argv)
 			for (i = 0; i < (argc-1); i++) {
 				file_type[i] = ipmi_ek_get_file_type (argv[index]);
 				if (file_type[i] == ERROR_STATUS) {
-					/* display the first 2 charactors (file type) of argument */
+					/* display the first 2 characters (file type) of argument */
 					lprintf(LOG_ERR, "Invalid file type: %c%c\n",
 							argv[index][0],
 							argv[index][1]);
@@ -725,7 +725,7 @@ ipmi_ekanalyzer_print(int argc, char *opt, char **filename, int *file_type)
 						}
 						return_value = ipmi_ek_display_carrier_connectivity(list_record[i]);
 					} else if (list_record[i]->data[PICMG_ID_OFFSET] == FRU_AMC_CARRIER_INFO) {
-						/*See AMC.0 specification Table3-3 for mor detail*/
+						/*See AMC.0 specification Table3-3 for more detail*/
 						#define COUNT_OFFSET 6
 						if (first_data) {
 							printf("From Carrier file: %s\n", filename[index_name[i]]);
@@ -1940,12 +1940,12 @@ ipmi_ek_compare_link_descriptor(
 *
 * Function name: ipmi_ek_compare_asym
 *
-* Description: This function compares 2 asymetric match of 2
+* Description: This function compares 2 asymmetric match of 2
 *               amc link descriptors
 *
 * Restriction: None
 *
-* Input:      asym[COMPARE_CANDIDATE]: Contain 2 asymetric match for comparison
+* Input:      asym[COMPARE_CANDIDATE]: Contain 2 asymmetric match for comparison
 *
 * Output: None
 *
@@ -2056,7 +2056,7 @@ ipmi_ek_compare_number_of_enable_port(
 *                 destination (its value = "To"). ( it is set to "" if it is not
 *                 a source nor destination
 *        link_desc: AMC link descriptor
-*        asym:  asymetric match
+*        asym:  asymmetric match
 *
 * Output: None
 *
@@ -2348,7 +2348,7 @@ ipmi_ek_get_resource_descriptor(int port_count, int index,
 *
 * Global: None
 *
-* Return: Return OK_STATUS on sucess, ERROR_STATUS on error
+* Return: Return OK_STATUS on success, ERROR_STATUS on error
 *
 ***************************************************************************/
 static int
@@ -2722,7 +2722,7 @@ ipmi_ek_display_board_info_area(FILE *input_file, char *board_type,
 	}
 	(*board_length)--;
 
-	/* Bit 5:0 of Board Mfg type represent legnth */
+	/* Bit 5:0 of Board Mfg type represent length */
 	size_board = (len & 0x3f);
 	if (size_board == 0) {
 		printf("%s: None\n", board_type);
@@ -3421,7 +3421,7 @@ ipmi_ek_display_board_p2p_record(struct ipmi_ek_multi_header *record)
 				printf("ShMC Cross-connect (two-pair)\n");
 				break;
 			default:
-				printf("Unknwon\n");
+				printf("Unknown\n");
 				break;
 			}
 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_ETHERNET) {
@@ -3436,17 +3436,17 @@ ipmi_ek_display_board_p2p_record(struct ipmi_ek_multi_header *record)
 				printf("FC-PI\n");
 				break;
 			default:
-				printf("Unknwon\n");
+				printf("Unknown\n");
 				break;
 			}
 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_INFINIBAND) {
-			printf("Unknwon\n");
+			printf("Unknown\n");
 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_FABRIC_STAR) {
-			printf("Unknwon\n");
+			printf("Unknown\n");
 		} else if (d->type == FRU_PICMGEXT_LINK_TYPE_PCIE) {
-			printf("Unknwon\n");
+			printf("Unknown\n");
 		} else {
-			printf("Unknwon\n");
+			printf("Unknown\n");
 		}
 		printf("\tLink Type:\t\t0x%02x - ", d->type);
 		if (d->type == 0 || d->type == 0xff) {
@@ -4030,7 +4030,7 @@ ipmi_ek_display_clock_config_record(struct ipmi_ek_multi_header *record)
 *
 * Restriction: None
 *
-* Input/Ouput: filename1: name of the file that contain FRU binary data
+* Input/Output: filename1: name of the file that contain FRU binary data
 *        record: a pointer to current record
 *        list_head: a pointer to header of the list
 *        list_last: a pointer to tale of the list
@@ -4144,7 +4144,7 @@ ipmi_ekanalyzer_fru_file2structure(char *filename,
 *
 * Function name: ipmi_ek_add_record2list
 *
-* Description: this function adds a sigle FRU multi record to a linked list of
+* Description: this function adds a single FRU multi record to a linked list of
 *              FRU multi record.
 *
 * Restriction: None
@@ -4184,7 +4184,7 @@ ipmi_ek_add_record2list(struct ipmi_ek_multi_header **record,
 *
 * Function name: ipmi_ek_remove_record_from_list
 *
-* Description: this function removes a sigle FRU multi record from a linked
+* Description: this function removes a single FRU multi record from a linked
 *              list of FRU multi record.
 *
 * Restriction: None
diff --git a/lib/ipmi_firewall.c b/lib/ipmi_firewall.c
index 26bfd30..20d566d 100644
--- a/lib/ipmi_firewall.c
+++ b/lib/ipmi_firewall.c
@@ -888,7 +888,7 @@ static int _gather_info(struct ipmi_intf * intf, struct ipmi_function_params * p
 
 /* ipmi_firewall_info - print out info for firewall functions
  *
- * @intf:	ipmi inteface
+ * @intf:	ipmi interface
  * @argc:	argument count
  * @argv:	argument list
  *
@@ -1001,7 +1001,7 @@ ipmi_firewall_info(struct ipmi_intf * intf, int argc, char ** argv)
 
 /* ipmi_firewall_enable_disable  -  enable/disable BMC functions
  *
- * @intf:	ipmi inteface
+ * @intf:	ipmi interface
  * @enable:     whether to enable or disable
  * @argc:	argument count
  * @argv:	argument list
@@ -1055,7 +1055,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
 	c = p.command;
 	if (p.subfn >= 0) {
 		// firewall (en|dis)able [channel c] lun l netfn n command m subfn s
-		// (en|dis)able this sub-function for this commnad on this lun/netfn pair
+		// (en|dis)able this sub-function for this command on this lun/netfn pair
 		memcpy(enables,
 			bmc_fn_support->lun[l].netfn[n].command[c].subfn_enable,
 			MAX_SUBFN_BYTES);
@@ -1065,7 +1065,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
 
 	} else if (p.command >= 0) {
 		// firewall (en|dis)able [channel c] lun l netfn n command m
-		//    (en|dis)able all subfn and command for this commnad on this lun/netfn pair
+		//    (en|dis)able all subfn and command for this command on this lun/netfn pair
 		memset(enables, enable?0xff:0, MAX_SUBFN_BYTES);
 		ret = _set_subfn_enables(intf, &p,
 			&bmc_fn_support->lun[l].netfn[n].command[c], enables);
@@ -1076,14 +1076,14 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
 			&bmc_fn_support->lun[l].netfn[n], enables, p.force);
 	} else if (p.netfn >= 0) {
 		// firewall (en|dis)able [channel c] lun l netfn n
-		//    (en|dis)able all commnads on this lun/netfn pair
+		//    (en|dis)able all command on this lun/netfn pair
 		memset(enables, enable?0xff:0, sizeof(enables));
 		ret = _set_command_enables(intf, &p,
 			&bmc_fn_support->lun[l].netfn[n], enables, p.force);
 		/*
 		   } else if (p.lun >= 0) {
 		// firewall (en|dis)able [channel c] lun l
-		//    (en|dis)able all commnads on all netfn pairs for this lun
+		//    (en|dis)able all command on all netfn pairs for this lun
 		*/
 	}
 	free(bmc_fn_support);
@@ -1093,7 +1093,7 @@ ipmi_firewall_enable_disable(struct ipmi_intf * intf, int enable, int argc, char
 
 /* ipmi_firewall_reset - reset firmware firewall to enable everything
  *
- * @intf:	ipmi inteface
+ * @intf:	ipmi interface
  * @argc:	argument count
  * @argv:	argument list
  *
diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
index 429a0f4..20509d1 100644
--- a/lib/ipmi_fru.c
+++ b/lib/ipmi_fru.c
@@ -3339,7 +3339,7 @@ ipmi_fru_write_from_bin(struct ipmi_intf * intf,
 
 /* ipmi_fru_write_help() - print help text for 'write'
  *
- * retruns void
+ * returns void
  */
 void
 ipmi_fru_write_help()
@@ -3839,7 +3839,7 @@ ipmi_fru_get_multirec_size_from_file(char * pFileName,
 		return -1;
 	}
 
-	/* Retreive length */
+	/* Retrieve length */
 	if (((header.offset.internal * 8) > (header.offset.internal * 8)) &&
 		((header.offset.internal * 8) < end))
 		end = (header.offset.internal * 8);
@@ -4026,7 +4026,7 @@ ipmi_fru_get_multirec_location_from_fru(struct ipmi_intf * intf,
 
 	end = pFruInfo->size;
 
-	/* Retreive length */
+	/* Retrieve length */
 	if (((header.offset.internal * 8) > (header.offset.internal * 8)) &&
 		((header.offset.internal * 8) < end))
 		end = (header.offset.internal * 8);
@@ -4049,7 +4049,7 @@ ipmi_fru_get_multirec_location_from_fru(struct ipmi_intf * intf,
 	return 0;
 }
 
-/* ipmi_fru_get_internal_use_offset -  Retreive internal use offset
+/* ipmi_fru_get_internal_use_offset -  Retrieve internal use offset
 *
 * @intf:   ipmi interface
 * @id:     fru id
@@ -4344,7 +4344,7 @@ ipmi_fru_write_internal_use(struct ipmi_intf * intf, uint8_t id, char * pFileNam
 
 		if(fp)
 		{
-			/* Retreive file length, check if it's fits the Eeprom Size */
+			/* Retrieve file length, check if it's fits the Eeprom Size */
 			fseek(fp, 0 ,SEEK_END);
 			fileLength = ftell(fp);
 
@@ -5146,7 +5146,7 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId,
 		*(fru_data_new + fru_field_offset_tmp) = (0xc0 + strlen(f_string));
 		memcpy(fru_data_new + fru_field_offset_tmp + 1, f_string, strlen(f_string));
 
-		/* Copy remaing bytes in section */
+		/* Copy remaining bytes in section */
 #ifdef DBG_RESIZE_FRU
 		printf("Copying remaining of sections: %d \n",
 		 (int)((fru_data_old + header_offset + fru_section_len - 1) -
diff --git a/lib/ipmi_fwum.c b/lib/ipmi_fwum.c
index d1e3f4f..84c2e98 100644
--- a/lib/ipmi_fwum.c
+++ b/lib/ipmi_fwum.c
@@ -479,7 +479,7 @@ KfwumGetInfo(struct ipmi_intf *intf, unsigned char output,
 		printf("Number Of Memory Bank     : %u\n", pGetInfo->numBank);
 	}
 	*pNumBank = pGetInfo->numBank;
-	/* Determine wich type of download to use: */
+	/* Determine which type of download to use: */
 	/* Old FWUM or Old IPMC fw (data_len < 7)
 	 * --> Address with small buffer size
 	 */
@@ -598,12 +598,12 @@ KfwumGetStatus(struct ipmi_intf * intf)
 	if (verbose) {
 		printf(" Getting Status!\n");
 	}
-	/* Retreive the number of bank */
+	/* Retrieve the number of bank */
 	rc = KfwumGetInfo(intf, 0, &numBank);
 	for(counter = 0;
 			(counter < numBank) && (rc == 0);
 			counter ++) {
-		/* Retreive the status of each bank */
+		/* Retrieve the status of each bank */
 		memset(&req, 0, sizeof(req));
 		req.msg.netfn = IPMI_NETFN_FIRMWARE;
 		req.msg.cmd = KFWUM_CMD_ID_GET_FIRMWARE_STATUS;
@@ -950,7 +950,7 @@ KfwumGetTraceLog(struct ipmi_intf *intf)
 			(chunkIdx < TRACE_LOG_CHUNK_COUNT)
 			&& (rc == 0);
 			chunkIdx++) {
-		/* Retreive each log chunk and print it */
+		/* Retrieve each log chunk and print it */
 		memset(&req, 0, sizeof(req));
 		req.msg.netfn = IPMI_NETFN_FIRMWARE;
 		req.msg.cmd = KFWUM_CMD_ID_GET_TRACE_LOG;
@@ -971,7 +971,7 @@ KfwumGetTraceLog(struct ipmi_intf *intf)
 			break;
 		}
 		for (cmdIdx=0; cmdIdx < TRACE_LOG_CHUNK_SIZE; cmdIdx++) {
-			/* Don't diplay commands with an invalid state */
+			/* Don't display commands with an invalid state */
 			if ((rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx + 1] != 0)
 					&& (rsp->data[TRACE_LOG_ATT_COUNT * cmdIdx] < KFWUM_CMD_ID_STD_MAX_CMD)) {
 				printf("  Cmd ID: %17s -- CmdState: %10s -- CompCode: %2x\n",
@@ -1001,7 +1001,7 @@ KfwumGetInfoFromFirmware(unsigned char *pBuf, unsigned long bufSize,
 	}
 	offset = IN_FIRMWARE_INFO_OFFSET_LOCATION;
 
-	/* Now, fill the structure with read informations */
+	/* Now, fill the structure with read information */
 	pInfo->checksum = (unsigned short)KWUM_GET_BYTE_AT_OFFSET(pBuf,
 			offset + 0 + IN_FIRMWARE_INFO_OFFSET_CHECKSUM ) << 8;
 
diff --git a/lib/ipmi_gendev.c b/lib/ipmi_gendev.c
index 7a4cf08..45ebd18 100644
--- a/lib/ipmi_gendev.c
+++ b/lib/ipmi_gendev.c
@@ -376,7 +376,7 @@ ipmi_gendev_write_file(
       
       if(fp)
       {
-         /* Retreive file length, check if it's fits the Eeprom Size */
+         /* Retrieve file length, check if it's fits the Eeprom Size */
          fseek(fp, 0 ,SEEK_END);
          fileLength = ftell(fp);
 
diff --git a/lib/ipmi_hpmfwupg.c b/lib/ipmi_hpmfwupg.c
index c202ac9..3d74f5f 100644
--- a/lib/ipmi_hpmfwupg.c
+++ b/lib/ipmi_hpmfwupg.c
@@ -530,7 +530,7 @@ HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, int activate,
 	}
 	if (rc == HPMFWUPG_SUCCESS) {
 		if (option & VIEW_MODE) {
-		/* Dont display anything here in case we are just viewing it */
+		/* Don't display anything here in case we are just viewing it */
 		lprintf(LOG_NOTICE," ");
 		} else if (option & COMPARE_MODE) {
 			lprintf(LOG_NOTICE,
@@ -540,7 +540,7 @@ HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename, int activate,
 					"\nFirmware upgrade procedure successful\n");
 		}
 	} else if (option & VIEW_MODE) {
-		/* Dont display anything here in case we are just viewing it */
+		/* Don't display anything here in case we are just viewing it */
 		lprintf(LOG_NOTICE," ");
 	} else if (option & COMPARE_MODE) {
 		lprintf(LOG_NOTICE,
@@ -649,7 +649,7 @@ HpmfwupgPreparationStage(struct ipmi_intf *intf,
 	if (rc != HPMFWUPG_SUCCESS) {
 		/* Giving one more chance to user to check whether its OK to continue even if the
 		 * product ID does not match. This is helpful as sometimes we just want to update
-		 * and dont care whether we have a different product Id. If the user says NO then
+		 * and don't care whether we have a different product Id. If the user says NO then
 		 * we need to just bail out from here
 		 */
 		if (!((option & FORCE_MODE) || (option & VIEW_MODE))) {
@@ -721,7 +721,7 @@ HpmfwupgPreparationStage(struct ipmi_intf *intf,
 					"\n    Some components present in the image file are not supported by the IPMC");
 			return HPMFWUPG_ERROR;
 		}
-		/* Make sure the upgrade is desirable rigth now */
+		/* Make sure the upgrade is desirable right now */
 		if (pFwupgCtx->targetCap.GlobalCapabilities.bitField.fwUpgUndesirable == 1) {
 			lprintf(LOG_NOTICE, "\n    Upgrade undesirable at this moment");
 			return HPMFWUPG_ERROR;
@@ -1300,7 +1300,7 @@ HpmFwupgActionUploadFirmware(struct HpmfwupgComponentBitMask components,
 		HpmDisplayUpgrade(1,0,0,0);
 		if ((option & COMPARE_MODE)
 				&& !pFwupgCtx->genCompProp[pFwupgCtx->componentId].GeneralCompProperties.bitfield.comparisonSupport) {
-			printf("|    |Comparison isn't supported for given compenent.                        |\n");
+			printf("|    |Comparison isn't supported for given component.                        |\n");
 		}
 		*pImagePtr = pDataInitial + firmwareLength;
 	}
@@ -1503,7 +1503,7 @@ HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf,
 				pCtx->resp.GlobalCapabilities.bitField.autRollbackOverride ? 'y' : 'n');
 		lprintf(LOG_NOTICE, "IPMC degraded...........[%c]   ",
 				pCtx->resp.GlobalCapabilities.bitField.ipmcDegradedDurinUpg ? 'y' : 'n');
-		lprintf(LOG_NOTICE, "Defered activation......[%c]   ",
+		lprintf(LOG_NOTICE, "Deferred activation.....[%c]   ",
 				pCtx->resp.GlobalCapabilities.bitField.deferActivation ? 'y' : 'n');
 		lprintf(LOG_NOTICE, "Service affected........[%c]   ",
 				pCtx->resp.GlobalCapabilities.bitField.servAffectDuringUpg ? 'y' : 'n');
@@ -2137,8 +2137,8 @@ HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
 	} else {
 		/* keeping the inaccessTimeout to 60 seconds results in almost 2900 retries
 		 * So if the target is not available it will be retrying the command for 2900
-		 * times which is not effecient -So reducing the Timout to 5 seconds which is
-		 * almost 200 retries if it continuously recieves 0xC3 as completion code.
+		 * times which is not efficient -So reducing the Timeout to 5 seconds which is
+		 * almost 200 retries if it continuously receives 0xC3 as completion code.
 		 */
 		inaccessTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
 		upgradeTimeout  = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
@@ -2275,7 +2275,7 @@ HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf,
 					upgradeTimeout);
 		}
 	} else {
-		/* Try to retreive from Caps */
+		/* Try to retrieve from Caps */
 		struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
 		if(HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd) != HPMFWUPG_SUCCESS) {
 			upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
diff --git a/lib/ipmi_kontronoem.c b/lib/ipmi_kontronoem.c
index 64860be..e7f49cb 100644
--- a/lib/ipmi_kontronoem.c
+++ b/lib/ipmi_kontronoem.c
@@ -85,7 +85,7 @@ ipmi_kontronoem_main(struct ipmi_intf *intf, int argc, char **argv)
 			return (-1);
 		}
 		if (ipmi_kontron_set_serial_number(intf) > 0) {
-			printf("FRU serial number setted successfully\n");
+			printf("FRU serial number set successfully\n");
 		} else {
 			printf("FRU serial number set failed\n");
 			rc = (-1);
@@ -96,7 +96,7 @@ ipmi_kontronoem_main(struct ipmi_intf *intf, int argc, char **argv)
 			return (-1);
 		}
 		if (ipmi_kontron_set_mfg_date(intf) > 0) {
-			printf("FRU manufacturing date setted successfully\n");
+			printf("FRU manufacturing date set successfully\n");
 		} else {
 			printf("FRU manufacturing date set failed\n");
 			rc = (-1);
diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
index 65d881b..0d6a0a6 100644
--- a/lib/ipmi_lanp.c
+++ b/lib/ipmi_lanp.c
@@ -1270,8 +1270,8 @@ static void
 print_lan_set_bad_pass_thresh_usage(void)
 {
 	lprintf(LOG_NOTICE,
-"lan set <chanel> bad_pass_thresh <thresh_num> <1|0> <reset_interval> <lockout_interval>\n"
-"        <thresh_num>         Bad Pasword Threshold number.\n"
+"lan set <channel> bad_pass_thresh <thresh_num> <1|0> <reset_interval> <lockout_interval>\n"
+"        <thresh_num>         Bad Password Threshold number.\n"
 "        <1|0>                1 = generate a Session Audit sensor event.\n"
 "                             0 = do not generate an event.\n"
 "        <reset_interval>     Attempt Count Reset Interval. In tens of seconds.\n"
diff --git a/lib/ipmi_main.c b/lib/ipmi_main.c
index 597a958..2d367c2 100644
--- a/lib/ipmi_main.c
+++ b/lib/ipmi_main.c
@@ -176,7 +176,7 @@ ipmi_cmd_print(struct ipmi_cmd * cmdlist)
  * @argc:	command argument count
  * @argv:	command argument list
  *
- * returns value from func() of that commnad if found
+ * returns value from func() of that command if found
  * returns -1 if command is not found
  */
 int
diff --git a/lib/ipmi_mc.c b/lib/ipmi_mc.c
index cfddf94..4f3c064 100644
--- a/lib/ipmi_mc.c
+++ b/lib/ipmi_mc.c
@@ -264,7 +264,7 @@ print_watchdog_usage(void)
 
 /* ipmi_mc_get_enables  -  print out MC enables
  *
- * @intf:	ipmi inteface
+ * @intf:	ipmi interface
  *
  * returns 0 on success
  * returns -1 on error
@@ -301,7 +301,7 @@ ipmi_mc_get_enables(struct ipmi_intf * intf)
 
 /* ipmi_mc_set_enables  -  set MC enable flags
  *
- * @intf:	ipmi inteface
+ * @intf:	ipmi interface
  * @argc:	argument count
  * @argv:	argument list
  *
@@ -612,7 +612,7 @@ static int ipmi_mc_get_selftest(struct ipmi_intf * intf)
 			printf(" -> SEL device not accessible\n");
 		}
 		if (sft_res->test & IPM_SELFTEST_SDR_ERROR) {
-			printf(" -> SDR repository not accesible\n");
+			printf(" -> SDR repository not accessible\n");
 		}
 		if (sft_res->test & IPM_SELFTEST_FRU_ERROR) {
 			printf("FRU device not accessible\n");
diff --git a/lib/ipmi_picmg.c b/lib/ipmi_picmg.c
index 6c24dec..5684840 100644
--- a/lib/ipmi_picmg.c
+++ b/lib/ipmi_picmg.c
@@ -62,7 +62,7 @@ typedef enum picmg_card_type {
 	PICMG_CARD_TYPE_RESERVED
 } t_picmg_card_type ;
 
-/* This is the version of the PICMG Extenstion */
+/* This is the version of the PICMG Extension */
 static t_picmg_card_type PicmgCardType = PICMG_CARD_TYPE_RESERVED;
 
 void
@@ -146,7 +146,7 @@ is_amc_channel(const char *argv_ptr, uint8_t *amc_chan_ptr)
 	return (-1);
 }
 /* is_amc_dev - wrapper to convert user input into integer.
- * AMC Dev ID limits are uknown.
+ * AMC Dev ID limits are unknown.
  *
  * @argv_ptr: source string to convert from; usually argv
  * @amc_dev_ptr: pointer where to store result
@@ -167,7 +167,7 @@ is_amc_dev(const char *argv_ptr, int32_t *amc_dev_ptr)
 	return (-1);
 }
 /* is_amc_intf - wrapper to convert user input into integer.
- * AMC Interface (ID) limits are uknown.
+ * AMC Interface (ID) limits are unknown.
  *
  * @argv_ptr: source string to convert from; usually argv
  * @amc_intf_ptr: pointer where to store result
@@ -188,7 +188,7 @@ is_amc_intf(const char *argv_ptr, int32_t *amc_intf_ptr)
 	return (-1);
 }
 /* is_amc_port - wrapper to convert user input into integer.
- * AMC Port limits are uknown.
+ * AMC Port limits are unknown.
  *
  * @argv_ptr: source string to convert from; usually argv
  * @amc_port_ptr: pointer where to store result
@@ -208,7 +208,7 @@ is_amc_port(const char *argv_ptr, int32_t *amc_port_ptr)
 	return (-1);
 }
 /* is_clk_acc - wrapper to convert user input into integer.
- * Clock Accuracy limits are uknown[1byte by spec].
+ * Clock Accuracy limits are unknown[1byte by spec].
  *
  * @argv_ptr: source string to convert from; usually argv
  * @clk_acc_ptr: pointer where to store result
@@ -229,7 +229,7 @@ is_clk_acc(const char *argv_ptr, uint8_t *clk_acc_ptr)
 	return (-1);
 }
 /* is_clk_family - wrapper to convert user input into integer.
- * Clock Family limits are uknown[1byte by spec].
+ * Clock Family limits are unknown[1byte by spec].
  *
  * @argv_ptr: source string to convert from; usually argv
  * @clk_family_ptr: pointer where to store result
@@ -250,7 +250,7 @@ is_clk_family(const char *argv_ptr, uint8_t *clk_family_ptr)
 	return (-1);
 }
 /* is_clk_freq - wrapper to convert user input into integer.
- * Clock Frequency limits are uknown, but specification says
+ * Clock Frequency limits are unknown, but specification says
  * 3Bytes + 1B checksum
  *
  * @argv_ptr: source string to convert from; usually argv
@@ -272,7 +272,7 @@ is_clk_freq(const char *argv_ptr, uint32_t *clk_freq_ptr)
 	return (-1);
 }
 /* is_clk_id - wrapper to convert user input into integer.
- * Clock ID limits are uknown, however it's 1B by specification and I've
+ * Clock ID limits are unknown, however it's 1B by specification and I've
  * found two ranges: <1..5> or <0..15>
  *
  * @argv_ptr: source string to convert from; usually argv
@@ -293,7 +293,7 @@ is_clk_id(const char *argv_ptr, uint8_t *clk_id_ptr)
 	return (-1);
 }
 /* is_clk_index - wrapper to convert user input into integer.
- * Clock Index limits are uknown[1B by spec]
+ * Clock Index limits are unknown[1B by spec]
  *
  * @argv_ptr: source string to convert from; usually argv
  * @clk_index_ptr: pointer where to store result
@@ -313,7 +313,7 @@ is_clk_index(const char *argv_ptr, uint8_t *clk_index_ptr)
 	return (-1);
 }
 /* is_clk_resid - wrapper to convert user input into integer.
- * Clock Resource Index(?) limits are uknown, but maximum seems to be 15.
+ * Clock Resource Index(?) limits are unknown, but maximum seems to be 15.
  *
  * @argv_ptr: source string to convert from; usually argv
  * @clk_resid_ptr: pointer where to store result
@@ -1024,7 +1024,7 @@ ipmi_picmg_amc_portstate_get(struct ipmi_intf * intf, int32_t device,
 
 
 				/* Removed endianness check here, probably not required
-					as we dont use bitfields  */
+					as we don't use bitfields  */
 				port = d->linkInfo[0] & 0x0F;
 				type = ((d->linkInfo[0] & 0xF0) >> 4 )|(d->linkInfo[1] & 0x0F );
 				ext  = ((d->linkInfo[1] & 0xF0) >> 4 );
@@ -2325,7 +2325,7 @@ ipmi_picmg_ipmb_address(struct ipmi_intf *intf) {
 uint8_t
 picmg_discover(struct ipmi_intf *intf) {
 	/* Check if PICMG extension is available to use the function 
-	 * GetDeviceLocator to retreive i2c address PICMG hack to set 
+	 * GetDeviceLocator to retrieve i2c address PICMG hack to set
 	 * right IPMB address, If extension is not supported, should 
 	 * not give any problems
 	 *  PICMG Extension Version 2.0 (PICMG 3.0 Revision 1.0 ATCA) to
@@ -2354,7 +2354,7 @@ picmg_discover(struct ipmi_intf *intf) {
 	if (rsp == NULL) {
 	    lprintf(LOG_DEBUG,"No response from Get PICMG Properties");
 	} else if (rsp->ccode != 0) {
-	    lprintf(LOG_DEBUG,"Error response %#x from Get PICMG Properities",
+	    lprintf(LOG_DEBUG,"Error response %#x from Get PICMG Properties",
 		    rsp->ccode);
 	} else if (rsp->data_len < 4) {
 	    lprintf(LOG_INFO,"Invalid Get PICMG Properties response length %d",
diff --git a/lib/ipmi_quantaoem.c b/lib/ipmi_quantaoem.c
index 7b4c5c6..5a7509b 100644
--- a/lib/ipmi_quantaoem.c
+++ b/lib/ipmi_quantaoem.c
@@ -136,7 +136,7 @@ oem_qct_get_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec)
 	if (rec->sel_type.standard_type.event_type != 0x6F) {
 		goto out;
 	}
-	/* Allocate mem for te Description string */
+	/* Allocate mem for the Description string */
 	desc = malloc(SIZE_OF_DESC);
 	if (desc == NULL) {
 		lprintf(LOG_ERR, "ipmitool: malloc failure");
diff --git a/lib/ipmi_sdr.c b/lib/ipmi_sdr.c
index 6795c9a..70a9636 100644
--- a/lib/ipmi_sdr.c
+++ b/lib/ipmi_sdr.c
@@ -137,8 +137,8 @@ sdr_sensor_has_analog_reading(struct ipmi_intf *intf,
 	 * But... HP didn't interpret this as meaning that "Only Threshold
 	 *        Sensors" can provide analog readings.  So, HP packed analog
 	 *        readings into some of their non-Threshold Sensor.   There is
-	 *	  nothing that explictly prohibits this in the spec, so if
-	 *	  an Analog reading is available in a Non-Threshod sensor and
+	 *	  nothing that explicitly prohibits this in the spec, so if
+	 *	  an Analog reading is available in a Non-Threshold sensor and
 	 *	  there are units specified for identifying the reading then
 	 *	  we do an analog conversion even though the sensor is
 	 *	  non-Threshold.   To be safe, we provide this extension for
@@ -690,7 +690,7 @@ ipmi_sdr_get_sensor_event_enable(struct ipmi_intf *intf, uint8_t sensor,
 
 /* ipmi_sdr_get_thresh_status  -  threshold status indicator
  *
- * @rsp:		response from Get Sensor Reading comand
+ * @rsp:		response from Get Sensor Reading command
  * @validread:	validity of the status field argument
  * @invalidstr:	string to return if status field is not valid
  *
@@ -755,7 +755,7 @@ ipmi_sdr_get_thresh_status(struct sensor_reading *sr, const char *invalidstr)
 	return "ok";
 }
 
-/* ipmi_sdr_get_header  -  retreive SDR record header
+/* ipmi_sdr_get_header  -  retrieve SDR record header
  *
  * @intf:	ipmi interface
  * @itr:	sdr iterator
@@ -858,7 +858,7 @@ ipmi_sdr_get_header(struct ipmi_intf *intf, struct ipmi_sdr_iterator *itr)
 	return &sdr_rs;
 }
 
-/* ipmi_sdr_get_next_header  -  retreive next SDR header
+/* ipmi_sdr_get_next_header  -  retrieve next SDR header
  *
  * @intf:	ipmi interface
  * @itr:	sdr iterator
diff --git a/lib/ipmi_sel.c b/lib/ipmi_sel.c
index 58f8bda..dfd1366 100644
--- a/lib/ipmi_sel.c
+++ b/lib/ipmi_sel.c
@@ -564,7 +564,7 @@ get_supermicro_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec)
 	if (rec->sel_type.standard_type.event_type != 0x6F) {
 		return NULL;
 	}
-	/* Allocate mem for te Description string */
+	/* Allocate mem for the Description string */
 	desc = malloc(sizeof(char) * SIZE_OF_DESC);
 	if (desc == NULL) {
 		lprintf(LOG_ERR, "ipmitool: malloc failure");
@@ -704,7 +704,7 @@ get_supermicro_evt_desc(struct ipmi_intf *intf, struct sel_event_record *rec)
 
 /*
  * Function 	: Decoding the SEL OEM Bytes for the DELL Platforms.
- * Description  : The below fucntion will decode the SEL Events OEM Bytes for the Dell specific	Sensors only.
+ * Description  : The below function will decode the SEL Events OEM Bytes for the Dell specific Sensors only.
  * The below function will append the additional information Strings/description to the normal sel desc.
  * With this the SEL will display additional information sent via OEM Bytes of the SEL Record.
  * NOTE		: Specific to DELL Platforms only.
@@ -737,7 +737,7 @@ char * get_dell_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
 	if (0x6F == rec->sel_type.standard_type.event_type)
 		{
 		sensor_type = rec->sel_type.standard_type.sensor_type;
-		/* Allocate mem for te Description string */
+		/* Allocate mem for the Description string */
 		desc = (char*)malloc(SIZE_OF_DESC);
 		if(NULL == desc)
 			return NULL;
@@ -895,11 +895,11 @@ char * get_dell_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
 					if(SENSOR_TYPE_EVT_LOG == sensor_type)
 					{
 						if(0x03 == (data1 & MASK_LOWER_NIBBLE)) 
-							snprintf(desc,SIZE_OF_DESC,"All Even Logging Dissabled");
+							snprintf(desc,SIZE_OF_DESC,"All Even Logging Disabled");
 					}
 				}
 				/* 
- 				 * Based on the above error, we need to find whcih memory slot or 
+ 				 * Based on the above error, we need to find which memory slot or
  				 * Card has got the Errors/Sel Generated.
  				 */
 				if(data1 & OEM_CODE_IN_BYTE2 ) 
@@ -1041,7 +1041,7 @@ char * get_dell_evt_desc(struct ipmi_intf * intf, struct sel_event_record * rec)
 				}	
 				
 			break;
-						/* This Event is for BMC to Othe Hardware or CPU . */
+						/* This Event is for BMC to other Hardware or CPU . */
 			case SENSOR_TYPE_VER_CHANGE:
 				if((0x02 == (data1 & MASK_LOWER_NIBBLE))&&((data1 & OEM_CODE_IN_BYTE2) && (data1 & OEM_CODE_IN_BYTE3)))
 				{
diff --git a/lib/ipmi_sol.c b/lib/ipmi_sol.c
index 4ac4e01..d22c9e4 100644
--- a/lib/ipmi_sol.c
+++ b/lib/ipmi_sol.c
@@ -2006,7 +2006,7 @@ ipmi_sol_main(struct ipmi_intf * intf, int argc, char ** argv)
 		}
 		retval = ipmi_sol_activate(intf, 0, 0, instance);
 	} else if (!strncmp(argv[0], "deactivate", 10)) {
-		/* Dectivate */
+		/* Deactivate */
 		int i;
 		uint8_t instance = 1;
 		for (i = 1; i < argc; i++) {
@@ -2025,7 +2025,7 @@ ipmi_sol_main(struct ipmi_intf * intf, int argc, char ** argv)
 		}
 		retval = ipmi_sol_deactivate(intf, instance);
 	} else if (!strncmp(argv[0], "looptest", 8)) {
-		/* SOL loop test: Activate and then Dectivate */
+		/* SOL loop test: Activate and then Deactivate */
 		int cnt = 200;
 		int interval = 100; /* Unit is: ms */
 		uint8_t instance = 1;
diff --git a/lib/ipmi_strings.c b/lib/ipmi_strings.c
index 49fa784..daa5bf1 100644
--- a/lib/ipmi_strings.c
+++ b/lib/ipmi_strings.c
@@ -42,7 +42,7 @@ const struct valstr ipmi_oem_info[] = {
    { IPMI_OEM_UNKNOWN, "Unknown" },
    { IPMI_OEM_RESERVED, "Unspecified" },
 
-/* The included file is auto-generated from offical IANA PEN list */
+/* The included file is auto-generated from official IANA PEN list */
 #include "ipmi_pen_list.inc.c"
 
 /*
diff --git a/lib/ipmi_sunoem.c b/lib/ipmi_sunoem.c
index e30f4da..00a865d 100644
--- a/lib/ipmi_sunoem.c
+++ b/lib/ipmi_sunoem.c
@@ -434,14 +434,14 @@ sunoem_led_set_byentity(struct ipmi_intf * intf, uint8_t entity_id,
  *                       Access Address" field, 0x20 if the LED is local
  * [byte 3]  hwInfo      The OEM field from the SDR record
  * [byte 4]  force       1 = directly access the device
- *                       0 = go thru its controller
+ *                       0 = go through its controller
  *                       Ignored if LED is local
  *
  * The format below is for Sun Blade Modular systems only
  * [byte 4]  entityID    The entityID field from the SDR record
  * [byte 5]  entityIns   The entityIns field from the SDR record
  * [byte 6]  force       1 = directly access the device
- *                       0 = go thru its controller
+ *                       0 = go through its controller
  *                       Ignored if LED is local
  */
 static int
@@ -624,7 +624,7 @@ ipmi_sunoem_led_get(struct ipmi_intf * intf, int argc, char ** argv)
  * [byte 3]  hwInfo      The OEM field from the SDR record
  * [byte 4]  mode        LED Mode: OFF, ON, STANDBY, SLOW, FAST
  * [byte 5]  force       TRUE - directly access the device
- *                       FALSE - go thru its controller
+ *                       FALSE - go through its controller
  *                       Ignored if LED is local
  * [byte 6]  role        Used by BMC for authorization purposes
  *
@@ -632,7 +632,7 @@ ipmi_sunoem_led_get(struct ipmi_intf * intf, int argc, char ** argv)
  * [byte 5]  entityID    The entityID field from the SDR record
  * [byte 6]  entityIns   The entityIns field from the SDR record
  * [byte 7]  force       TRUE - directly access the device
- *                       FALSE - go thru its controller
+ *                       FALSE - go through its controller
  *                       Ignored if LED is local
  * [byte 8]  role        Used by BMC for authorization purposes
  *
@@ -1465,7 +1465,7 @@ typedef struct
 	/*
 	 * When adding new fields (using the spare bytes),
 	 * add it immediately after the spare field to
-	 * ensure backward compatability.
+	 * ensure backward compatibility.
 	 *
 	 * e.g.   char version[40];
 	 *        unsigned char spare[11];