diff options
author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-12-21 08:34:30 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-21 08:34:31 -0600 |
commit | d85290ca48c3d95cbf464967b83f06c118dc0010 (patch) | |
tree | cb87cbc560d5cff37544754a7becc71239ff5223 /apps | |
parent | e94962ce63c4987f9bf36c6380473d2944b10251 (diff) | |
parent | 82b6ba976fc679d4079abbe6d4e8ecc17cdc5ce6 (diff) |
Merge "Fix Common Typo's." into 13
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_adsiprog.c | 2 | ||||
-rw-r--r-- | apps/app_minivm.c | 2 | ||||
-rw-r--r-- | apps/app_saycounted.c | 2 | ||||
-rw-r--r-- | apps/app_skel.c | 4 | ||||
-rw-r--r-- | apps/app_voicemail.c | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c index 640f553a4..918b5ee53 100644 --- a/apps/app_adsiprog.c +++ b/apps/app_adsiprog.c @@ -321,7 +321,7 @@ static int goto_line(char *buf, char *name, int id, char *args, struct adsi_scri else if (!strcasecmp(page, "COMM")) cmd = 0x80; else { - ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script); + ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got '%s' at line %d of %s\n", page, lineno, script); return 0; } diff --git a/apps/app_minivm.c b/apps/app_minivm.c index dcf0ee2fa..c863f6360 100644 --- a/apps/app_minivm.c +++ b/apps/app_minivm.c @@ -1354,7 +1354,7 @@ static int sendmail(struct minivm_template *template, struct minivm_account *vmu prep_email_sub_vars(chan, vmu, cidnum, cidname, dur, date, counter); /* Find email address to use */ - /* If there's a server e-mail address in the account, use that, othterwise template */ + /* If there's a server e-mail address in the account, use that, otherwise template */ fromemail = ast_strlen_zero(vmu->serveremail) ? template->serveremail : vmu->serveremail; /* Find name to user for server e-mail */ diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c index 4eddc08e5..f51fccbb5 100644 --- a/apps/app_saycounted.c +++ b/apps/app_saycounted.c @@ -39,7 +39,7 @@ <para>The number of things</para> </parameter> <parameter name="filename" required="true"> - <para>File name stem for the noun that is the the name of the things</para> + <para>File name stem for the noun that is the name of the things</para> </parameter> </syntax> <description> diff --git a/apps/app_skel.c b/apps/app_skel.c index 20e6abfcc..e21bcc57b 100644 --- a/apps/app_skel.c +++ b/apps/app_skel.c @@ -173,7 +173,7 @@ struct skel_level_state { }; /*! \brief Object to hold level config information. - * \note This object should hold a reference to an an object that holds state across reloads. + * \note This object should hold a reference to an object that holds state across reloads. * The other fields are just examples of the kind of data that might be stored in an level. */ struct skel_level { @@ -193,7 +193,7 @@ struct skel_level { * the running game. */ struct skel_current_game { - uint32_t total_games; /*! The total number of games for this call to to the app */ + uint32_t total_games; /*! The total number of games for this call to the app */ uint32_t games_left; /*! How many games are left to play in this set */ uint32_t cheat; /*! Whether or not cheating was enabled for the game */ struct skel_level *level_info; /*! The level information for the running game */ diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 4a0dacc05..229c00d9e 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1298,7 +1298,7 @@ static void populate_defaults(struct ast_vm_user *vmu) } /*! - * \brief Sets a a specific property value. + * \brief Sets a specific property value. * \param vmu The voicemail user object to work with. * \param var The name of the property to be set. * \param value The value to be set to the property. @@ -4729,7 +4729,7 @@ static void copy_plain_file(char *frompath, char *topath) /*! * \brief Removes the voicemail sound and information file. - * \param file The path to the sound file. This will be the the folder and message index, without the extension. + * \param file The path to the sound file. This will be the folder and message index, without the extension. * * This is used by the DELETE macro when voicemails are stored on the file system. * @@ -8151,7 +8151,7 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu, * * When in the leave message mode (is_new_message == 1): * - allow the leaving of a message for ourselves. (Will not allow us to forward a message to ourselves, when is_new_message == 0). - * - attempt to determine the context and and mailbox, and then invoke leave_message() function to record and store the message. + * - attempt to determine the context and mailbox, and then invoke leave_message() function to record and store the message. * * When in the forward message mode (is_new_message == 0): * - retrieves the current message to be forwarded @@ -8252,7 +8252,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st old_exten = ast_strdupa(ast_channel_exten(chan)); old_priority = ast_channel_priority(chan); - /* call the the Directory, changes the channel */ + /* call the Directory, changes the channel */ snprintf(vmcontext, sizeof(vmcontext), "%s,,v", context ? context : "default"); res = pbx_exec(chan, directory_app, vmcontext); |