diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-08-02 13:36:18 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-02 13:36:18 -0500 |
| commit | f1b0286aa4c3317586bd2312efa1fc2a9782d924 (patch) | |
| tree | e47e119c9a61cf00ded349d263ac582c7d52bd01 /res | |
| parent | 9d59de79c9b2d152387cb01a846f93e5aa0cafe8 (diff) | |
| parent | efc4034d72120ec47a84cf179dfdd859b68e8aa2 (diff) | |
Merge "rest-api: Code out of sync with the model" into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/ari/resource_channels.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/ari/resource_channels.h b/res/ari/resource_channels.h index 5bb6f7f1e..dd20415ff 100644 --- a/res/ari/resource_channels.h +++ b/res/ari/resource_channels.h @@ -78,7 +78,7 @@ struct ast_ari_channels_originate_args { const char *other_channel_id; /*! The unique id of the channel which is originating this one. */ const char *originator; - /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names an be found with "core show codecs". */ + /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names can be found with "core show codecs". */ const char *formats; }; /*! @@ -143,7 +143,7 @@ struct ast_ari_channels_originate_with_id_args { const char *other_channel_id; /*! The unique id of the channel which is originating this one. */ const char *originator; - /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names an be found with "core show codecs". */ + /*! The format name capability list to use if originator is not specified. Ex. "ulaw,slin16". Format names can be found with "core show codecs". */ const char *formats; }; /*! |