Fix typos, mostly s/ an / a / where appropriate and a few s/an/and/

Add FreeBSD Id tag where missing.

39 files changed, 56 insertions, 56 deletions

diff --git a/sys/boot/ficl/words.c b/sys/boot/ficl/words.c
index 9ede537..3419938 100644
--- a/sys/boot/ficl/words.c
+++ b/sys/boot/ficl/words.c
@@ -4535,7 +4535,7 @@ static void funcname(FICL_VM *pVM)
 /**************************************************************************
                         f i c l W o r d C l a s s i f y
 ** This public function helps to classify word types for SEE
-** and the deugger in tools.c. Given an pointer to a word, it returns
+** and the deugger in tools.c. Given a pointer to a word, it returns
 ** a member of WOR
 **************************************************************************/
 WORDKIND ficlWordClassify(FICL_WORD *pFW)
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index 988a1a2..11476f0 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -187,7 +187,7 @@ camq_remove(struct camq *queue, int index)
 /*
  * camq_change_priority:  Given an array of cam_pinfo* elements with the
  * Heap(1, num_entries) property, an index such that 1 <= index <= num_elements,
- * and an new priority for the element at index, change the priority of
+ * and a new priority for the element at index, change the priority of
  * element index and restore the Heap(0, num_elements) property.
  */
 void
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index 0f5831a..a95e78b 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -1754,7 +1754,7 @@ amr_describe_controller(struct amr_softc *sc)
 	/* this looks like we have an HP NetRaid version of the MegaRaid */
 
     	if(ae->ae_signature == AMR_SIG_438) {
-    		/* the AMI 438 is an NetRaid 3si in HP-land */
+    		/* the AMI 438 is a NetRaid 3si in HP-land */
     		prod = "HP NetRaid 3si";
     	}
     	
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 888ae9d..c9f9650 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -569,7 +569,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	ccg->ccg_ncylinders = cs->sc_size / ccg->ccg_nsectors;
 
 	/*
-	 * Add an devstat entry for this device.
+	 * Add a devstat entry for this device.
 	 */
 	devstat_add_entry(&cs->device_stats, "ccd", cs->sc_unit,
 			  ccg->ccg_secsize, DEVSTAT_ALL_SUPPORTED,
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index c12b016..73f0523 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -1049,7 +1049,7 @@ cm_ioctl(ifp, command, data)
  * software has not enabled the Receiver, would make our hardware wait forever
  * Discovered this after 20 times reading the docs.
  *
- * Only thing we do is disable transmitter. We'll get an transmit timeout,
+ * Only thing we do is disable transmitter. We'll get a transmit timeout,
  * and the int handler will have to decide not to retransmit (in case
  * retransmission is implemented).
  *
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index a943556..531af30 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1628,7 +1628,7 @@ isp_fclink_test(struct ispsoftc *isp, int usdelay)
 	 * Check to see if we're on a fabric by trying to see if we
 	 * can talk to the fabric name server. This can be a bit
 	 * tricky because if we're a 2100, we should check always
-	 * (in case we're connected to an server doing aliasing).
+	 * (in case we're connected to a server doing aliasing).
 	 */
 	fcp->isp_onfabric = 0;
 
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index bb5b23b..f599052 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -763,7 +763,7 @@ isp_handle_atio(struct ispsoftc *isp, at_entry_t *aep)
 
 	case AT_RESET:
 		/*
-		 * A bus reset came along an blew away this command. Why
+		 * A bus reset came along and blew away this command. Why
 		 * they do this in addition the async event code stuff,
 		 * I dunno.
 		 *
diff --git a/sys/dev/isp/isp_tpublic.h b/sys/dev/isp/isp_tpublic.h
index 548dea7..5074af5 100644
--- a/sys/dev/isp/isp_tpublic.h
+++ b/sys/dev/isp/isp_tpublic.h
@@ -82,7 +82,7 @@ typedef struct {
  *
  * The cd_private tag should be used by the MD layer to keep a free list
  * of these structures. Code outside of this driver can then use this
- * as an to identify it's own unit structures. That is, when not on the MD
+ * to identify it's own unit structures. That is, when not on the MD
  * layer's freelist, the MD layer should shove into it the identifier
  * that the outer layer has for it- passed in on an initial QIN_HBA_REG
  * call (see below).
@@ -294,7 +294,7 @@ typedef enum {
  */
 
 /*
- * A word about ENABLE/DISABLE: the argument is a pointer to an tmd_cmd_t
+ * A word about ENABLE/DISABLE: the argument is a pointer to a tmd_cmd_t
  * with cd_hba, cd_bus, cd_tgt and cd_lun filled out. If an error occurs
  * in either enabling or disabling the described lun, cd_lflags is set
  * with CDFL_ERROR.
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index c95aeee..67fa7bd 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -791,7 +791,7 @@ nge_reset(sc)
 }
 
 /*
- * Probe for an NatSemi chip. Check the PCI vendor and device
+ * Probe for a NatSemi chip. Check the PCI vendor and device
  * IDs against our list and return a device name if we find a match.
  */
 static int
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 6f72096..5ba4dc3 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -35,7 +35,7 @@
  * This driver sends two bytes (0x08, 0x00) in front of each packet,
  * to allow us to distinguish another format later.
  *
- * Now added an Linux/Crynwr compatibility mode which is enabled using
+ * Now added a Linux/Crynwr compatibility mode which is enabled using
  * IF_LINK0 - Tim Wilkinson.
  *
  * TODO:
diff --git a/sys/dev/ppbus/ppi.c b/sys/dev/ppbus/ppi.c
index d2cf4fd..e1bc241 100644
--- a/sys/dev/ppbus/ppi.c
+++ b/sys/dev/ppbus/ppi.c
@@ -207,13 +207,13 @@ ppiintr(void *arg)
 
 	switch (ppb_1284_get_state(ppbus)) {
 
-	/* accept IEEE1284 negociation then wakeup an waiting process to
-	 * continue negociation at process level */
+	/* accept IEEE1284 negotiation then wakeup a waiting process to
+	 * continue negotiation at process level */
 	case PPB_FORWARD_IDLE:
 		/* Event 1 */
 		if ((ppb_rstr(ppbus) & (SELECT | nBUSY)) ==
 							(SELECT | nBUSY)) {
-			/* IEEE1284 negociation */
+			/* IEEE1284 negotiation */
 #ifdef DEBUG_1284
 			printf("N");
 #endif
@@ -231,7 +231,7 @@ ppiintr(void *arg)
 			break;
 		}
 
-		/* wake up any process waiting for negociation from
+		/* wake up any process waiting for negotiation from
 		 * remote master host */
 
 		/* XXX should set a variable to warn the process about
@@ -326,7 +326,7 @@ ppiclose(dev_t dev, int flags, int fmt, struct thread *td)
  *
  * IEEE1284 compliant read.
  *
- * First, try negociation to BYTE then NIBBLE mode
+ * First, try negotiation to BYTE then NIBBLE mode
  * If no data is available, wait for it otherwise transfer as much as possible
  */
 static int
@@ -345,7 +345,7 @@ ppiread(dev_t dev, struct uio *uio, int ioflag)
 		/* FALLTHROUGH */
 
 	case PPB_FORWARD_IDLE:
-		/* if can't negociate NIBBLE mode then try BYTE mode,
+		/* if can't negotiate NIBBLE mode then try BYTE mode,
 		 * the peripheral may be a computer
 		 */
 		if ((ppb_1284_negociate(ppbus,
@@ -407,11 +407,11 @@ error:
  *
  * Actually, this is the peripheral side of a remote IEEE1284 read
  *
- * The first part of the negociation (IEEE1284 device detection) is
+ * The first part of the negotiation (IEEE1284 device detection) is
  * done at interrupt level, then the remaining is done by the writing
  * process
  *
- * Once negociation done, transfer data
+ * Once negotiation done, transfer data
  */
 static int
 ppiwrite(dev_t dev, struct uio *uio, int ioflag)
@@ -434,9 +434,9 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 		  MS_RET(0)
 	};
 
-	/* negociate ECP mode */
+	/* negotiate ECP mode */
 	if (ppb_1284_negociate(ppbus, PPB_ECP, 0)) {
-		printf("ppiwrite: ECP negociation failed\n");
+		printf("ppiwrite: ECP negotiation failed\n");
 	}
 
 	while (!error && (len = min(uio->uio_resid, BUFSIZE))) {
@@ -462,12 +462,12 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 
 		ppi_enable_intr(ppidev);
 
-		/* sleep until IEEE1284 negociation starts */
+		/* sleep until IEEE1284 negotiation starts */
 		error = tsleep(ppi, PCATCH | PPBPRI, "ppiwrite", 0);
 
 		switch (error) {
 		case 0:
-			/* negociate peripheral side with BYTE mode */
+			/* negotiate peripheral side with BYTE mode */
 			ppb_peripheral_negociate(ppbus, PPB_BYTE, 0);
 			break;
 		case EWOULDBLOCK:
@@ -480,7 +480,7 @@ ppiwrite(dev_t dev, struct uio *uio, int ioflag)
 	printf("N");
 #endif
 
-	/* negociation done, write bytes to master host */
+	/* negotiation done, write bytes to master host */
 	while ((len = min(uio->uio_resid, BUFSIZE)) != 0) {
 		uiomove(ppi->ppi_buffer, len, uio);
 		if ((error = byte_peripheral_write(ppbus,
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
index 06106b9..3bce20b 100644
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -302,7 +302,7 @@ puc_attach(device_t dev, const struct puc_device_description *desc)
 }
 
 /*
- * This is just an brute force interrupt handler. It just calls all the
+ * This is just a brute force interrupt handler. It just calls all the
  * registered handlers sequencially.
  *
  * Later on we should maybe have a different handler for boards that can
diff --git a/sys/dev/sym/sym_fw1.h b/sys/dev/sym/sym_fw1.h
index 8799283..96ae523 100644
--- a/sys/dev/sym/sym_fw1.h
+++ b/sys/dev/sym/sym_fw1.h
@@ -821,7 +821,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
 		HADDR_1 (ccb_head.status),
 	/*
 	 *  If QUIRK_AUTOSAVE is set,
-	 *  do an "save pointer" operation.
+	 *  do a "save pointer" operation.
 	 */
 	SCR_FROM_REG (QU_REG),
 		0,
diff --git a/sys/dev/sym/sym_fw2.h b/sys/dev/sym/sym_fw2.h
index 600bcf1..77f8df3 100644
--- a/sys/dev/sym/sym_fw2.h
+++ b/sys/dev/sym/sym_fw2.h
@@ -779,7 +779,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
 		offsetof (struct sym_ccb, phys.head.status),
 	/*
 	 *  If QUIRK_AUTOSAVE is set,
-	 *  do an "save pointer" operation.
+	 *  do a "save pointer" operation.
 	 */
 	SCR_FROM_REG (QU_REG),
 		0,
diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c
index 31e8b9c..d15a1ff 100644
--- a/sys/dev/sym/sym_hipd.c
+++ b/sys/dev/sym/sym_hipd.c
@@ -4028,7 +4028,7 @@ static void sym_log_hard_error(hcb_p np, u_short sist, u_char dstat)
  *  the following situations:
  *
  *  - SCSI parity error + Phase mismatch  (PAR|MA)
- *    When an parity error is detected in input phase 
+ *    When a parity error is detected in input phase 
  *    and the device switches to msg-in phase inside a 
  *    block MOV.
  *  - SCSI parity error + Unexpected disconnect (PAR|UDC)
@@ -6118,7 +6118,7 @@ static void sym_wide_nego(hcb_p np, tcb_p tp, ccb_p cp)
 	};
 
 	/*
-	 * Is it an request from the device?
+	 * Is it a request from the device?
 	 */
 	if (INB (HS_PRT) == HS_NEGOTIATE) {
 		OUTB (HS_PRT, HS_BUSY);
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index 925d64d..f3b29ce 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -915,7 +915,7 @@ wlstart(struct ifnet *ifp)
  *	the local buffer, the contents are copied to an mbuf chain that
  *	is then enqueued onto the appropriate "if" queue.
  *
- * input	: board number, and an frame descriptor address
+ * input	: board number, and a frame descriptor address
  * output	: the packet is put into an mbuf chain, and passed up
  * assumes	: if any errors occur, packet is "dropped on the floor"
  *
diff --git a/sys/fs/hpfs/hpfs_vnops.c b/sys/fs/hpfs/hpfs_vnops.c
index 5f144a8..4dff0f3 100644
--- a/sys/fs/hpfs/hpfs_vnops.c
+++ b/sys/fs/hpfs/hpfs_vnops.c
@@ -579,7 +579,7 @@ hpfs_setattr(ap)
 }
 
 /*
- * Last reference to an node.  If necessary, write or delete it.
+ * Last reference to a node.  If necessary, write or delete it.
  */
 int
 hpfs_inactive(ap)
diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c
index 2c74b41..566cd35 100644
--- a/sys/fs/nullfs/null_vnops.c
+++ b/sys/fs/nullfs/null_vnops.c
@@ -157,7 +157,7 @@
  * is appropriate in different situations.  In both cases,
  * it is the responsibility of the aliasing layer to make
  * the operation arguments "correct" for the lower layer
- * by mapping an vnode arguments to the lower layer.
+ * by mapping a vnode arguments to the lower layer.
  *
  * The first approach is to call the aliasing layer's bypass routine.
  * This method is most suitable when you wish to invoke the operation
diff --git a/sys/fs/smbfs/smbfs_smb.c b/sys/fs/smbfs/smbfs_smb.c
index cd85cbd..034fc77 100644
--- a/sys/fs/smbfs/smbfs_smb.c
+++ b/sys/fs/smbfs/smbfs_smb.c
@@ -364,7 +364,7 @@ smb_smb_flush(struct smbnode *np, struct smb_cred *scred)
 	int error;
 
 	if (np->n_opencount <= 0 || !SMBTOV(np) || SMBTOV(np)->v_type != VREG)
-		return 0; /* not an regular open file */
+		return 0; /* not a regular open file */
 	error = smb_rq_init(rqp, SSTOCP(ssp), SMB_COM_FLUSH, scred);
 	if (error)
 		return (error);
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 888ae9d..c9f9650 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -569,7 +569,7 @@ ccdinit(struct ccd_s *cs, char **cpaths, struct thread *td)
 	ccg->ccg_ncylinders = cs->sc_size / ccg->ccg_nsectors;
 
 	/*
-	 * Add an devstat entry for this device.
+	 * Add a devstat entry for this device.
 	 */
 	devstat_add_entry(&cs->device_stats, "ccd", cs->sc_unit,
 			  ccg->ccg_secsize, DEVSTAT_ALL_SUPPORTED,
diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c
index 6320440..435661b 100644
--- a/sys/gnu/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_balloc.c
@@ -47,7 +47,7 @@
 #elif __alpha__
 #include <gnu/ext2fs/alpha-bitops.h>
 #else
-#error Provide an bitops.h file, please !
+#error Provide a bitops.h file, please!
 #endif
 
 #define in_range(b, first, len)		((b) >= (first) && (b) <= (first) + (len) - 1)
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index 6320440..435661b 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -47,7 +47,7 @@
 #elif __alpha__
 #include <gnu/ext2fs/alpha-bitops.h>
 #else
-#error Provide an bitops.h file, please !
+#error Provide a bitops.h file, please!
 #endif
 
 #define in_range(b, first, len)		((b) >= (first) && (b) <= (first) + (len) - 1)
diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c
index d56a294..10b292e 100644
--- a/sys/i386/isa/istallion.c
+++ b/sys/i386/isa/istallion.c
@@ -3745,7 +3745,7 @@ static int stli_clrportstats(stliport_t *portp, caddr_t data)
 /*****************************************************************************/
 
 /*
- *	Code to handle an "staliomem" read and write operations. This device
+ *	Code to handle a "staliomem" read and write operations. This device
  *	is the contents of the board shared memory. It is used for down
  *	loading the slave image (and debugging :-)
  */
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e3737d7..e4a84c3 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -615,7 +615,7 @@ DB_SHOW_COMMAND(pgrpdump, pgrpdump)
 #endif /* DDB */
 
 /*
- * Fill in an kinfo_proc structure for the specified process.
+ * Fill in a kinfo_proc structure for the specified process.
  * Must be called with the target process locked.
  */
 void
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index ebd3e66..6bfc844 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -364,7 +364,7 @@ struct ifaddr {
 /*
  * The prefix structure contains information about one prefix
  * of an interface.  They are maintained by the different address families,
- * are allocated and attached when an prefix or an address is set,
+ * are allocated and attached when a prefix or an address is set,
  * and are linked together so all prefixes for an interface can be located.
  */
 struct ifprefix {
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 745cdb2..c597080 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -1054,7 +1054,7 @@ response:
 /*
  * Process a close response or close confirmation
  *
- * Called when an close response or close confirmation is received.
+ * Called when a close response or close confirmation is received.
  * Processing will be based on the state of the requested connection and
  * the returned status.
  *
@@ -1241,7 +1241,7 @@ spans_add_req(spp, msg)
 /*
  * Process a join request
  *
- * Called when an join request is received.  We don't support group
+ * Called when a join request is received.  We don't support group
  * addresses, so we just reject the request.
  *
  * Arguments:
@@ -1286,7 +1286,7 @@ spans_join_req(spp, msg)
 /*
  * Process a leave request
  *
- * Called when an leave request is received.  We don't support group
+ * Called when a leave request is received.  We don't support group
  * addresses, so we just reject the request.
  *
  * Arguments:
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index 19d4ff6..2b34219 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -325,7 +325,7 @@ spans_find_vpvc(spp, vpi, vci, dir)
  *
  * Arguments:
  *	spp	pointer to SPANS protocol instance
- *	p	pointer to an spans_atm_conn structure
+ *	p	pointer to a spans_atm_conn structure
  *
  * Returns:
  *	0	there is no such VCCB
diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c
index 76d93b9..8f9c75c 100644
--- a/sys/netatm/uni/sscop_lower.c
+++ b/sys/netatm/uni/sscop_lower.c
@@ -67,7 +67,7 @@ __RCSID("@(#) $FreeBSD$");
  * Local variables
  */
 /*
- * Stack commands with arg1 containing an buffer pointer
+ * Stack commands with arg1 containing a buffer pointer
  */
 static u_char	sscop_buf1[] = {
 		0,
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index d16fd59..9edb73b 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -206,7 +206,7 @@ struct	ip6stat {
 	 * from the destination is chosen.
 	 */
 	u_quad_t ip6s_sources_otherscope[16];
-	/* number of times that an deprecated address is chosen */
+	/* number of times that a deprecated address is chosen */
 	u_quad_t ip6s_sources_deprecated[16];
 
 	u_quad_t ip6s_forward_cachehit;
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 88af7ce..16bfbb4 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -84,7 +84,7 @@ static int dad_ignore_ns = 0;	/* ignore NS in DAD - specwise incorrect*/
 static int dad_maxtry = 15;	/* max # of *tries* to transmit DAD packet */
 
 /*
- * Input an Neighbor Solicitation Message.
+ * Input a Neighbor Solicitation Message.
  *
  * Based on RFC 2461
  * Based on RFC 2462 (duplicated address detection)
@@ -323,7 +323,7 @@ nd6_ns_input(m, off, icmp6len)
 }
 
 /*
- * Output an Neighbor Solicitation Message. Caller specifies:
+ * Output a Neighbor Solicitation Message. Caller specifies:
  *	- ICMP6 header source IP6 address
  *	- ND6 header target IP6 address
  *	- ND6 header source datalink address
diff --git a/sys/netsmb/smb.h b/sys/netsmb/smb.h
index 8ffd2ef..56cfbcc 100644
--- a/sys/netsmb/smb.h
+++ b/sys/netsmb/smb.h
@@ -334,7 +334,7 @@ enum smb_dialects {
 #define SMBSUCCESS	0x00
 #define ERRDOS		0x01
 #define ERRSRV		0x02
-#define ERRHRD		0x03	/* Error is an hardware error. */
+#define ERRHRD		0x03	/* Error is a hardware error. */
 #define ERRCMD		0xFF	/* Command was not in the "SMB" format. */
 
 /*
diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c
index d77f8f7..bfa419e 100644
--- a/sys/nfsclient/bootp_subr.c
+++ b/sys/nfsclient/bootp_subr.c
@@ -1386,7 +1386,7 @@ bootpc_compose_query(struct bootpc_ifcontext *ifctx,
 	*vendp = TAG_END;
 
 	ifctx->call.secs = 0;
-	ifctx->call.flags = htons(0x8000); /* We need an broadcast answer */
+	ifctx->call.flags = htons(0x8000); /* We need a broadcast answer */
 }
 
 static int
diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c
index 18669ee..5369e46 100644
--- a/sys/pc98/cbus/olpt.c
+++ b/sys/pc98/cbus/olpt.c
@@ -62,7 +62,7 @@
  * This driver sends two bytes (0x08, 0x00) in front of each packet,
  * to allow us to distinguish another format later.
  *
- * Now added an Linux/Crynwr compatibility mode which is enabled using
+ * Now added a Linux/Crynwr compatibility mode which is enabled using
  * IF_LINK0 - Tim Wilkinson.
  *
  * TODO:
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 18669ee..5369e46 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -62,7 +62,7 @@
  * This driver sends two bytes (0x08, 0x00) in front of each packet,
  * to allow us to distinguish another format later.
  *
- * Now added an Linux/Crynwr compatibility mode which is enabled using
+ * Now added a Linux/Crynwr compatibility mode which is enabled using
  * IF_LINK0 - Tim Wilkinson.
  *
  * TODO:
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index ad29859..bd7b5c3 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -2056,7 +2056,7 @@ static	struct script script0 = {
 }/*-------------------------< DISCONNECT >---------------*/,{
 	/*
 	**	If QUIRK_AUTOSAVE is set,
-	**	do an "save pointer" operation.
+	**	do a "save pointer" operation.
 	*/
 	SCR_FROM_REG (QU_REG),
 		0,
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 939018e..33611d7 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -537,7 +537,7 @@ psycho_attach(device_t dev)
 		 * of a pair of psycho's to arrive here.
 		 *
 		 * We should calculate a TSB size based on amount of RAM
-		 * and number of bus controllers and number an type of
+		 * and number of bus controllers and number and type of
 		 * child devices.
 		 *
 		 * For the moment, 32KB should be more than enough.
diff --git a/sys/sparc64/sparc64/cache.c b/sys/sparc64/sparc64/cache.c
index ef17c5d..6b27f14 100644
--- a/sys/sparc64/sparc64/cache.c
+++ b/sys/sparc64/sparc64/cache.c
@@ -78,7 +78,7 @@
 /*
  * Cache routines.
  *
- * UltraSPARCs have an virtually indexed, physically tagged (VIPT) level 1 data
+ * UltraSPARCs have a virtually indexed, physically tagged (VIPT) level 1 data
  * cache (D$) and physically indexed, physically tagged (PIPT) level 1
  * instruction (I$) and Level 2 (E$) caches.
  * D$ is directly mapped, I$ is pseudo 2-way associative. The Level 2 cache (E$)
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index 00e7643..739b1ec 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -148,7 +148,7 @@ struct nameidata {
 #define	PARAMASK	0xfffe00 /* mask of parameter descriptors */
 
 /*
- * Initialization of an nameidata structure.
+ * Initialization of a nameidata structure.
  */
 static void NDINIT(struct nameidata *, u_long, u_long, enum uio_seg,
 	    const char *, struct thread *);
diff --git a/sys/sys/unpcb.h b/sys/sys/unpcb.h
index 754cce6..e69eedc 100644
--- a/sys/sys/unpcb.h
+++ b/sys/sys/unpcb.h
@@ -44,7 +44,7 @@
  * Protocol control block for an active
  * instance of a UNIX internal protocol.
  *
- * A socket may be associated with an vnode in the
+ * A socket may be associated with a vnode in the
  * filesystem.  If so, the unp_vnode pointer holds
  * a reference count to this vnode, which should be irele'd
  * when the socket goes away.