diff --git a/pbx/ael/ael-test/ael-test2/apptest.ael2 b/pbx/ael/ael-test/ael-test2/apptest.ael2
index c477d8531b5eb998a78f5e80f9af5c2f9512989b..9114c5cb9a7c911b1b3464c96e391931a35322f0 100644
--- a/pbx/ael/ael-test/ael-test2/apptest.ael2
+++ b/pbx/ael/ael-test/ael-test2/apptest.ael2
@@ -128,7 +128,7 @@
 	TrySystem(command);
 	TxFAX(filename,caller,debug);
 	UnpauseQueueMember(queuename,iface,j);
-	UserEvent(eventanme,body);
+	UserEvent(eventname,body);
 	Verbose(5,message);
 	VMAuthenticate(mailbox@cont,s);
 	VoiceMail(mailbox@cont,bg()suj);
diff --git a/pbx/ael/ael-test/ael-test3/extensions.ael b/pbx/ael/ael-test/ael-test3/extensions.ael
index 95492116b7db1aa6af3cdf27626c6ba7cd7cc32f..aae77a2745fe436cb4c34ec48faeea60b1b2dd51 100755
--- a/pbx/ael/ael-test/ael-test3/extensions.ael
+++ b/pbx/ael/ael-test/ael-test3/extensions.ael
@@ -2056,7 +2056,7 @@ macro callerid-liar()
                             //         If you are telemarketing, cross me off the list, and don't call again.
                             //         If you did this by mistake, forgive my defenses, and call again.
                            // Alternate: (priv-liar2)
-				   // Script: You have chosen to try to deceive my system and withold your CallerID,
+				   // Script: You have chosen to try to deceive my system and withhold your CallerID,
                                    //           by entering my own phone number as YOUR CallerID. I find this
                                    //           offensive because you are being dishonest. I will not do business nor
                                    //           waste my time talking to anyone who is less than honest and forthcoming.
diff --git a/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2 b/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
index 1f6ffed83b01caaacd97d69f19fd0f80a8b6e9e5..5784dfb10030c69c53c1690d269923fadd2fe0db 100755
--- a/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
+++ b/pbx/ael/ael-test/ael-test3/telemarket_torture.ael2
@@ -1,5 +1,5 @@
 //
-// AN EXCERSIZE IN BAD DIALPLAN DESIGN
+// AN EXERCISE IN BAD DIALPLAN DESIGN
 //  (What better testing ground than on telemarketers?)
 //
 
