[asterisk-commits] mmichelson: branch mmichelson/features_config_docs r391857 - /team/mmichelson...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Jun 14 13:52:42 CDT 2013
Author: mmichelson
Date: Fri Jun 14 13:52:41 2013
New Revision: 391857
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=391857
Log:
Address some of the review feedback.
Modified:
team/mmichelson/features_config_docs/main/features_config.c
Modified: team/mmichelson/features_config_docs/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config_docs/main/features_config.c?view=diff&rev=391857&r1=391856&r2=391857
==============================================================================
--- team/mmichelson/features_config_docs/main/features_config.c (original)
+++ team/mmichelson/features_config_docs/main/features_config.c Fri Jun 14 13:52:41 2013
@@ -52,8 +52,11 @@
re-call the transferrer if the call to the transfer target fails. If the call to the
transferrer fails, then Asterisk will wait <replaceable>atxferloopdelay</replaceable>
milliseconds and then attempt to dial the transfer target again. This process will
- repeat until <replaceable>atxfercallbackretries</replaceable> attempts to re-call
+ repeat until <replaceable>atxfercallbackretries</replaceable> attempts to re-call
the transferrer have occurred.</para>
+ <para>When this option is set to <literal>yes</literal>, then Asterisk will not attempt
+ to re-call the transferrer if the call to the transfer target fails. Asterisk will instead
+ hang up all channels involved in the transfer.</para>
</description>
</configOption>
<configOption name="atxferloopdelay" default="10000">
@@ -65,7 +68,12 @@
<see-also><ref type="configOption">atxferdropcall</ref></see-also>
</configOption>
<configOption name="xfersound" default="beep">
- <synopsis>Sound to play to a transferee when a transfer completes</synopsis>
+ <synopsis>Sound to play to during transfer and transfer-like operations.</synopsis>
+ <description>
+ <para>This sound will play to the transferrer and transfer target channels when
+ an attended transfer completes. This sound is also played to channels when performing
+ an AMI <literal>Bridge</literal> action.</para>
+ </description>
</configOption>
<configOption name="xferfailsound" default="beeperr">
<synopsis>Sound to play to a transferee when a transfer fails</synopsis>
@@ -74,8 +82,8 @@
<synopsis>Digits to dial to abort an attended transfer attempt</synopsis>
<description>
<para>This option is only available to the transferrer during an attended
- transfer operation. Aborting a transfer results in all parties being hung
- up.</para>
+ transfer operation. Aborting a transfer results in the transfer being cancelled and
+ the original parties in the call being re-bridged.</para>
</description>
</configOption>
<configOption name="atxfercomplete" default="*2">
@@ -142,23 +150,6 @@
matter the number of parties present</para>
</description>
</configOption>
- <configOption name="automon">
- <synopsis>DTMF sequence to start or stop monitoring of a call</synopsis>
- <description>
- <para>This will cause the channel that pressed the DTMF sequence
- to be monitored by the <literal>Monitor</literal> application. The
- format for the recording is determined by the <replaceable>TOUCH_MONITOR_FORMAT</replaceable>
- channel variable. If this variable is not specified, then <literal>wav</literal> is the
- default. The filename is constructed in the following manner:</para>
-
- <para> prefix-timestamp-filename</para>
-
- <para>where prefix is either the value of the <replaceable>TOUCH_MONITOR_PREFIX</replaceable>
- channel variable or <literal>auto</literal> if the variable is not set. The timestamp
- is a UNIX timestamp. The filename is either the value of the <replaceable>TOUCH_MONITOR</replaceable>
- channel variable or the callerID of the channels if the variable is not set.</para>
- </description>
- </configOption>
<configOption name="parkcall">
<synopsis>DTMF sequence to park a call</synopsis>
<description>
@@ -169,8 +160,25 @@
is used. The call is parked in the next available space in the parking lot.</para>
</description>
</configOption>
+ <configOption name="automon">
+ <synopsis>DTMF sequence to start or stop monitoring a call</synopsis>
+ <description>
+ <para>This will cause the channel that pressed the DTMF sequence
+ to be monitored by the <literal>Monitor</literal> application. The
+ format for the recording is determined by the <replaceable>TOUCH_MONITOR_FORMAT</replaceable>
+ channel variable. If this variable is not specified, then <literal>wav</literal> is the
+ default. The filename is constructed in the following manner:</para>
+
+ <para> prefix-timestamp-filename</para>
+
+ <para>where prefix is either the value of the <replaceable>TOUCH_MONITOR_PREFIX</replaceable>
+ channel variable or <literal>auto</literal> if the variable is not set. The timestamp
+ is a UNIX timestamp. The filename is either the value of the <replaceable>TOUCH_MONITOR</replaceable>
+ channel variable or the callerID of the channels if the variable is not set.</para>
+ </description>
+ </configOption>
<configOption name="automixmon">
- <synopsis>DTMF sequence to start or stop mixmonitoring of a call </synopsis>
+ <synopsis>DTMF sequence to start or stop mixmonitoring a call </synopsis>
<description>
<para>Operation of the automixmon is similar to the <literal> automon </literal>
feature, with the following exceptions:
@@ -188,7 +196,7 @@
defined in the applicationmap are not automatically accessible to bridged parties. Access
to the individual items is controled using the <replaceable>DYNAMIC_FEATURES</replaceable> channel variable.
The <replaceable>DYNAMIC_FEATURES</replaceable> is a <literal>#</literal> separated list of
- either applicationmap item names or featuregroups.</para>
+ either applicationmap item names or featuregroup names.</para>
</description>
<configOption name="^.*$" regex="true">
<synopsis>A custom feature to invoke during a bridged call</synopsis>
@@ -209,10 +217,6 @@
<para> eggs = *5,self,Playback(hello-world),default</para>
<para> eggs = *5,self,Playback,hello-world,default</para>
<para> eggs = *5,self,Playback,"hello-world",default</para>
- <para> eggs = *5,caller,Playback(hello-world),default</para>
- <para>The following lines are also functionally identical:</para>
- <para> eggs = *5,peer,Playback(hello-world),default</para>
- <para> eggs = *5,callee,Playback(hello-world),default</para>
</description>
<syntax argsep=",">
<parameter name="dtmf" required="true">
More information about the asterisk-commits
mailing list