[asterisk-commits] dbrooks: branch 1.6.1 r209233 - in /branches/1.6.1: ./ channels/ include/aste...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Jul 27 15:28:33 CDT 2009


Author: dbrooks
Date: Mon Jul 27 15:28:28 2009
New Revision: 209233

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209233
Log:
Merged revisions 209098 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209098 | dbrooks | 2009-07-27 11:33:50 -0500 (Mon, 27 Jul 2009) | 6 lines
  
  Fixing typos. Replaces "recieved" with "received" and "initilize" with "initialize"
  
  (closes issue #15571)
  Reported by: alecdavis
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_dahdi.c
    branches/1.6.1/channels/chan_vpb.cc
    branches/1.6.1/include/asterisk/module.h
    branches/1.6.1/main/features.c
    branches/1.6.1/main/loader.c
    branches/1.6.1/res/res_agi.c
    branches/1.6.1/res/res_jabber.c
    branches/1.6.1/res/res_smdi.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Mon Jul 27 15:28:28 2009
@@ -4737,7 +4737,7 @@
 			p->echocanon = 0;
 			break;
 		case DAHDI_EVENT_BITSCHANGED:
-			ast_log(LOG_WARNING, "Recieved bits changed on %s signalling?\n", sig2str(p->sig));
+			ast_log(LOG_WARNING, "Received bits changed on %s signalling?\n", sig2str(p->sig));
 		case DAHDI_EVENT_PULSE_START:
 			/* Stop tone if there's a pulse start and the PBX isn't started */
 			if (!ast->pbx)
@@ -7210,7 +7210,7 @@
 				else if (smdi_msg->type == 'N')
 					pbx_builtin_setvar_helper(chan, "_SMDI_VM_TYPE", "u");
 
-				ast_debug(1, "Recieved SMDI message on %s\n", chan->name);
+				ast_debug(1, "Received SMDI message on %s\n", chan->name);
 			} else {
 				ast_log(LOG_WARNING, "SMDI enabled but no SMDI message present\n");
 			}

Modified: branches/1.6.1/channels/chan_vpb.cc
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_vpb.cc?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/channels/chan_vpb.cc (original)
+++ branches/1.6.1/channels/chan_vpb.cc Mon Jul 27 15:28:28 2009
@@ -1509,7 +1509,7 @@
 	tmp->callgroup = callgroup;
 	tmp->pickupgroup = pickupgroup;
 
-	/* Initilize dtmf caller ID position variable */
+	/* Initialize dtmf caller ID position variable */
 	tmp->dtmf_caller_pos = 0;
 
 	ast_copy_string(tmp->language, language, sizeof(tmp->language));

Modified: branches/1.6.1/include/asterisk/module.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/module.h?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/include/asterisk/module.h (original)
+++ branches/1.6.1/include/asterisk/module.h Mon Jul 27 15:28:28 2009
@@ -70,7 +70,7 @@
  * \param resource_name The name of the module to load.
  *
  * This function is run by the PBX to load the modules.  It performs
- * all loading and initilization tasks.   Basically, to load a module, just
+ * all loading and initialization tasks.   Basically, to load a module, just
  * give it the name of the module and it will do the rest.
  *
  * \return See possible enum values for ast_module_load_result.

Modified: branches/1.6.1/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Mon Jul 27 15:28:28 2009
@@ -1233,7 +1233,7 @@
 		if (!transferer->cdr) { /* this code should never get called (in a perfect world) */
 			transferer->cdr=ast_cdr_alloc();
 			if (transferer->cdr) {
-				ast_cdr_init(transferer->cdr, transferer); /* initilize our channel's cdr */
+				ast_cdr_init(transferer->cdr, transferer); /* initialize our channel's cdr */
 				ast_cdr_start(transferer->cdr);
 			}
 		}

Modified: branches/1.6.1/main/loader.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/loader.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/main/loader.c (original)
+++ branches/1.6.1/main/loader.c Mon Jul 27 15:28:28 2009
@@ -756,7 +756,7 @@
  *
  *  If the ast_heap is provided (not NULL) the module is found and added to the
  *  heap without running the module's load() function.  By doing this, modules
- *  added to the resource_heap can be initilized later in order by priority. 
+ *  added to the resource_heap can be initialized later in order by priority. 
  *
  *  If the ast_heap is not provided, the module's load function will be executed
  *  immediately */

Modified: branches/1.6.1/res/res_agi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_agi.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/res/res_agi.c (original)
+++ branches/1.6.1/res/res_agi.c Mon Jul 27 15:28:28 2009
@@ -2223,7 +2223,7 @@
 
 static char usage_getdata[] =
 " Usage: GET DATA <file to be streamed> [timeout] [max digits]\n"
-"	Stream the given file, and recieve DTMF data. Returns the digits received\n"
+"	Stream the given file, and receive DTMF data. Returns the digits received\n"
 "from the channel at the other end.\n";
 
 static char usage_setcontext[] =

Modified: branches/1.6.1/res/res_jabber.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_jabber.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/res/res_jabber.c (original)
+++ branches/1.6.1/res/res_jabber.c Mon Jul 27 15:28:28 2009
@@ -462,7 +462,7 @@
 /*!
  * \brief Dial plan function to send a message.
  * \param chan ast_channel
- * \param data  Data is sender|reciever|message.
+ * \param data  Data is sender|receiver|message.
  * \return 0 on success,-1 on error.
  */
 static int aji_send_exec(struct ast_channel *chan, void *data)
@@ -1339,7 +1339,7 @@
 
 	resource = aji_find_resource(buddy, pak->from->resource);
 	if (pak->subtype == IKS_TYPE_ERROR) {
-		ast_log(LOG_WARNING, "Recieved error from a client, turn on jabber debug!\n");
+		ast_log(LOG_WARNING, "Received error from a client, turn on jabber debug!\n");
 		return IKS_FILTER_EAT;
 	}
 	if (pak->subtype == IKS_TYPE_RESULT) {

Modified: branches/1.6.1/res/res_smdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/res/res_smdi.c?view=diff&rev=209233&r1=209232&r2=209233
==============================================================================
--- branches/1.6.1/res/res_smdi.c (original)
+++ branches/1.6.1/res/res_smdi.c Mon Jul 27 15:28:28 2009
@@ -658,7 +658,7 @@
 			/* add the message to the message queue */
 			md_msg->timestamp = ast_tvnow();
 			ast_smdi_md_message_push(iface, md_msg);
-			ast_log(LOG_DEBUG, "Recieved SMDI MD message on %s\n", iface->name);
+			ast_log(LOG_DEBUG, "Received SMDI MD message on %s\n", iface->name);
 			
 			ASTOBJ_UNREF(md_msg, ast_smdi_md_message_destroy);
 
@@ -707,7 +707,7 @@
 			/* add the message to the message queue */
 			mwi_msg->timestamp = ast_tvnow();
 			ast_smdi_mwi_message_push(iface, mwi_msg);
-			ast_log(LOG_DEBUG, "Recieved SMDI MWI message on %s\n", iface->name);
+			ast_log(LOG_DEBUG, "Received SMDI MWI message on %s\n", iface->name);
 			
 			ASTOBJ_UNREF(mwi_msg, ast_smdi_mwi_message_destroy);
 		} else {




More information about the asterisk-commits mailing list