<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17462">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, approved
Joshua Colp: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">apps: Spelling fixes<br><br>Correct typos of the following word families:<br><br>simultaneously<br>administrator<br>directforward<br>attachfmt<br>dailplan<br>automatically<br>applicable<br>nouns<br>explicit<br>outside<br>sponsored<br>attachment<br>audio<br>spied<br>doesn't<br>counting<br>encoded<br>implements<br>recursively<br>emailaddress<br>arguments<br>queuerules<br>members<br>priority<br>output<br>advanced<br>silencethreshold<br>brazilian<br>debugging<br>argument<br>meadmin<br>formatting<br>integrated<br>sneakiness<br><br>ASTERISK-29714<br><br>Change-Id: Ie5ecaec91c00b26309da4e51cfc0991a5bb7d092<br>---<br>M apps/app_alarmreceiver.c<br>M apps/app_chanspy.c<br>M apps/app_confbridge.c<br>M apps/app_dial.c<br>M apps/app_forkcdr.c<br>M apps/app_macro.c<br>M apps/app_meetme.c<br>M apps/app_minivm.c<br>M apps/app_playback.c<br>M apps/app_queue.c<br>M apps/app_statsd.c<br>M apps/app_test.c<br>M apps/app_voicemail.c<br>M apps/confbridge/conf_config_parser.c<br>14 files changed, 47 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c</span><br><span>index 07885d2..3577360 100644</span><br><span>--- a/apps/app_alarmreceiver.c</span><br><span>+++ b/apps/app_alarmreceiver.c</span><br><span>@@ -158,7 +158,7 @@</span><br><span> events to the standard input of the application.</span><br><span> The configuration file also contains settings for DTMF timing, and for the loudness of the</span><br><span> acknowledgement tones.</para></span><br><span style="color: hsl(0, 100%, 40%);">- <note><para>Few Ademco DTMF signalling formats are detected automaticaly: Contact ID, Express 4+1,</span><br><span style="color: hsl(120, 100%, 40%);">+ <note><para>Few Ademco DTMF signalling formats are detected automatically: Contact ID, Express 4+1,</span><br><span> Express 4+2, High Speed and Super Fast.</para></note></span><br><span> <para>The application is affected by the following variables:</para></span><br><span> <variablelist></span><br><span>diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c</span><br><span>index e02f25d..c3a3f4d 100644</span><br><span>--- a/apps/app_chanspy.c</span><br><span>+++ b/apps/app_chanspy.c</span><br><span>@@ -899,7 +899,7 @@</span><br><span> signed char zero_volume = 0;</span><br><span> int waitms;</span><br><span> int res;</span><br><span style="color: hsl(0, 100%, 40%);">- int num_spyed_upon = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int num_spied_upon = 1;</span><br><span> struct ast_channel_iterator *iter = NULL;</span><br><span> </span><br><span> if (ast_test_flag(flags, OPTION_EXIT)) {</span><br><span>@@ -926,7 +926,7 @@</span><br><span> struct ast_autochan *autochan = NULL, *next_autochan = NULL;</span><br><span> struct ast_channel *prev = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!ast_test_flag(flags, OPTION_QUIET) && num_spyed_upon) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ast_test_flag(flags, OPTION_QUIET) && num_spied_upon) {</span><br><span> res = ast_streamfile(chan, "beep", ast_channel_language(chan));</span><br><span> if (!res)</span><br><span> res = ast_waitstream(chan, "");</span><br><span>@@ -991,7 +991,7 @@</span><br><span> </span><br><span> /* reset for the next loop around, unless overridden later */</span><br><span> waitms = 100;</span><br><span style="color: hsl(0, 100%, 40%);">- num_spyed_upon = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ num_spied_upon = 0;</span><br><span> </span><br><span> for (autochan = next_channel(iter, chan);</span><br><span> autochan;</span><br><span>@@ -1146,7 +1146,7 @@</span><br><span> }</span><br><span> </span><br><span> res = channel_spy(chan, autochan, &volfactor, fd, user_options, flags, exitcontext);</span><br><span style="color: hsl(0, 100%, 40%);">- num_spyed_upon++;</span><br><span style="color: hsl(120, 100%, 40%);">+ num_spied_upon++;</span><br><span> </span><br><span> if (res == -1) {</span><br><span> ast_autochan_destroy(autochan);</span><br><span>diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c</span><br><span>index 1a7a99f..38a380a 100644</span><br><span>--- a/apps/app_confbridge.c</span><br><span>+++ b/apps/app_confbridge.c</span><br><span>@@ -1682,7 +1682,7 @@</span><br><span> struct post_join_action *action;</span><br><span> int max_members_reached = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* We explictly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We explicitly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */</span><br><span> ao2_lock(conference_bridges);</span><br><span> </span><br><span> ast_debug(1, "Trying to find conference bridge '%s'\n", conference_name);</span><br><span>diff --git a/apps/app_dial.c b/apps/app_dial.c</span><br><span>index ff5458b..c958dab 100644</span><br><span>--- a/apps/app_dial.c</span><br><span>+++ b/apps/app_dial.c</span><br><span>@@ -930,7 +930,7 @@</span><br><span> * XXX this code is highly suspicious, as it essentially overwrites</span><br><span> * the outgoing channel without properly deleting it.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \todo eventually this function should be intergrated into and replaced by ast_call_forward()</span><br><span style="color: hsl(120, 100%, 40%);">+ * \todo eventually this function should be integrated into and replaced by ast_call_forward()</span><br><span> */</span><br><span> static void do_forward(struct chanlist *o, struct cause_args *num,</span><br><span> struct ast_flags64 *peerflags, int single, int caller_entertained, int *to,</span><br><span>diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c</span><br><span>index 25b56cb..a906fc9 100644</span><br><span>--- a/apps/app_forkcdr.c</span><br><span>+++ b/apps/app_forkcdr.c</span><br><span>@@ -2,7 +2,7 @@</span><br><span> * Asterisk -- An open source telephony toolkit.</span><br><span> *</span><br><span> * Copyright (C) 1999 - 2005, Anthony Minessale anthmct@yahoo.com</span><br><span style="color: hsl(0, 100%, 40%);">- * Development of this app Sponsered/Funded by TAAN Softworks Corp</span><br><span style="color: hsl(120, 100%, 40%);">+ * Development of this app Sponsored/Funded by TAAN Softworks Corp</span><br><span> *</span><br><span> * See http://www.asterisk.org for more information about</span><br><span> * the Asterisk project. Please do not directly contact</span><br><span>diff --git a/apps/app_macro.c b/apps/app_macro.c</span><br><span>index 3f7632a..b426cf8 100644</span><br><span>--- a/apps/app_macro.c</span><br><span>+++ b/apps/app_macro.c</span><br><span>@@ -75,7 +75,7 @@</span><br><span> of nesting (macro calling macro calling macro, etc.); It may be possible that stack-intensive</span><br><span> applications in deeply nested macros could cause asterisk to crash earlier than this limit.</span><br><span> It is advised that if you need to deeply nest macro calls, that you use the Gosub application</span><br><span style="color: hsl(0, 100%, 40%);">- (now allows arguments like a Macro) with explict Return() calls instead.</para></warning></span><br><span style="color: hsl(120, 100%, 40%);">+ (now allows arguments like a Macro) with explicit Return() calls instead.</para></warning></span><br><span> <warning><para>Use of the application <literal>WaitExten</literal> within a macro will not function</span><br><span> as expected. Please use the <literal>Read</literal> application in order to read DTMF from a channel</span><br><span> currently executing a macro.</para></warning></span><br><span>diff --git a/apps/app_meetme.c b/apps/app_meetme.c</span><br><span>index 9b2024d..7628a67 100644</span><br><span>--- a/apps/app_meetme.c</span><br><span>+++ b/apps/app_meetme.c</span><br><span>@@ -2836,7 +2836,7 @@</span><br><span> }</span><br><span> </span><br><span> /*! \internal</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Processes menu options for the adminstrator menu (accessible through the 's' option for app_meetme)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Processes menu options for the administrator menu (accessible through the 's' option for app_meetme)</span><br><span> *</span><br><span> * \param menu_mode a pointer to the currently active menu_mode.</span><br><span> * \param dtmf a pointer to the dtmf value currently being processed against the menu.</span><br><span>@@ -5221,7 +5221,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief The MeetMeadmin application</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief The MeetMeAdmin application</span><br><span> </span><br><span> MeetMeAdmin(confno, command, caller) */</span><br><span> static int admin_exec(struct ast_channel *chan, const char *data) {</span><br><span>diff --git a/apps/app_minivm.c b/apps/app_minivm.c</span><br><span>index 2d26e78..9694850 100644</span><br><span>--- a/apps/app_minivm.c</span><br><span>+++ b/apps/app_minivm.c</span><br><span>@@ -536,7 +536,7 @@</span><br><span> </span><br><span> #define SOUND_INTRO "vm-intro"</span><br><span> #define B64_BASEMAXINLINE 256 /*!< Buffer size for Base 64 attachment encoding */</span><br><span style="color: hsl(0, 100%, 40%);">-#define B64_BASELINELEN 72 /*!< Line length for Base 64 endoded messages */</span><br><span style="color: hsl(120, 100%, 40%);">+#define B64_BASELINELEN 72 /*!< Line length for Base 64 encoded messages */</span><br><span> #define EOL "\r\n"</span><br><span> </span><br><span> #define MAX_DATETIME_FORMAT 512</span><br><span>@@ -1737,7 +1737,7 @@</span><br><span> }</span><br><span> return cmd;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* If the caller is an ouside caller, and the review option is enabled,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the caller is an outside caller, and the review option is enabled,</span><br><span> allow them to review the message, but let the owner of the box review</span><br><span> their OGM's */</span><br><span> if (outsidecaller && !ast_test_flag(vmu, MVM_REVIEW))</span><br><span>@@ -2827,7 +2827,7 @@</span><br><span> } else if (!strcmp(var->name, "externnotify")) {</span><br><span> /* External voicemail notify application */</span><br><span> ast_copy_string(global_externnotify, var->value, sizeof(global_externnotify));</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (!strcmp(var->name, "silencetreshold")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strcmp(var->name, "silencethreshold") || !strcmp(var->name, "silencetreshold")) {</span><br><span> /* Silence treshold */</span><br><span> global_silencethreshold = atoi(var->value);</span><br><span> } else if (!strcmp(var->name, "maxmessage")) {</span><br><span>@@ -2956,6 +2956,8 @@</span><br><span> ast_copy_string(template->fromaddress, chanvar, sizeof(template->fromaddress));</span><br><span> if ((chanvar = ast_variable_retrieve(cfg, "general", "emailaaddress")))</span><br><span> ast_copy_string(template->serveremail, chanvar, sizeof(template->serveremail));</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((chanvar = ast_variable_retrieve(cfg, "general", "emailaddress")))</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_copy_string(template->serveremail, chanvar, sizeof(template->serveremail));</span><br><span> if ((chanvar = ast_variable_retrieve(cfg, "general", "emailcharset")))</span><br><span> ast_copy_string(template->charset, chanvar, sizeof(template->charset));</span><br><span> if ((chanvar = ast_variable_retrieve(cfg, "general", "emailsubject")))</span><br><span>diff --git a/apps/app_playback.c b/apps/app_playback.c</span><br><span>index ab6e60e..56e74ac 100644</span><br><span>--- a/apps/app_playback.c</span><br><span>+++ b/apps/app_playback.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> #include "asterisk/pbx.h"</span><br><span> #include "asterisk/module.h"</span><br><span> #include "asterisk/app.h"</span><br><span style="color: hsl(0, 100%, 40%);">-/* This file provides config-file based 'say' functions, and implenents</span><br><span style="color: hsl(120, 100%, 40%);">+/* This file provides config-file based 'say' functions, and implements</span><br><span> * some CLI commands.</span><br><span> */</span><br><span> #include "asterisk/say.h" /*!< provides config-file based 'say' functions */</span><br><span>diff --git a/apps/app_queue.c b/apps/app_queue.c</span><br><span>index 1b05366..9066f6c 100644</span><br><span>--- a/apps/app_queue.c</span><br><span>+++ b/apps/app_queue.c</span><br><span>@@ -1489,7 +1489,7 @@</span><br><span> /*! \brief queues.conf [general] option */</span><br><span> static int shared_lastcall = 1;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief queuesrules.conf [general] option */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief queuerules.conf [general] option */</span><br><span> static int realtime_rules = 0;</span><br><span> </span><br><span> /*! \brief Subscription to device state change messages */</span><br><span>@@ -1589,7 +1589,7 @@</span><br><span> int pending; /*!< Non-zero if we are attempting to call a member */</span><br><span> int max_penalty; /*!< Limit the members that can take this call to this penalty or lower */</span><br><span> int min_penalty; /*!< Limit the members that can take this call to this penalty or higher */</span><br><span style="color: hsl(0, 100%, 40%);">- int raise_penalty; /*!< Float lower penalty mambers to a minimum penalty */</span><br><span style="color: hsl(120, 100%, 40%);">+ int raise_penalty; /*!< Float lower penalty members to a minimum penalty */</span><br><span> int linpos; /*!< If using linear strategy, what position are we at? */</span><br><span> int linwrapped; /*!< Is the linpos wrapped? */</span><br><span> time_t start; /*!< When we started holding */</span><br><span>@@ -2644,7 +2644,7 @@</span><br><span> * \param parent Parent context to search for child</span><br><span> * \param child Context to check for inclusion in parent</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * This function recrusively checks if the context child is included in the context parent.</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function recursively checks if the context child is included in the context parent.</span><br><span> *</span><br><span> * \return 1 if child is included in parent, 0 if not</span><br><span> */</span><br><span>@@ -2946,7 +2946,7 @@</span><br><span> /*!</span><br><span> * \brief Change queue penalty by adding rule.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Check rule for errors with time or fomatting, see if rule is relative to rest</span><br><span style="color: hsl(120, 100%, 40%);">+ * Check rule for errors with time or formatting, see if rule is relative to rest</span><br><span> * of queue, iterate list of rules to find correct insertion point, insert and return.</span><br><span> * \retval -1 on failure</span><br><span> * \retval 0 on success</span><br><span>@@ -3050,7 +3050,7 @@</span><br><span> /*!</span><br><span> * \brief Load queue rules from realtime.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * Check rule for errors with time or fomatting, see if rule is relative to rest</span><br><span style="color: hsl(120, 100%, 40%);">+ * Check rule for errors with time or formatting, see if rule is relative to rest</span><br><span> * of queue, iterate list of rules to find correct insertion point, insert and return.</span><br><span> * \retval -1 on failure</span><br><span> * \retval 0 on success</span><br><span>@@ -4344,7 +4344,7 @@</span><br><span> *</span><br><span> * \note The queue passed in should be locked prior to this function call</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] q The queue for which we are couting the number of available members</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] q The queue for which we are counting the number of available members</span><br><span> * \return Return the number of available members in queue q</span><br><span> */</span><br><span> static int num_available_members(struct call_queue *q)</span><br><span>@@ -4992,7 +4992,7 @@</span><br><span> * \param[in] caller_disconnect if the 'H' option is used when calling Queue(), this is used to detect if the caller pressed * to disconnect the call</span><br><span> * \param[in] forwardsallowed used to detect if we should allow call forwarding, based on the 'i' option to Queue()</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \todo eventually all call forward logic should be intergerated into and replaced by ast_call_forward()</span><br><span style="color: hsl(120, 100%, 40%);">+ * \todo eventually all call forward logic should be integrated into and replaced by ast_call_forward()</span><br><span> */</span><br><span> static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed)</span><br><span> {</span><br><span>@@ -7507,7 +7507,7 @@</span><br><span> res = RES_NOT_CALLER;</span><br><span> for (qe = q->head; qe; qe = qe->next) {</span><br><span> if (strcmp(ast_channel_name(qe->chan), caller) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_debug(1, "%s Caller new prioriry %d in queue %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_debug(1, "%s Caller new priority %d in queue %s\n",</span><br><span> caller, priority, queuename);</span><br><span> qe->prio = priority;</span><br><span> res = RES_OKAY;</span><br><span>@@ -7825,7 +7825,7 @@</span><br><span> queue_t_unref(q, "Search complete");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* some useful debuging */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* some useful debugging */</span><br><span> if (foundqueue) {</span><br><span> ast_log (LOG_ERROR, "Invalid queuename\n");</span><br><span> } else {</span><br><span>@@ -9700,7 +9700,7 @@</span><br><span> return res;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! \brief direct ouput to manager or cli with proper terminator */</span><br><span style="color: hsl(120, 100%, 40%);">+/*! \brief direct output to manager or cli with proper terminator */</span><br><span> static void do_print(struct mansession *s, int fd, const char *str)</span><br><span> {</span><br><span> if (s) {</span><br><span>@@ -10986,7 +10986,7 @@</span><br><span> return CLI_SHOWUSAGE;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Set the queue name if applicale */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Set the queue name if applicable */</span><br><span> if (a->argc == 8) {</span><br><span> queuename = a->argv[7];</span><br><span> }</span><br><span>diff --git a/apps/app_statsd.c b/apps/app_statsd.c</span><br><span>index a4ca233..ebbdc0f 100644</span><br><span>--- a/apps/app_statsd.c</span><br><span>+++ b/apps/app_statsd.c</span><br><span>@@ -78,7 +78,7 @@</span><br><span> *</span><br><span> * \param value The value of the statistic to be sent to StatsD.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * This function checks to see if the value given to the StatsD daialplan</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function checks to see if the value given to the StatsD dailplan</span><br><span> * application is within the allowed range of [-2^63, 2^63] as specified by StatsD.</span><br><span> *</span><br><span> * \retval zero on success.</span><br><span>@@ -100,7 +100,7 @@</span><br><span> *</span><br><span> * \param value The value of the statistic to be sent to StatsD.</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * This function checks to see if the value given to the StatsD daialplan</span><br><span style="color: hsl(120, 100%, 40%);">+ * This function checks to see if the value given to the StatsD dailplan</span><br><span> * application is within the allowed range of [0, 2^64] as specified by StatsD.</span><br><span> *</span><br><span> * \retval zero on success.</span><br><span>diff --git a/apps/app_test.c b/apps/app_test.c</span><br><span>index 9677270..28e0069 100644</span><br><span>--- a/apps/app_test.c</span><br><span>+++ b/apps/app_test.c</span><br><span>@@ -352,7 +352,7 @@</span><br><span> if (!res)</span><br><span> res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0);</span><br><span> ast_debug(1, "read test identifier: %s\n", testid);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check for sneakyness */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check for sneakiness */</span><br><span> if (strchr(testid, '/'))</span><br><span> res = -1;</span><br><span> if ((res >=0) && (!ast_strlen_zero(testid))) {</span><br><span>diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c</span><br><span>index cb70f9e..eb7fc1f 100644</span><br><span>--- a/apps/app_voicemail.c</span><br><span>+++ b/apps/app_voicemail.c</span><br><span>@@ -643,7 +643,7 @@</span><br><span> #define VM_FORCENAME (1 << 7) /*!< Have new users record their name */</span><br><span> #define VM_FORCEGREET (1 << 8) /*!< Have new users record their greetings */</span><br><span> #define VM_PBXSKIP (1 << 9) /*!< Skip the [PBX] preamble in the Subject line of emails */</span><br><span style="color: hsl(0, 100%, 40%);">-#define VM_DIRECFORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */</span><br><span style="color: hsl(120, 100%, 40%);">+#define VM_DIRECTFORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */</span><br><span> #define VM_ATTACH (1 << 11) /*!< Attach message to voicemail notifications? */</span><br><span> #define VM_DELETE (1 << 12) /*!< Delete message after sending notification */</span><br><span> #define VM_ALLOCED (1 << 13) /*!< Structure was malloc'ed, instead of placed in a return (usually static) buffer */</span><br><span>@@ -3129,7 +3129,7 @@</span><br><span> ast_mutex_lock(&vms->lock);</span><br><span> ast_mutex_lock(&mail_open_lock);</span><br><span> vms->mailstream = mail_open (stream, tmp, debug ? OP_DEBUG : NIL);</span><br><span style="color: hsl(0, 100%, 40%);">- /* Create the folder if it dosn't exist */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Create the folder if it doesn't exist */</span><br><span> if (vms->mailstream && !mail_status(vms->mailstream, tmp, SA_UIDNEXT)) {</span><br><span> mail_create(vms->mailstream, tmp);</span><br><span> }</span><br><span>@@ -5192,7 +5192,7 @@</span><br><span> * \param imap if == 1, indicates the target folder for the email notification to be sent to will be an IMAP mailstore. This causes additional mailbox headers to be set, which would facilitate searching for the email in the destination IMAP folder.</span><br><span> * \param flag, msg_id</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * The email body, and base 64 encoded attachement (if any) are stored to the file identified by *p. This method does not actually send the email. That is done by invoking the configure 'mailcmd' and piping this generated file into it, or with the sendemail() function.</span><br><span style="color: hsl(120, 100%, 40%);">+ * The email body, and base 64 encoded attachment (if any) are stored to the file identified by *p. This method does not actually send the email. That is done by invoking the configure 'mailcmd' and piping this generated file into it, or with the sendemail() function.</span><br><span> */</span><br><span> static void make_email_file(FILE *p,</span><br><span> char *srcemail,</span><br><span>@@ -7358,7 +7358,7 @@</span><br><span> /* get the current mailbox so that we can point the mailstream back to it later */</span><br><span> curr_mbox = get_folder_by_name(vms->curbox);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Create the folder if it dosn't exist */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Create the folder if it doesn't exist */</span><br><span> imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */</span><br><span> if (vms->mailstream && !mail_status(vms->mailstream, mailbox, SA_UIDNEXT)) {</span><br><span> if (mail_create(vms->mailstream, mailbox) != NIL) {</span><br><span>@@ -7477,7 +7477,7 @@</span><br><span> bytes = 0;</span><br><span> bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 0, "Listen", "Listen", "1", 1);</span><br><span> bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 1, "Folder", "Folder", "2", 1);</span><br><span style="color: hsl(0, 100%, 40%);">- bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 2, "Advanced", "Advnced", "3", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 2, "Advanced", "Advanced", "3", 1);</span><br><span> bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 3, "Options", "Options", "0", 1);</span><br><span> bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 4, "Help", "Help", "*", 1);</span><br><span> bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 5, "Exit", "Exit", "#", 1);</span><br><span>@@ -8419,7 +8419,7 @@</span><br><span> ast_test_suite_event_notify("FORWARD", "Message: entering forward message menu");</span><br><span> while (!res && !valid_extensions) {</span><br><span> int use_directory = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ast_test_flag((&globalflags), VM_DIRECFORWARD)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ast_test_flag((&globalflags), VM_DIRECTFORWARD)) {</span><br><span> int done = 0;</span><br><span> int retries = 0;</span><br><span> cmd = 0;</span><br><span>@@ -8488,7 +8488,7 @@</span><br><span> ast_channel_priority_set(chan, old_priority);</span><br><span> } else {</span><br><span> ast_log(AST_LOG_WARNING, "Could not find the Directory application, disabling directory_forward\n");</span><br><span style="color: hsl(0, 100%, 40%);">- ast_clear_flag((&globalflags), VM_DIRECFORWARD);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_clear_flag((&globalflags), VM_DIRECTFORWARD);</span><br><span> }</span><br><span> } else {</span><br><span> /* Ask for an extension */</span><br><span>@@ -8812,7 +8812,7 @@</span><br><span> res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' Q 'digits/at' HM", NULL);</span><br><span> } else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) { /* POLISH syntax */</span><br><span> res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' Q HM", NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (!strncasecmp(ast_channel_language(chan), "pt_BR", 5)) { /* Brazillian PORTUGUESE syntax */</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (!strncasecmp(ast_channel_language(chan), "pt_BR", 5)) { /* Brazilian PORTUGUESE syntax */</span><br><span> res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' Ad 'digits/pt-de' B 'digits/pt-de' Y 'digits/pt-as' HM ", NULL);</span><br><span> } else if (!strncasecmp(ast_channel_language(chan), "se", 2)) { /* SWEDISH syntax */</span><br><span> res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' dB 'digits/at' k 'and' M", NULL);</span><br><span>@@ -9552,9 +9552,9 @@</span><br><span> * on vm-message.</span><br><span> * 3) Call ast_say_counted_adjective() to put the proper gender and number</span><br><span> * prefix on vm-new and vm-old (none for English).</span><br><span style="color: hsl(0, 100%, 40%);">- * 4) Pass the gender of the language's word for "message" as an agument to</span><br><span style="color: hsl(120, 100%, 40%);">+ * 4) Pass the gender of the language's word for "message" as an argument to</span><br><span> * this function which is can in turn pass on to the functions which</span><br><span style="color: hsl(0, 100%, 40%);">- * say numbers and put endings on nounds and adjectives.</span><br><span style="color: hsl(120, 100%, 40%);">+ * say numbers and put endings on nouns and adjectives.</span><br><span> *</span><br><span> * All languages require these messages:</span><br><span> * vm-youhave "You have..."</span><br><span>@@ -12645,7 +12645,7 @@</span><br><span> res = 1;</span><br><span> }</span><br><span> if (strcasecmp(vmu->attachfmt, "wav49")) {</span><br><span style="color: hsl(0, 100%, 40%);">- ast_test_status_update(test, "Parse failure for attachftm option\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_test_status_update(test, "Parse failure for attachfmt option\n");</span><br><span> res = 1;</span><br><span> }</span><br><span> if (strcasecmp(vmu->fromstring, "Voicemail System")) {</span><br><span>@@ -14480,7 +14480,7 @@</span><br><span> </span><br><span> if (!(val = ast_variable_retrieve(cfg, "general", "usedirectory")))</span><br><span> val = "no";</span><br><span style="color: hsl(0, 100%, 40%);">- ast_set2_flag((&globalflags), ast_true(val), VM_DIRECFORWARD);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_set2_flag((&globalflags), ast_true(val), VM_DIRECTFORWARD);</span><br><span> </span><br><span> if (!(val = ast_variable_retrieve(cfg, "general", "passwordlocation"))) {</span><br><span> val = "voicemail.conf";</span><br><span>@@ -15986,7 +15986,7 @@</span><br><span> }</span><br><span> return cmd;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- /* If the caller is an ouside caller and the review option is enabled or it's forward intro</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If the caller is an outside caller and the review option is enabled or it's forward intro</span><br><span> allow them to review the message, but let the owner of the box review</span><br><span> their OGM's */</span><br><span> if (outsidecaller && !ast_test_flag(vmu, VM_REVIEW) && !forwardintro)</span><br><span>diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c</span><br><span>index e5e253b..4f58c18 100644</span><br><span>--- a/apps/confbridge/conf_config_parser.c</span><br><span>+++ b/apps/confbridge/conf_config_parser.c</span><br><span>@@ -384,7 +384,7 @@</span><br><span> specific conference bridge.</span><br><span> You should be aware that there are potential races between testing for the</span><br><span> existence of a bridge, and taking action upon that information, consider</span><br><span style="color: hsl(0, 100%, 40%);">- for example two callers executing the check simultaniously, and then taking</span><br><span style="color: hsl(120, 100%, 40%);">+ for example two callers executing the check simultaneously, and then taking</span><br><span> special action as "first caller" into the bridge. The same for exiting,</span><br><span> directly after the check the bridge can be destroyed before the new caller</span><br><span> enters (creating a new bridge), for example, and the "first member" actions</span><br><span>@@ -459,7 +459,7 @@</span><br><span> <enum name="sound_kicked"><para>The sound played to a user who has been kicked from the conference.</para></enum></span><br><span> <enum name="sound_muted"><para>The sound played when the mute option it toggled on.</para></enum></span><br><span> <enum name="sound_unmuted"><para>The sound played when the mute option it toggled off.</para></enum></span><br><span style="color: hsl(0, 100%, 40%);">- <enum name="sound_binaural_on"><para>The sound played when binaural auudio is turned on.</para></enum></span><br><span style="color: hsl(120, 100%, 40%);">+ <enum name="sound_binaural_on"><para>The sound played when binaural audio is turned on.</para></enum></span><br><span> <enum name="sound_binaural_off"><para>The sound played when the binaural audio is turned off.</para></enum></span><br><span> <enum name="sound_only_person"><para>The sound played when the user is the only person in the conference.</para></enum></span><br><span> <enum name="sound_only_one"><para>The sound played to a user when there is only one other</span><br><span>@@ -1353,7 +1353,7 @@</span><br><span> comma = strchr(tmp_action_names, ',');</span><br><span> </span><br><span> /* If the next action has brackets with comma delimited arguments in it,</span><br><span style="color: hsl(0, 100%, 40%);">- * make the delimeter ')' instead of a comma to preserve the argments */</span><br><span style="color: hsl(120, 100%, 40%);">+ * make the delimeter ')' instead of a comma to preserve the arguments */</span><br><span> if (startbrace && endbrace && comma && (comma > startbrace && comma < endbrace)) {</span><br><span> delimiter = ")";</span><br><span> } else {</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17462">change 17462</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/17462"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Ie5ecaec91c00b26309da4e51cfc0991a5bb7d092 </div>
<div style="display:none"> Gerrit-Change-Number: 17462 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Josh Soref <jsoref@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>