summaryrefslogtreecommitdiff
path: root/channels/chan_iax2.c
diff options
context:
space:
mode:
authorRusty Newton <rnewton@digium.com>2014-01-17 17:16:14 +0000
committerRusty Newton <rnewton@digium.com>2014-01-17 17:16:14 +0000
commitf6647d2362964539f3d7aaf23479fe284e9442ff (patch)
treeec7615ab108a3fe0654ba8e7faff698de65d3759 /channels/chan_iax2.c
parent3fb2906955dab8081d164969a6789a99d7bbf1a6 (diff)
Documentation: doc fixes across various parts of the code for ASTERISK issues 23061,23028,23046,23027
Fixes typos of "transfered" instead of "transferred" in various code. Fixes incorrect gosub param help text for app_queue. Fixes Asterisk man pages containing unquoted minus signs. Adds note about the "textsupport" option in sip.conf.sample. (issue ASTERISK-23061) (issue ASTERISK-23028) (issue ASTERISK-23046) (issue ASTERISK-23027) (closes issue ASTERISK-23061) (closes issue ASTERISK-23028) (closes issue ASTERISK-23046) (closes issue ASTERISK-23027) Reported by: Eugene, Jeremy Laine, Denis Pantsyrev Patches: transferred.patch uploaded by Jeremy Laine (license 6561) hyphen.patch uploaded by Jeremy Laine (license 6561) sip.conf.sample.patch uploaded by Eugene (license 6360) ........ Merged revisions 405791 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ........ Merged revisions 405792 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 405829 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405830 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r--channels/chan_iax2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index dcbd210dc..bb8c9eb5b 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5468,7 +5468,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha
unlock_both(callno0, callno1);
return AST_BRIDGE_FAILED_NOWARN;
}
- /* check if transfered and if we really want native bridging */
+ /* check if transferred and if we really want native bridging */
if (!transferstarted && !ast_test_flag64(iaxs[callno0], IAX_NOTRANSFER) && !ast_test_flag64(iaxs[callno1], IAX_NOTRANSFER)) {
/* Try the transfer */
if (iax2_start_transfer(callno0, callno1, (flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) ||