diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 07885d2bf19fb24efd54330b81f89960f2aa0623..3577360e1d283da932e3ca5365ffd592b5a838a5 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -158,7 +158,7 @@ static const char app[] = "AlarmReceiver";
events to the standard input of the application.
The configuration file also contains settings for DTMF timing, and for the loudness of the
acknowledgement tones.</para>
- <note><para>Few Ademco DTMF signalling formats are detected automaticaly: Contact ID, Express 4+1,
+ <note><para>Few Ademco DTMF signalling formats are detected automatically: Contact ID, Express 4+1,
Express 4+2, High Speed and Super Fast.</para></note>
<para>The application is affected by the following variables:</para>
<variablelist>
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index e02f25d920fed91283effebfa232a56b3cdc97b0..c3a3f4d53b50b15d46dbe7383042a559eb1214f7 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -899,7 +899,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
signed char zero_volume = 0;
int waitms;
int res;
- int num_spyed_upon = 1;
+ int num_spied_upon = 1;
struct ast_channel_iterator *iter = NULL;
if (ast_test_flag(flags, OPTION_EXIT)) {
@@ -926,7 +926,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
struct ast_autochan *autochan = NULL, *next_autochan = NULL;
struct ast_channel *prev = NULL;
- if (!ast_test_flag(flags, OPTION_QUIET) && num_spyed_upon) {
+ if (!ast_test_flag(flags, OPTION_QUIET) && num_spied_upon) {
res = ast_streamfile(chan, "beep", ast_channel_language(chan));
if (!res)
res = ast_waitstream(chan, "");
@@ -991,7 +991,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
/* reset for the next loop around, unless overridden later */
waitms = 100;
- num_spyed_upon = 0;
+ num_spied_upon = 0;
for (autochan = next_channel(iter, chan);
autochan;
@@ -1146,7 +1146,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
}
res = channel_spy(chan, autochan, &volfactor, fd, user_options, flags, exitcontext);
- num_spyed_upon++;
+ num_spied_upon++;
if (res == -1) {
ast_autochan_destroy(autochan);
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 4290521c8c2f71405c7751aec16ac81c167b93bf..3cec181d4fa23f266025b88e025d63c76d25e22a 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -1682,7 +1682,7 @@ static struct confbridge_conference *join_conference_bridge(const char *conferen
struct post_join_action *action;
int max_members_reached = 0;
- /* We explictly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */
+ /* We explicitly lock the conference bridges container ourselves so that other callers can not create duplicate conferences at the same */
ao2_lock(conference_bridges);
ast_debug(1, "Trying to find conference bridge '%s'\n", conference_name);
diff --git a/apps/app_dial.c b/apps/app_dial.c
index 51f5f4580b266630f8325d8f3f6d4ce14216ff20..da2253a57b1dae37b8d8fc5847b6e4b382263209 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -930,7 +930,7 @@ static const char *get_cid_name(char *name, int namelen, struct ast_channel *cha
* XXX this code is highly suspicious, as it essentially overwrites
* the outgoing channel without properly deleting it.
*
- * \todo eventually this function should be intergrated into and replaced by ast_call_forward()
+ * \todo eventually this function should be integrated into and replaced by ast_call_forward()
*/
static void do_forward(struct chanlist *o, struct cause_args *num,
struct ast_flags64 *peerflags, int single, int caller_entertained, int *to,
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 25b56cb5afd6db9201391f8d8d96ab9500e2ade9..a906fc977443baf424a6ff0fe791ffdbb56da0d7 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -2,7 +2,7 @@
* Asterisk -- An open source telephony toolkit.
*
* Copyright (C) 1999 - 2005, Anthony Minessale anthmct@yahoo.com
- * Development of this app Sponsered/Funded by TAAN Softworks Corp
+ * Development of this app Sponsored/Funded by TAAN Softworks Corp
*
* See http://www.asterisk.org for more information about
* the Asterisk project. Please do not directly contact
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 3f7632a86dc0bcd31f1376669167cec4fe195f21..b426cf8f698bace2590135ffcac4ccba10c57505 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -75,7 +75,7 @@
of nesting (macro calling macro calling macro, etc.); It may be possible that stack-intensive
applications in deeply nested macros could cause asterisk to crash earlier than this limit.
It is advised that if you need to deeply nest macro calls, that you use the Gosub application
- (now allows arguments like a Macro) with explict Return() calls instead.</para></warning>
+ (now allows arguments like a Macro) with explicit Return() calls instead.</para></warning>
<warning><para>Use of the application <literal>WaitExten</literal> within a macro will not function
as expected. Please use the <literal>Read</literal> application in order to read DTMF from a channel
currently executing a macro.</para></warning>
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 27d985b04eae44eb035331b188cfeaac64e02a84..81c04dd0b66cd739f000bdd32484bcdcb4f0a40e 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2836,7 +2836,7 @@ static void meetme_menu_normal(enum menu_modes *menu_mode, int *dtmf, struct ast
}
/*! \internal
- * \brief Processes menu options for the adminstrator menu (accessible through the 's' option for app_meetme)
+ * \brief Processes menu options for the administrator menu (accessible through the 's' option for app_meetme)
*
* \param menu_mode a pointer to the currently active menu_mode.
* \param dtmf a pointer to the dtmf value currently being processed against the menu.
@@ -5221,7 +5221,7 @@ static int user_chan_cb(void *obj, void *args, int flags)
return 0;
}
-/*! \brief The MeetMeadmin application
+/*! \brief The MeetMeAdmin application
MeetMeAdmin(confno, command, caller) */
static int admin_exec(struct ast_channel *chan, const char *data) {
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 2d26e786e5ed11e6611d43b575cd761709eeff12..96948503cbdcd13e9c136b3856b11a5c815dbbac 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -536,7 +536,7 @@
#define SOUND_INTRO "vm-intro"
#define B64_BASEMAXINLINE 256 /*!< Buffer size for Base 64 attachment encoding */
-#define B64_BASELINELEN 72 /*!< Line length for Base 64 endoded messages */
+#define B64_BASELINELEN 72 /*!< Line length for Base 64 encoded messages */
#define EOL "\r\n"
#define MAX_DATETIME_FORMAT 512
@@ -1737,7 +1737,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
}
return cmd;
default:
- /* If the caller is an ouside caller, and the review option is enabled,
+ /* If the caller is an outside caller, and the review option is enabled,
allow them to review the message, but let the owner of the box review
their OGM's */
if (outsidecaller && !ast_test_flag(vmu, MVM_REVIEW))
@@ -2827,7 +2827,7 @@ static int apply_general_options(struct ast_variable *var)
} else if (!strcmp(var->name, "externnotify")) {
/* External voicemail notify application */
ast_copy_string(global_externnotify, var->value, sizeof(global_externnotify));
- } else if (!strcmp(var->name, "silencetreshold")) {
+ } else if (!strcmp(var->name, "silencethreshold") || !strcmp(var->name, "silencetreshold")) {
/* Silence treshold */
global_silencethreshold = atoi(var->value);
} else if (!strcmp(var->name, "maxmessage")) {
@@ -2956,6 +2956,8 @@ static int load_config(int reload)
ast_copy_string(template->fromaddress, chanvar, sizeof(template->fromaddress));
if ((chanvar = ast_variable_retrieve(cfg, "general", "emailaaddress")))
ast_copy_string(template->serveremail, chanvar, sizeof(template->serveremail));
+ if ((chanvar = ast_variable_retrieve(cfg, "general", "emailaddress")))
+ ast_copy_string(template->serveremail, chanvar, sizeof(template->serveremail));
if ((chanvar = ast_variable_retrieve(cfg, "general", "emailcharset")))
ast_copy_string(template->charset, chanvar, sizeof(template->charset));
if ((chanvar = ast_variable_retrieve(cfg, "general", "emailsubject")))
diff --git a/apps/app_playback.c b/apps/app_playback.c
index ab6e60e3ee138c000b1cd4767ac7d4155e1c7ee6..56e74ac5e89c253c85675730e83275639595fc49 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -35,7 +35,7 @@
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/app.h"
-/* This file provides config-file based 'say' functions, and implenents
+/* This file provides config-file based 'say' functions, and implements
* some CLI commands.
*/
#include "asterisk/say.h" /*!< provides config-file based 'say' functions */
diff --git a/apps/app_queue.c b/apps/app_queue.c
index cfe49c30c945d03d9e8b9a1ae99d9717c44bdf6c..59d6f39a6e1ecdb3d83fd41611f545894b7af259 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1486,7 +1486,7 @@ static int montype_default;
/*! \brief queues.conf [general] option */
static int shared_lastcall;
-/*! \brief queuesrules.conf [general] option */
+/*! \brief queuerules.conf [general] option */
static int realtime_rules;
/*! \brief Subscription to device state change messages */
@@ -1586,7 +1586,7 @@ struct queue_ent {
int pending; /*!< Non-zero if we are attempting to call a member */
int max_penalty; /*!< Limit the members that can take this call to this penalty or lower */
int min_penalty; /*!< Limit the members that can take this call to this penalty or higher */
- int raise_penalty; /*!< Float lower penalty mambers to a minimum penalty */
+ int raise_penalty; /*!< Float lower penalty members to a minimum penalty */
int linpos; /*!< If using linear strategy, what position are we at? */
int linwrapped; /*!< Is the linpos wrapped? */
time_t start; /*!< When we started holding */
@@ -2641,7 +2641,7 @@ static int extensionstate2devicestate(int state)
* \param parent Parent context to search for child
* \param child Context to check for inclusion in parent
*
- * This function recrusively checks if the context child is included in the context parent.
+ * This function recursively checks if the context child is included in the context parent.
*
* \return 1 if child is included in parent, 0 if not
*/
@@ -2943,7 +2943,7 @@ static void clear_queue(struct call_queue *q)
/*!
* \brief Change queue penalty by adding rule.
*
- * Check rule for errors with time or fomatting, see if rule is relative to rest
+ * Check rule for errors with time or formatting, see if rule is relative to rest
* of queue, iterate list of rules to find correct insertion point, insert and return.
* \retval -1 on failure
* \retval 0 on success
@@ -3047,7 +3047,7 @@ static int insert_penaltychange(const char *list_name, const char *content, cons
/*!
* \brief Load queue rules from realtime.
*
- * Check rule for errors with time or fomatting, see if rule is relative to rest
+ * Check rule for errors with time or formatting, see if rule is relative to rest
* of queue, iterate list of rules to find correct insertion point, insert and return.
* \retval -1 on failure
* \retval 0 on success
@@ -4341,7 +4341,7 @@ static void hangupcalls(struct queue_ent *qe, struct callattempt *outgoing, stru
*
* \note The queue passed in should be locked prior to this function call
*
- * \param[in] q The queue for which we are couting the number of available members
+ * \param[in] q The queue for which we are counting the number of available members
* \return Return the number of available members in queue q
*/
static int num_available_members(struct call_queue *q)
@@ -4989,7 +4989,7 @@ static void update_connected_line_from_peer(struct ast_channel *chan, struct ast
* \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
* \param[in] forwardsallowed used to detect if we should allow call forwarding, based on the 'i' option to Queue()
*
- * \todo eventually all call forward logic should be intergerated into and replaced by ast_call_forward()
+ * \todo eventually all call forward logic should be integrated into and replaced by ast_call_forward()
*/
static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callattempt *outgoing, int *to, char *digit, int prebusies, int caller_disconnect, int forwardsallowed)
{
@@ -7504,7 +7504,7 @@ static int change_priority_caller_on_queue(const char *queuename, const char *ca
res = RES_NOT_CALLER;
for (qe = q->head; qe; qe = qe->next) {
if (strcmp(ast_channel_name(qe->chan), caller) == 0) {
- ast_debug(1, "%s Caller new prioriry %d in queue %s\n",
+ ast_debug(1, "%s Caller new priority %d in queue %s\n",
caller, priority, queuename);
qe->prio = priority;
res = RES_OKAY;
@@ -7818,7 +7818,7 @@ static int get_member_penalty(char *queuename, char *interface)
queue_t_unref(q, "Search complete");
}
- /* some useful debuging */
+ /* some useful debugging */
if (foundqueue) {
ast_log (LOG_ERROR, "Invalid queuename\n");
} else {
@@ -9705,7 +9705,7 @@ static int reload_handler(int reload, struct ast_flags *mask, const char *queuen
return res;
}
-/*! \brief direct ouput to manager or cli with proper terminator */
+/*! \brief direct output to manager or cli with proper terminator */
static void do_print(struct mansession *s, int fd, const char *str)
{
if (s) {
@@ -10991,7 +10991,7 @@ static char *handle_queue_set_member_ringinuse(struct ast_cli_entry *e, int cmd,
return CLI_SHOWUSAGE;
}
- /* Set the queue name if applicale */
+ /* Set the queue name if applicable */
if (a->argc == 8) {
queuename = a->argv[7];
}
diff --git a/apps/app_statsd.c b/apps/app_statsd.c
index a4ca233ea255fb184469c31ac593dae5c23229d7..ebbdc0ff37a731b0b5c882be2c21a3744722ee3a 100644
--- a/apps/app_statsd.c
+++ b/apps/app_statsd.c
@@ -78,7 +78,7 @@ static const char app[] = "StatsD";
*
* \param value The value of the statistic to be sent to StatsD.
*
- * This function checks to see if the value given to the StatsD daialplan
+ * This function checks to see if the value given to the StatsD dailplan
* application is within the allowed range of [-2^63, 2^63] as specified by StatsD.
*
* \retval zero on success.
@@ -100,7 +100,7 @@ static int value_in_range(const char *value) {
*
* \param value The value of the statistic to be sent to StatsD.
*
- * This function checks to see if the value given to the StatsD daialplan
+ * This function checks to see if the value given to the StatsD dailplan
* application is within the allowed range of [0, 2^64] as specified by StatsD.
*
* \retval zero on success.
diff --git a/apps/app_test.c b/apps/app_test.c
index 96772702a0b405845d1dfba9c612f203dacdd1c9..28e0069d26a8707361f00181d688576aef3d4070 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -352,7 +352,7 @@ static int testserver_exec(struct ast_channel *chan, const char *data)
if (!res)
res = ast_app_getdata(chan, NULL, testid, sizeof(testid) - 1, 0);
ast_debug(1, "read test identifier: %s\n", testid);
- /* Check for sneakyness */
+ /* Check for sneakiness */
if (strchr(testid, '/'))
res = -1;
if ((res >=0) && (!ast_strlen_zero(testid))) {
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 39bfd93a1f65b64fe4ee5eb6337ea53df0cb2072..94c26e11cd7e21fdd77de27ac6a605e76c06915e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -560,7 +560,7 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
#define VM_FORCENAME (1 << 7) /*!< Have new users record their name */
#define VM_FORCEGREET (1 << 8) /*!< Have new users record their greetings */
#define VM_PBXSKIP (1 << 9) /*!< Skip the [PBX] preamble in the Subject line of emails */
-#define VM_DIRECFORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */
+#define VM_DIRECTFORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */
#define VM_ATTACH (1 << 11) /*!< Attach message to voicemail notifications? */
#define VM_DELETE (1 << 12) /*!< Delete message after sending notification */
#define VM_ALLOCED (1 << 13) /*!< Structure was malloc'ed, instead of placed in a return (usually static) buffer */
@@ -3024,7 +3024,7 @@ static int init_mailstream(struct vm_state *vms, int box)
ast_mutex_lock(&vms->lock);
ast_mutex_lock(&mail_open_lock);
vms->mailstream = mail_open (stream, tmp, debug ? OP_DEBUG : NIL);
- /* Create the folder if it dosn't exist */
+ /* Create the folder if it doesn't exist */
if (vms->mailstream && !mail_status(vms->mailstream, tmp, SA_UIDNEXT)) {
mail_create(vms->mailstream, tmp);
}
@@ -5087,7 +5087,7 @@ static const char *ast_str_encode_mime(struct ast_str **end, ssize_t maxlen, con
* \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.
* \param flag, msg_id
*
- * 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.
+ * 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.
*/
static void make_email_file(FILE *p,
char *srcemail,
@@ -7253,7 +7253,7 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg
/* get the current mailbox so that we can point the mailstream back to it later */
curr_mbox = get_folder_by_name(vms->curbox);
- /* Create the folder if it dosn't exist */
+ /* Create the folder if it doesn't exist */
imap_mailbox_name(mailbox, sizeof(mailbox), vms, box, 1); /* Get the full mailbox name */
if (vms->mailstream && !mail_status(vms->mailstream, mailbox, SA_UIDNEXT)) {
if (mail_create(vms->mailstream, mailbox) != NIL) {
@@ -7372,7 +7372,7 @@ static int adsi_load_vmail(struct ast_channel *chan, int *useadsi)
bytes = 0;
bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 0, "Listen", "Listen", "1", 1);
bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 1, "Folder", "Folder", "2", 1);
- bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 2, "Advanced", "Advnced", "3", 1);
+ bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 2, "Advanced", "Advanced", "3", 1);
bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 3, "Options", "Options", "0", 1);
bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 4, "Help", "Help", "*", 1);
bytes += ast_adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 5, "Exit", "Exit", "#", 1);
@@ -8314,7 +8314,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
ast_test_suite_event_notify("FORWARD", "Message: entering forward message menu");
while (!res && !valid_extensions) {
int use_directory = 0;
- if (ast_test_flag((&globalflags), VM_DIRECFORWARD)) {
+ if (ast_test_flag((&globalflags), VM_DIRECTFORWARD)) {
int done = 0;
int retries = 0;
cmd = 0;
@@ -8383,7 +8383,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
ast_channel_priority_set(chan, old_priority);
} else {
ast_log(AST_LOG_WARNING, "Could not find the Directory application, disabling directory_forward\n");
- ast_clear_flag((&globalflags), VM_DIRECFORWARD);
+ ast_clear_flag((&globalflags), VM_DIRECTFORWARD);
}
} else {
/* Ask for an extension */
@@ -8707,7 +8707,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' Q 'digits/at' HM", NULL);
} else if (!strncasecmp(ast_channel_language(chan), "pl", 2)) { /* POLISH syntax */
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' Q HM", NULL);
- } else if (!strncasecmp(ast_channel_language(chan), "pt_BR", 5)) { /* Brazillian PORTUGUESE syntax */
+ } else if (!strncasecmp(ast_channel_language(chan), "pt_BR", 5)) { /* Brazilian PORTUGUESE syntax */
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);
} else if (!strncasecmp(ast_channel_language(chan), "se", 2)) { /* SWEDISH syntax */
res = ast_say_date_with_format(chan, t, AST_DIGIT_ANY, ast_channel_language(chan), "'vm-received' dB 'digits/at' k 'and' M", NULL);
@@ -9447,9 +9447,9 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms)
* on vm-message.
* 3) Call ast_say_counted_adjective() to put the proper gender and number
* prefix on vm-new and vm-old (none for English).
- * 4) Pass the gender of the language's word for "message" as an agument to
+ * 4) Pass the gender of the language's word for "message" as an argument to
* this function which is can in turn pass on to the functions which
- * say numbers and put endings on nounds and adjectives.
+ * say numbers and put endings on nouns and adjectives.
*
* All languages require these messages:
* vm-youhave "You have..."
@@ -12540,7 +12540,7 @@ AST_TEST_DEFINE(test_voicemail_vmuser)
res = 1;
}
if (strcasecmp(vmu->attachfmt, "wav49")) {
- ast_test_status_update(test, "Parse failure for attachftm option\n");
+ ast_test_status_update(test, "Parse failure for attachfmt option\n");
res = 1;
}
if (strcasecmp(vmu->fromstring, "Voicemail System")) {
@@ -14212,7 +14212,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con
if (!(val = ast_variable_retrieve(cfg, "general", "usedirectory")))
val = "no";
- ast_set2_flag((&globalflags), ast_true(val), VM_DIRECFORWARD);
+ ast_set2_flag((&globalflags), ast_true(val), VM_DIRECTFORWARD);
if (!(val = ast_variable_retrieve(cfg, "general", "passwordlocation"))) {
val = "voicemail.conf";
@@ -15714,7 +15714,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
}
return cmd;
default:
- /* If the caller is an ouside caller and the review option is enabled or it's forward intro
+ /* If the caller is an outside caller and the review option is enabled or it's forward intro
allow them to review the message, but let the owner of the box review
their OGM's */
if (outsidecaller && !ast_test_flag(vmu, VM_REVIEW) && !forwardintro)
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index e5e253bc94da8fe5223072819d39eaf0692a8994..4f58c18e67f83e81ed16137084f02161f689027e 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -384,7 +384,7 @@
specific conference bridge.
You should be aware that there are potential races between testing for the
existence of a bridge, and taking action upon that information, consider
- for example two callers executing the check simultaniously, and then taking
+ for example two callers executing the check simultaneously, and then taking
special action as "first caller" into the bridge. The same for exiting,
directly after the check the bridge can be destroyed before the new caller
enters (creating a new bridge), for example, and the "first member" actions
@@ -459,7 +459,7 @@
<enum name="sound_kicked"><para>The sound played to a user who has been kicked from the conference.</para></enum>
<enum name="sound_muted"><para>The sound played when the mute option it toggled on.</para></enum>
<enum name="sound_unmuted"><para>The sound played when the mute option it toggled off.</para></enum>
- <enum name="sound_binaural_on"><para>The sound played when binaural auudio is turned on.</para></enum>
+ <enum name="sound_binaural_on"><para>The sound played when binaural audio is turned on.</para></enum>
<enum name="sound_binaural_off"><para>The sound played when the binaural audio is turned off.</para></enum>
<enum name="sound_only_person"><para>The sound played when the user is the only person in the conference.</para></enum>
<enum name="sound_only_one"><para>The sound played to a user when there is only one other
@@ -1353,7 +1353,7 @@ static int add_menu_entry(struct conf_menu *menu, const char *dtmf, const char *
comma = strchr(tmp_action_names, ',');
/* If the next action has brackets with comma delimited arguments in it,
- * make the delimeter ')' instead of a comma to preserve the argments */
+ * make the delimeter ')' instead of a comma to preserve the arguments */
if (startbrace && endbrace && comma && (comma > startbrace && comma < endbrace)) {
delimiter = ")";
} else {