From: Leif Madsen Date: Mon, 11 May 2009 18:07:51 +0000 (+0000) Subject: Recorded merge of revisions 193545 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~253 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c10d1c18884395f8dc78d53365907057da834ec;p=thirdparty%2Fasterisk.git Recorded merge of revisions 193545 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r193545 | lmadsen | 2009-05-11 14:01:44 -0400 (Mon, 11 May 2009) | 14 lines Recorded merge of revisions 193544 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r193544 | lmadsen | 2009-05-11 13:35:17 -0400 (Mon, 11 May 2009) | 7 lines Document CHANNEL(transfercapability) in CLI documentation. (issue #15073) Reported by: pkempgen Patches: 20090511__issue15073.diff.txt uploaded by tilghman (license 14) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@193547 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/funcs/func_channel.c b/funcs/func_channel.c index af3b8e515c..84d115a73f 100644 --- a/funcs/func_channel.c +++ b/funcs/func_channel.c @@ -183,6 +183,8 @@ static struct ast_custom_function channel_function = { "R/W rxgain set rxgain level on channel drivers that support it\n" "R/O state state for channel\n" "R/W tonezone zone for indications played\n" + "R/W transfercapability ISDN transfer capability (one of SPEECH, DIGITAL,\n" + " RESTRICTED_DIGITAL, 3K1AUDIO, DIGITAL_W_TONES, or VIDEO).\n" "R/W txgain set txgain level on channel drivers that support it\n" "R/O videonativeformat format used natively for video\n" #ifdef CHANNEL_TRACE