From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 1 Mar 2011 21:57:58 +0000 (+0000)
Subject: Merged revisions 309170 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1812
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffe9e4acfc36dde4f66510086209c005ae0687ea;p=thirdparty%2Fasterisk.git

Merged revisions 309170 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r309170 | rmudgett | 2011-03-01 15:57:26 -0600 (Tue, 01 Mar 2011) | 7 lines

  Document CHANNEL(keypad_digits) and CHANNEL(no_media_path).

  * Added XML documentation for CHANNEL(keypad_digits) and
  CHANNEL(no_media_path).

  * Tweaked XML documentation for CHANNEL(reversecharge).
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309171 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 548d0590f0..4ae08efc2a 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -224,13 +224,20 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 				</enumlist>
 				<para><emphasis>chan_dahdi</emphasis> provides the following additional options:</para>
 				<enumlist>
+					<enum name="keypad_digits">
+						<para>R/O PRI Keypad digits that came in with the SETUP message.</para>
+					</enum>
 					<enum name="reversecharge">
-						<para>R/O Reverse Charging Indication, one of:</para>
+						<para>R/O PRI Reverse Charging Indication, one of:</para>
 						<enumlist>
-							<enum name="-1 - None" />
-							<enum name="1 - Reverse Charging Requested" />
+							<enum name="-1"> <para>None</para></enum>
+							<enum name=" 1"> <para>Reverse Charging Requested</para></enum>
 						</enumlist>
 					</enum>
+					<enum name="no_media_path">
+						<para>R/O PRI Nonzero if the channel has no B channel.
+						The channel is either on hold or a call waiting call.</para>
+					</enum>
 				</enumlist>
 			</parameter>
 		</syntax>