diff options
| author | Rusty Newton <rnewton@digium.com> | 2014-01-17 17:16:14 +0000 |
|---|---|---|
| committer | Rusty Newton <rnewton@digium.com> | 2014-01-17 17:16:14 +0000 |
| commit | f6647d2362964539f3d7aaf23479fe284e9442ff (patch) | |
| tree | ec7615ab108a3fe0654ba8e7faff698de65d3759 /channels | |
| parent | 3fb2906955dab8081d164969a6789a99d7bbf1a6 (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')
| -rw-r--r-- | channels/chan_iax2.c | 2 | ||||
| -rw-r--r-- | channels/chan_sip.c | 6 |
2 files changed, 4 insertions, 4 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)) || diff --git a/channels/chan_sip.c b/channels/chan_sip.c index cc17ad3d3..0d0f44658 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -6417,7 +6417,7 @@ static int sip_call(struct ast_channel *ast, const char *dest, int timeout) } else if (!strcmp(ast_var_name(current), "SIPFROMDOMAIN")) { ast_string_field_set(p, fromdomain, ast_var_value(current)); } else if (!strcmp(ast_var_name(current), "SIPTRANSFER")) { - /* This is a transfered call */ + /* This is a transferred call */ p->options->transfer = 1; } else if (!strcmp(ast_var_name(current), "SIPTRANSFER_REFERER")) { /* This is the referrer */ @@ -6474,7 +6474,7 @@ static int sip_call(struct ast_channel *ast, const char *dest, int timeout) if (referer) { if (sipdebug) - ast_debug(3, "Call for %s transfered by %s\n", p->username, referer); + ast_debug(3, "Call for %s transferred by %s\n", p->username, referer); snprintf(buf, sizeof(buf)-1, "-> %s (via %s)", p->cid_name, referer); } else snprintf(buf, sizeof(buf)-1, "-> %s", p->cid_name); @@ -24821,7 +24821,7 @@ static int handle_request_notify(struct sip_pvt *p, struct sip_request *req, str /* EventID for each transfer... EventID is basically the REFER cseq - We are getting notifications on a call that we transfered + We are getting notifications on a call that we transferred We should hangup when we are getting a 200 OK in a sipfrag Check if we have an owner of this event */ |