[svn-commits] wdoekes: trunk r431000 - in /trunk: ./ addons/ooh323c/src/ apps/ channels/ co...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Fri Jan 23 09:13:11 CST 2015
Author: wdoekes
Date: Fri Jan 23 09:13:08 2015
New Revision: 431000
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431000
Log:
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
Modified:
trunk/ (props changed)
trunk/addons/ooh323c/src/ooh245.c
trunk/apps/app_alarmreceiver.c
trunk/apps/app_minivm.c
trunk/apps/app_voicemail.c
trunk/channels/chan_misdn.c
trunk/channels/chan_sip.c
trunk/channels/chan_unistim.c
trunk/contrib/utils/eagi_proxy.c
trunk/funcs/func_groupcount.c
trunk/funcs/func_hangupcause.c
trunk/include/asterisk/channel.h
trunk/main/manager_bridges.c
trunk/res/res_fax.c
trunk/res/res_pjsip_outbound_registration.c
Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.
Modified: trunk/addons/ooh323c/src/ooh245.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/ooh245.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/addons/ooh323c/src/ooh245.c (original)
+++ trunk/addons/ooh323c/src/ooh245.c Fri Jan 23 09:13:08 2015
@@ -1909,7 +1909,7 @@
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;
}
Modified: trunk/apps/app_alarmreceiver.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_alarmreceiver.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/apps/app_alarmreceiver.c (original)
+++ trunk/apps/app_alarmreceiver.c Fri Jan 23 09:13:08 2015
@@ -484,7 +484,7 @@
}
/*!
- * \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
Modified: trunk/apps/app_minivm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_minivm.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/apps/app_minivm.c (original)
+++ trunk/apps/app_minivm.c Fri Jan 23 09:13:08 2015
@@ -1366,7 +1366,7 @@
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 */
Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Jan 23 09:13:08 2015
@@ -3743,7 +3743,7 @@
/*!
* \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 @@
* - 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.
Modified: trunk/channels/chan_misdn.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_misdn.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/channels/chan_misdn.c (original)
+++ trunk/channels/chan_misdn.c Fri Jan 23 09:13:08 2015
@@ -9450,11 +9450,11 @@
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) {
Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Jan 23 09:13:08 2015
@@ -8817,7 +8817,7 @@
* 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
Modified: trunk/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Fri Jan 23 09:13:08 2015
@@ -468,7 +468,7 @@
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 */
Modified: trunk/contrib/utils/eagi_proxy.c
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/utils/eagi_proxy.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/contrib/utils/eagi_proxy.c (original)
+++ trunk/contrib/utils/eagi_proxy.c Fri Jan 23 09:13:08 2015
@@ -223,7 +223,7 @@
struct sockaddr_in host;
- /* get adress */
+ /* get address */
if(!strcmp(name,"localhost"))
address=htonl(2130706433); /*127.0.0.1*/
else
Modified: trunk/funcs/func_groupcount.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_groupcount.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/funcs/func_groupcount.c (original)
+++ trunk/funcs/func_groupcount.c Fri Jan 23 09:13:08 2015
@@ -50,7 +50,7 @@
</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">
Modified: trunk/funcs/func_hangupcause.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_hangupcause.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/funcs/func_hangupcause.c (original)
+++ trunk/funcs/func_hangupcause.c Fri Jan 23 09:13:08 2015
@@ -48,7 +48,7 @@
</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>
Modified: trunk/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Fri Jan 23 09:13:08 2015
@@ -4187,13 +4187,13 @@
/*!
* \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 @@
/*!
* \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 @@
* 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
*/
Modified: trunk/main/manager_bridges.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/manager_bridges.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/main/manager_bridges.c (original)
+++ trunk/main/manager_bridges.c Fri Jan 23 09:13:08 2015
@@ -94,7 +94,7 @@
<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>
Modified: trunk/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_fax.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/res/res_fax.c (original)
+++ trunk/res/res_fax.c Fri Jan 23 09:13:08 2015
@@ -233,7 +233,7 @@
</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>
Modified: trunk/res/res_pjsip_outbound_registration.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_outbound_registration.c?view=diff&rev=431000&r1=430999&r2=431000
==============================================================================
--- trunk/res/res_pjsip_outbound_registration.c (original)
+++ trunk/res/res_pjsip_outbound_registration.c Fri Jan 23 09:13:08 2015
@@ -1427,7 +1427,7 @@
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;
}
More information about the svn-commits
mailing list