@@ -66,7 +66,7 @@ context telemarket-charity {
 		begin:
 		Playback(telemark-charity-intro);
                                                //  We have contributed generously to many worthy causes in the past, and will
-                                               // continue to do so in the future. But we suspect that such organizatons
+                                               // continue to do so in the future. But we suspect that such organizations
                                                // have sold our name and phone number to each other until we are now hounded
                                                // day and night by literally hundreds of such organizations.
                                                // Enough is Enough!
@@ -87,7 +87,7 @@ context telemarket-charity {
                                                // If your organization is a police or fireman or other similar support entity,  please dial 3.
                                                // If your organization is a grade school to high school related
                                                //        fund raiser or other type of activity,  please dial 4.
-                                               // If your organization is a college or univerity or alumnis organization,  please dial 5.
+                                               // If your organization is a college or university or alumnis organization,  please dial 5.
                                                // If your organization is animal rights or ecology related organization, please dial 6.
                                                // If your organization is a political action or candidate support related, please dial 7.
                                                // If your organization is a substance abuse related organization or cause, please dial 8.
@@ -275,7 +275,7 @@ context telemarket-political3 {
 		begin:
 		Playback(telemark-politx-intro);
 		Playback(telemark-polit3-choices);
-                                               //  if You represent the Independant American Party, dial 1.
+                                               //  if You represent the Independent American Party, dial 1.
                                                //  if You represent the Labor Party, dial 2.
                                                //  if You represent the Libertarian Party, dial 3.
                                                //  if You represent the Light Party, dial 4.
@@ -722,7 +722,7 @@ context telemark-mag-renew {
                                                // Do you need verification information? Normally I opt out of such nonsense, if possible.
                                                // If not, use whatever of the following you can:
                                                // My birth month is October.
-                                               // My birthplace is Kigali, in Rwanda, in Afica.
+                                               // My birthplace is Kigali, in Rwanda, in Africa.
                                                // My eye color is orange.
                                                // All of these are wonderfully false, but I use them regularly for such purposes. Thank you.
 		Hangup();
diff --git a/pbx/ael/ael-test/ael-test4/apptest.ael2 b/pbx/ael/ael-test/ael-test4/apptest.ael2
index c477d8531b5eb998a78f5e80f9af5c2f9512989b..9114c5cb9a7c911b1b3464c96e391931a35322f0 100644
--- a/pbx/ael/ael-test/ael-test4/apptest.ael2
+++ b/pbx/ael/ael-test/ael-test4/apptest.ael2
@@ -128,7 +128,7 @@
 	TrySystem(command);
 	TxFAX(filename,caller,debug);
 	UnpauseQueueMember(queuename,iface,j);
-	UserEvent(eventanme,body);
+	UserEvent(eventname,body);
 	Verbose(5,message);
 	VMAuthenticate(mailbox@cont,s);
 	VoiceMail(mailbox@cont,bg()suj);
diff --git a/pbx/ael/ael-test/ael-vtest13/extensions.ael b/pbx/ael/ael-test/ael-vtest13/extensions.ael
index 2d2ec12cae37c24c973d11c1e08f208e6dbb9602..d8870cb4a06f88e6921ebbd926ea2b7dc70b1baf 100755
--- a/pbx/ael/ael-test/ael-vtest13/extensions.ael
+++ b/pbx/ael/ael-test/ael-vtest13/extensions.ael
@@ -2055,7 +2055,7 @@ macro callerid-liar()
                             //         If you are telemarketing, cross me off the list, and don't call again.
                             //         If you did this by mistake, forgive my defenses, and call again.
                            // Alternate: (priv-liar2)
-				   // Script: You have chosen to try to deceive my system and withold your CallerID,
+				   // Script: You have chosen to try to deceive my system and withhold your CallerID,
                                    //           by entering my own phone number as YOUR CallerID. I find this
                                    //           offensive because you are being dishonest. I will not do business nor
                                    //           waste my time talking to anyone who is less than honest and forthcoming.
diff --git a/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2 b/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
index 1f6ffed83b01caaacd97d69f19fd0f80a8b6e9e5..5784dfb10030c69c53c1690d269923fadd2fe0db 100755
--- a/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
+++ b/pbx/ael/ael-test/ael-vtest13/telemarket_torture.ael2
@@ -1,5 +1,5 @@
 //
-// AN EXCERSIZE IN BAD DIALPLAN DESIGN
+// AN EXERCISE IN BAD DIALPLAN DESIGN
 //  (What better testing ground than on telemarketers?)
 //
 
@@ -66,7 +66,7 @@ context telemarket-charity {
 		begin:
 		Playback(telemark-charity-intro);
                                                //  We have contributed generously to many worthy causes in the past, and will
-                                               // continue to do so in the future. But we suspect that such organizatons
+                                               // continue to do so in the future. But we suspect that such organizations
                                                // have sold our name and phone number to each other until we are now hounded
                                                // day and night by literally hundreds of such organizations.
                                                // Enough is Enough!
@@ -87,7 +87,7 @@ context telemarket-charity {
                                                // If your organization is a police or fireman or other similar support entity,  please dial 3.
                                                // If your organization is a grade school to high school related
                                                //        fund raiser or other type of activity,  please dial 4.
-                                               // If your organization is a college or univerity or alumnis organization,  please dial 5.
+                                               // If your organization is a college or university or alumnis organization,  please dial 5.
                                                // If your organization is animal rights or ecology related organization, please dial 6.
                                                // If your organization is a political action or candidate support related, please dial 7.
                                                // If your organization is a substance abuse related organization or cause, please dial 8.
@@ -275,7 +275,7 @@ context telemarket-political3 {
 		begin:
 		Playback(telemark-politx-intro);
 		Playback(telemark-polit3-choices);
-                                               //  if You represent the Independant American Party, dial 1.
+                                               //  if You represent the Independent American Party, dial 1.
                                                //  if You represent the Labor Party, dial 2.
                                                //  if You represent the Libertarian Party, dial 3.
                                                //  if You represent the Light Party, dial 4.
@@ -722,7 +722,7 @@ context telemark-mag-renew {
                                                // Do you need verification information? Normally I opt out of such nonsense, if possible.
                                                // If not, use whatever of the following you can:
                                                // My birth month is October.
-                                               // My birthplace is Kigali, in Rwanda, in Afica.
+                                               // My birthplace is Kigali, in Rwanda, in Africa.
                                                // My eye color is orange.
                                                // All of these are wonderfully false, but I use them regularly for such purposes. Thank you.
 		Hangup();
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index f6af7bf2f3d24c0b97be181314d6a302c45932ca..648d7512780c86faa86291977f92f0f6f486525e 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -843,7 +843,7 @@ static char *handle_cli_dialplan_save(struct ast_cli_entry *e, int cmd, struct a
 
 	if (ast_mutex_lock(&save_dialplan_lock)) {
 		ast_cli(a->fd,
-			"Failed to lock dialplan saving (another proccess saving?)\n");
+			"Failed to lock dialplan saving (another process saving?)\n");
 		return CLI_FAILURE;
 	}
 	/* XXX the code here is quite loose, a pathname with .conf in it
@@ -1376,7 +1376,7 @@ static char *handle_cli_dialplan_add_ignorepat(struct ast_cli_entry *e, int cmd,
 			break;
 
 		default:
-			ast_cli(a->fd, "Failed to add ingore pattern '%s' into '%s' context\n",
+			ast_cli(a->fd, "Failed to add ignore pattern '%s' into '%s' context\n",
 				a->argv[3], a->argv[5]);
 			break;
 		}
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index a5041714901bca4f17673c948fe25ab265d96121..df1f303d3c434970dbca01f8b82ba051ba96e7c4 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -168,7 +168,7 @@ enum {
 	FLAG_DEAD =        (1 << 1),  /*!< Transaction is dead */
 	FLAG_FINAL =       (1 << 2),  /*!< Transaction has final message sent */
 	FLAG_ISQUAL =      (1 << 3),  /*!< Transaction is a qualification */
-	FLAG_ENCRYPT =     (1 << 4),  /*!< Transaction is encrypted wiht ECX/DCX */
+	FLAG_ENCRYPT =     (1 << 4),  /*!< Transaction is encrypted with ECX/DCX */
 	FLAG_SENDFULLKEY = (1 << 5),  /*!< Send full key on transaction */
 	FLAG_STOREHIST =   (1 << 6),  /*!< Record historic performance */
 };
@@ -2164,7 +2164,7 @@ static void load_password(void)
 		}
 	}
 	if (current) {
-		/* Current key is still valid, just setup rotatation properly */
+		/* Current key is still valid, just setup rotation properly */
 		ast_copy_string(cursecret, current, sizeof(cursecret));
 		rotatetime = expired;
 	} else {
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index 8673dfdef5b8a3d9849e93def25bc808c8621769..aad41101691b98b2145be891411f9962407e8cef 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -456,7 +456,7 @@ static void lua_create_app_table(lua_State *L)
 }
 
 /*!
- * \brief Create the global 'channel' table for accesing channel variables
+ * \brief Create the global 'channel' table for accessing channel variables
  *
  * \param L the lua_State to use
  */
@@ -716,7 +716,7 @@ static int lua_autoservice_start(lua_State *L)
 }
 
 /*!
- * \brief [lua_CFunction] Tell pbx_lua to stop maintaning an autoservice on
+ * \brief [lua_CFunction] Tell pbx_lua to stop maintaining an autoservice on
  * this channel (for access from lua, don't call directly)
  *
  * \param L the lua_State to use
@@ -878,7 +878,7 @@ static int lua_sort_extensions(lua_State *L)
 		lua_newtable(L);
 		context_order = lua_gettop(L);
 
-		/* iterate through this context an popluate the corrisponding
+		/* iterate through this context an populate the corrisponding
 		 * table in the extensions_order table */
 		for (lua_pushnil(L); lua_next(L, context); lua_pop(L, 1)) {
 			int exten = lua_gettop(L) - 1;
@@ -919,7 +919,7 @@ static int lua_sort_extensions(lua_State *L)
 }
 
 /*!
- * \brief Register dialplan switches for our pbx_lua contexs.
+ * \brief Register dialplan switches for our pbx_lua contexts.
  *
  * In the event of an error, an error string will be pushed onto the lua stack.
  *
@@ -977,7 +977,7 @@ static int lua_register_switches(lua_State *L)
 }
 
 /*!
- * \brief Register dialplan hints for our pbx_lua contexs.
+ * \brief Register dialplan hints for our pbx_lua contexts.
  *
  * In the event of an error, an error string will be pushed onto the lua stack.
  *