Index: protocols/oscar/aim.h
===================================================================
--- protocols/oscar/aim.h	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/aim.h	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -871,5 +871,5 @@
  * SNAC Family: Internal Messages
  *
- * This isn't truely a SNAC family either, but using
+ * This isn't truly a SNAC family either, but using
  * these, we can integrated non-SNAC services into
  * the SNAC-centered libfaim callback structure.
Index: protocols/oscar/auth.c
===================================================================
--- protocols/oscar/auth.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/auth.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -41,5 +41,5 @@
  * meaning you generally never call this.
  *
- * But there are times when something might want it seperate. Specifically,
+ * But there are times when something might want it separate. Specifically,
  * libfaim sends this internally when doing SNAC login.
  *
Index: protocols/oscar/conn.c
===================================================================
--- protocols/oscar/conn.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/conn.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -15,5 +15,5 @@
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
- * without being guarenteed a "Not supported" SNAC error.
+ * without being guaranteed a "Not supported" SNAC error.
  *
  * The grand theory of things says that these associations transcend
@@ -36,5 +36,5 @@
  *
  * Here comes the good bit.  Without even letting anyone know, particularly
- * the module that decided to send this SNAC, and definitly not that twit
+ * the module that decided to send this SNAC, and definitely not that twit
  * in Greenland, you send out a service request.  In this request, you have
  * marked the need for a connection supporting group 0x000e.  A few seconds
Index: protocols/oscar/im.c
===================================================================
--- protocols/oscar/im.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/im.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -50,5 +50,5 @@
  * encoding for your message.  In UNICODE mode, _all_ characters must
  * occupy 16bits, including ones that are not special.  (Remember that
- * the first 128 UNICODE symbols are equivelent to ASCII7, however they
+ * the first 128 UNICODE symbols are equivalent to ASCII7, however they
  * must be prefixed with a zero high order byte.)
  *
@@ -64,5 +64,5 @@
  * in all of libfaim, it is written with performance in mind.  As such,
  * it is not as clear as it could be in respect to how this message is
- * supposed to be layed out. Most obviously, tlvlists should be used
+ * supposed to be laid out. Most obviously, tlvlists should be used
  * instead of writing out the bytes manually.
  *
@@ -476,5 +476,5 @@
  * examples of how to do this.
  *
- * I would definitly recommend avoiding this feature unless you really
+ * I would definitely recommend avoiding this feature unless you really
  * know what you are doing, and/or you have something neat to do with it.
  *
@@ -638,5 +638,5 @@
 			}
 #if 0
