Fix typo's (retrieve, specified, address).

........

Merged revisions 430996 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 430998 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@431000 65c4cc65-6c06-0410-ace0-fbb531ad65f3

14 files changed, 20 insertions, 20 deletions

diff --git a/addons/ooh323c/src/ooh245.c b/addons/ooh323c/src/ooh245.c
index 09dd3a406..39b399452 100644
--- a/addons/ooh323c/src/ooh245.c
+++ b/addons/ooh323c/src/ooh245.c
@@ -1909,7 +1909,7 @@ int ooOnReceivedOpenLogicalChannelAck(OOH323CallData *call,
                                      T_H245TransportAddress_unicastAddress)
    	{
       	 OOTRACEERR3("Error: Processing OpenLogicalChannelAck - media control "
-                  "channel addres type is not unicast (%s, %s)\n", 
+                  "channel address type is not unicast (%s, %s)\n", 
                    call->callType, call->callToken);
       	 return OO_FAILED;
    	}
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index cc423e584..aaf956ff2 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -484,7 +484,7 @@ static int ademco_verify_checksum(char *event, int expected)
 }
 
 /*!
- * \brief Send a single tone burst for a specifed duration and frequency.
+ * \brief Send a single tone burst for a specified duration and frequency.
  * \since 11.0
  *
  * \param chan Asterisk Channel
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 08f8b3abc..fc4f9a274 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -1366,7 +1366,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu
 	prep_email_sub_vars(ast, vmu, cidnum, cidname, dur, date, counter);
 
 	/* Find email address to use */
-	/* If there's a server e-mail adress in the account, user that, othterwise template */
+	/* If there's a server e-mail address in the account, use that, othterwise template */
 	fromemail = ast_strlen_zero(vmu->serveremail) ?  template->serveremail : vmu->serveremail;
 
 	/* Find name to user for server e-mail */
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ad99232ae..40ffb536d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -3743,7 +3743,7 @@ static void odbc_update_msg_id(char *dir, int msg_num, char *msg_id)
 
 /*!
  * \brief Retrieves a file from an ODBC data store.
- * \param dir the path to the file to be retreived.
+ * \param dir the path to the file to be retrieved.
  * \param msgnum the message number, such as within a mailbox folder.
  * 
  * This method is used by the RETRIEVE macro when mailboxes are stored in an ODBC back end.
@@ -8014,7 +8014,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
  *   - attempt to determine the context and and mailbox, and then invoke leave_message() function to record and store the message.
  *
  * When in the forward message mode (is_new_message == 0):
- *   - retreives the current message to be forwarded
+ *   - retrieves the current message to be forwarded
  *   - copies the original message to a temporary file, so updates to the envelope can be done.
  *   - determines the target mailbox and folders
  *   - copies the message into the target mailbox, using copy_message() or by generating the message into an email attachment if using imap folders.
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 3a4f52192..ae8bcd7b8 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -9450,11 +9450,11 @@ static void misdn_facility_ie_handler(enum event_e event, struct misdn_bchannel
 		break;
 #endif	/* We don't handle this yet */
 	case Fac_SubaddressTransfer:
-		/* We do not have anything to do for this message since we do not handle subaddreses. */
+		/* We do not have anything to do for this message since we do not handle subaddresses. */
 		break;
 	case Fac_RequestSubaddress:
 		/*
-		 * We do not have anything to do for this message since we do not handle subaddreses.
+		 * We do not have anything to do for this message since we do not handle subaddresses.
 		 * However, we do care about some other ie's that should be present.
 		 */
 		if (bc->redirecting.to_changed) {
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 1fdba95e0..ab1d6a5ff 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8817,7 +8817,7 @@ struct sip_pvt *sip_alloc(ast_string_field callid, struct ast_sockaddr *addr,
  * This function will update the destination of the response according to the
  * Via header in the request and RFC 3261 section 18.2.2. We do not have a
  * transport layer so we ignore certain values like the 'received' param (we
- * set the destination address to the addres the request came from in the
+ * set the destination address to the address the request came from in the
  * respprep() function).
  *
  * \retval -1 error
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 44cfdb011..f42961725 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -468,7 +468,7 @@ static struct unistimsession {
 	int state;				      /*!< state of the phone (see phone_state) */
 	int size_buff_entry;	    /*!< size of the buffer used to enter datas */
 	char buff_entry[16];	    /*!< Buffer for temporary datas */
-	char macaddr[18];		       /*!< mac adress of the phone (not always available) */
+	char macaddr[18];		       /*!< mac address of the phone (not always available) */
 	char firmware[8];		       /*!< firmware of the phone (not always available) */
 	struct wsabuf wsabufsend[MAX_BUF_NUMBER];      /*!< Size of each paquet stored in the buffer array & pointer to this buffer */
 	unsigned char buf[MAX_BUF_NUMBER][MAX_BUF_SIZE];	/*!< Buffer array used to keep the lastest non-acked paquets */
diff --git a/contrib/utils/eagi_proxy.c b/contrib/utils/eagi_proxy.c
index 03c7e0640..0a96d5a2f 100644
--- a/contrib/utils/eagi_proxy.c
+++ b/contrib/utils/eagi_proxy.c
@@ -223,7 +223,7 @@ int connect_to_host(char* name, int port)
 	struct sockaddr_in host;
 	
 
-	/* get adress */	
+	/* get address */	
 	if(!strcmp(name,"localhost"))
 		address=htonl(2130706433); /*127.0.0.1*/
 	else
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index 4ea681691..fd775d994 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -50,7 +50,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		</syntax>
 		<description>
 			<para>Calculates the group count for the specified group, or uses the
-			channel's current group if not specifed (and non-empty).</para>
+			channel's current group if not specified (and non-empty).</para>
 		</description>
 	</function>
 	<function name="GROUP_MATCH_COUNT" language="en_US">
diff --git a/funcs/func_hangupcause.c b/funcs/func_hangupcause.c
index 0f1c41adb..983a0e108 100644
--- a/funcs/func_hangupcause.c
+++ b/funcs/func_hangupcause.c
@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		</synopsis>
 		<syntax>
 			<parameter name="channel" required="true">
-				<para>The name of the channel for which to retreive cause information.</para>
+				<para>The name of the channel for which to retrieve cause information.</para>
 			</parameter>
 			<parameter name="type" required="true">
 				<para>Parameter describing which type of information is requested. Types are:</para>
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 40d87c993..595c91da2 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -4187,13 +4187,13 @@ void ast_channel_internal_bridged_channel_set(struct ast_channel *chan, struct a
 
 /*!
  * \since 11
- * \brief Retreive a comma-separated list of channels for which dialed cause information is available
+ * \brief Retrieve a comma-separated list of channels for which dialed cause information is available
  *
  * \details
  * This function makes use of datastore operations on the channel, so
  * it is important to lock the channel before calling this function.
  *
- * \param chan The channel from which to retreive information
+ * \param chan The channel from which to retrieve information
  * \retval NULL on allocation failure
  * \retval Pointer to an ast_str object containing the desired information which must be freed
  */
@@ -4201,7 +4201,7 @@ struct ast_str *ast_channel_dialed_causes_channels(const struct ast_channel *cha
 
 /*!
  * \since 11
- * \brief Retreive a ref-counted cause code information structure
+ * \brief Retrieve a ref-counted cause code information structure
  *
  * \details
  * This function makes use of datastore operations on the channel, so
@@ -4210,8 +4210,8 @@ struct ast_str *ast_channel_dialed_causes_channels(const struct ast_channel *cha
  * calling function must decrease the reference count when it is finished
  * with the object.
  *
- * \param chan The channel from which to retreive information
- * \param chan_name The name of the channel about which to retreive information
+ * \param chan The channel from which to retrieve information
+ * \param chan_name The name of the channel about which to retrieve information
  * \retval NULL on search failure
  * \retval Pointer to a ref-counted ast_control_pvt_cause_code object containing the desired information
  */
diff --git a/main/manager_bridges.c b/main/manager_bridges.c
index 10a5046d9..fe022cb57 100644
--- a/main/manager_bridges.c
+++ b/main/manager_bridges.c
@@ -94,7 +94,7 @@ static struct stasis_message_router *bridge_state_router;
 		<syntax>
 			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="BridgeUniqueid" required="true">
-				<para>The unique ID of the bridge about which to retreive information.</para>
+				<para>The unique ID of the bridge about which to retrieve information.</para>
 			</parameter>
 		</syntax>
 		<description>
diff --git a/res/res_fax.c b/res/res_fax.c
index 18811063e..421369a23 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -233,7 +233,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 		</syntax>
 		<description>
 			<para>FAXOPT can be used to override the settings for a FAX session listed in <filename>res_fax.conf</filename>,
-		   	it can also be used to retreive information about a FAX session that has finished eg. pages/status.</para>
+		   	it can also be used to retrieve information about a FAX session that has finished eg. pages/status.</para>
 		</description>
 		<see-also>
 			<ref type="application">ReceiveFax</ref>
diff --git a/res/res_pjsip_outbound_registration.c b/res/res_pjsip_outbound_registration.c
index b16ea64b1..17f668af7 100644
--- a/res/res_pjsip_outbound_registration.c
+++ b/res/res_pjsip_outbound_registration.c
@@ -1427,7 +1427,7 @@ static int ami_show_outbound_registrations(struct mansession *s,
 	RAII_VAR(struct ao2_container *, regs, get_registrations(), ao2_cleanup);
 
 	if (!regs) {
-		astman_send_error(s, m, "Unable to retreive "
+		astman_send_error(s, m, "Unable to retrieve "
 				  "outbound registrations\n");
 		return -1;
 	}