[svn-commits] rmudgett: trunk r309171 - in /trunk: ./ funcs/func_channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Mar  1 15:57:58 2011
New Revision: 309171

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309171
Log:
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).
........

Modified:
    trunk/   (props changed)
    trunk/funcs/func_channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/funcs/func_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_channel.c?view=diff&rev=309171&r1=309170&r2=309171
==============================================================================
--- trunk/funcs/func_channel.c (original)
+++ trunk/funcs/func_channel.c Tue Mar  1 15:57:58 2011
@@ -224,12 +224,19 @@
 				</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>