-			/* XXX this isn't really necesary... */
+			/* XXX this isn't really necessary... */
 			if (((args.flag1 != 0x0000) &&
 			     (args.flag1 != 0x0002) &&
@@ -1161,9 +1161,9 @@
 	 *
 	 * Channel 0x0001 is the message channel.  There are
-	 * other channels for things called "rendevous"
+	 * other channels for things called "rendezvous"
 	 * which represent chat and some of the other new
 	 * features of AIM2/3/3.5.
 	 *
-	 * Channel 0x0002 is the Rendevous channel, which
+	 * Channel 0x0002 is the Rendezvous channel, which
 	 * is where Chat Invitiations and various client-client
 	 * connection negotiations come from.
@@ -1181,5 +1181,5 @@
 	 * with the TLVs read below, they are two different pieces.  The
 	 * userinfo block contains the number of TLVs that contain user
-	 * information, the rest are not even though there is no seperation.
+	 * information, the rest are not even though there is no separation.
 	 * aim_extractuserinfo() returns the number of bytes used by the
 	 * userinfo tlvs, so you can start reading the rest of them right
@@ -1253,5 +1253,5 @@
 /*
  *
- * I definitly recommend sending this.  If you don't, you'll be stuck
+ * I definitely recommend sending this.  If you don't, you'll be stuck
  * with the rather unreasonable defaults.  You don't want those.  Send this.
  *
Index: protocols/oscar/misc.c
===================================================================
--- protocols/oscar/misc.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/misc.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -3,5 +3,5 @@
  * aim_misc.c
  *
- * TODO: Seperate a lot of this into an aim_bos.c.
+ * TODO: Separate a lot of this into an aim_bos.c.
  *
  * Other things...
Index: protocols/oscar/msgcookie.c
===================================================================
--- protocols/oscar/msgcookie.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/msgcookie.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -142,5 +142,5 @@
  * @cookiep: the address of a pointer to the cookie struct to remove
  *
- * this function removes the cookie *cookie from teh list of cookies
+ * this function removes the cookie *cookie from the list of cookies
  * in sess, and then frees all memory associated with it. including
  * its data! if you want to use the private data after calling this,
Index: protocols/oscar/oscar.c
===================================================================
--- protocols/oscar/oscar.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/oscar.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -1266,5 +1266,5 @@
 	} break;
 
-	case 2: {         /* rendevous */
+	case 2: {         /* rendezvous */
 		struct aim_incomingim_ch2_args *args;
 		args = va_arg(ap, struct aim_incomingim_ch2_args *);
Index: protocols/oscar/rxhandlers.c
===================================================================
--- protocols/oscar/rxhandlers.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/rxhandlers.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -381,5 +381,5 @@
 	/*
 	 * This doesn't have to be called here.  It could easily be done
-	 * by a seperate thread or something. It's an administrative operation,
+	 * by a separate thread or something. It's an administrative operation,
 	 * and can take a while. Though the less you call it the less memory
 	 * you'll have :)
Index: protocols/oscar/rxqueue.c
===================================================================
--- protocols/oscar/rxqueue.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/rxqueue.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -361,5 +361,5 @@
 /*
  * Grab a single command sequence off the socket, and enqueue
- * it in the incoming event queue in a seperate struct.
+ * it in the incoming event queue in a separate struct.
  */
 int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
@@ -479,5 +479,5 @@
 
 /*
- * Purge recieve queue of all handled commands (->handled==1).  Also
+ * Purge receive queue of all handled commands (->handled==1).  Also
  * allows for selective freeing using ->nofree so that the client can
  * keep the data for various purposes.
Index: protocols/oscar/service.c
===================================================================
--- protocols/oscar/service.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/service.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -157,5 +157,5 @@
 
 /*
- * OSCAR defines several 'rate classes'.  Each class has seperate
+ * OSCAR defines several 'rate classes'.  Each class has separate
  * rate limiting properties (limit level, alert level, disconnect
  * level, etc), and a set of SNAC family/type pairs associated with
@@ -709,7 +709,7 @@
  * of memory.  (I won't put it past them to start requesting data in
  * less static regions -- regions that are initialized at run time, but still
- * before the client recieves this request.)
- *
- * When the client recieves the request, it adds it to the current ds
+ * before the client receives this request.)
+ *
+ * When the client receives the request, it adds it to the current ds
  * (0x00400000) and dereferences it, copying the data into a buffer which
  * it then runs directly through the MD5 hasher.  The 16 byte output of
@@ -723,12 +723,12 @@
  *     download a FREE, fully featured, and authorized client, here
  *     http://www.aol.com/aim/download2.html"
- * The connection is then closed, recieving disconnect code 1, URL
+ * The connection is then closed, receiving disconnect code 1, URL
  * http://www.aim.aol.com/errors/USER_LOGGED_OFF_NEW_LOGIN.html.
  *
  * Note, however, that numerous inconsistencies can cause the above error,
- * not just sending back a bad hash.  Do not immediatly suspect this code
+ * not just sending back a bad hash.  Do not immediately suspect this code
  * if you get disconnected.  AOL and the open/free software community have
  * played this game for a couple years now, generating the above message
- * on numerous ocassions.
+ * on numerous occasions.
  *
  * Anyway, neener.  We win again.
Index: protocols/oscar/tlv.c
===================================================================
--- protocols/oscar/tlv.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/tlv.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -25,5 +25,5 @@
  * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
- * just as effecient as the in-place TLV parsing used in a couple places
+ * just as efficient as the in-place TLV parsing used in a couple places
  * in libfaim.
  *
@@ -135,5 +135,5 @@
 /**
  * aim_addtlvtochain_str - Add a string to a TLV chain
- * @list: Desination chain (%NULL pointer if empty)
+ * @list: Designation chain (%NULL pointer if empty)
  * @type: TLV type
  * @str: String to add
Index: protocols/oscar/txqueue.c
===================================================================
--- protocols/oscar/txqueue.c	(revision 53c77990909f0d4ed726f580c77fc7ffccdd4e48)
+++ protocols/oscar/txqueue.c	(revision f85cb0bd23deb366ea672a46846946c7d6475422)
@@ -67,5 +67,5 @@
  * The overall purpose here is to enqueue the passed in command struct
  * into the outgoing (tx) queue.  Basically...
- *   1) Make a scope-irrelevent copy of the struct
+ *   1) Make a scope-irrelevant copy of the struct
  *   3) Mark as not-sent-yet
  *   4) Enqueue the struct into the list
