diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-10-22 16:28:05 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-10-22 16:28:05 +0000 |
| commit | c17731620dd2da8e241d538484a8f8111d6513bc (patch) | |
| tree | f0c069fa35be565f76e9a731f93634cc843d4507 /res/res_parking.c | |
| parent | 701847af22218f643b08b3c0c7e61f65e36e4acc (diff) | |
res_parking: Update XML documention for DTMF features after parking timeout.
* Updated the XML documentation to indicate that the parkedcalltransfers,
parkedcallreparking, parkedcallhangup, and parkedcallrecording
configuration options also apply to parking timeouts.
(issue ASTERISK-22630)
Reported by: Kevin Harwell
Review: https://reviewboard.asterisk.org/r/2942/
........
Merged revisions 401420 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_parking.c')
| -rw-r--r-- | res/res_parking.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/res/res_parking.c b/res/res_parking.c index 881bb1288..6d07818de 100644 --- a/res/res_parking.c +++ b/res/res_parking.c @@ -98,15 +98,21 @@ <note><para>When parking times out and the channel returns to the dial plan, the following variables are set: </para></note> <variablelist> - <variable name="PARKINGSLOT"> + <variable name="PARKING_SPACE"> <para>extension that the call was parked in prior to timing out.</para> </variable> + <variable name="PARKINGSLOT"> + <para>Deprecated. Use <variable>PARKING_SPACE</variable> instead.</para> + </variable> <variable name="PARKEDLOT"> <para>name of the lot that the call was parked in prior to timing out.</para> </variable> <variable name="PARKER"> <para>The device that parked the call</para> </variable> + <variable name="PARKER_FLAT"> + <para>The flat version of <variable>PARKER</variable></para> + </variable> </variablelist> </description> </configOption> @@ -131,33 +137,33 @@ <description> <enumlist> <enum name="no"><para>Apply to neither side.</para></enum> - <enum name="caller"><para>Apply to only to the caller picking up the parked call.</para></enum> - <enum name="callee"><para>Apply to only to the parked call being picked up.</para></enum> - <enum name="both"><para>Apply to both the caller and the callee.</para></enum> + <enum name="caller"><para>Apply only to the call connecting with the call coming out of the parking lot.</para></enum> + <enum name="callee"><para>Apply only to the call coming out of the parking lot.</para></enum> + <enum name="both"><para>Apply to both sides.</para></enum> </enumlist> <note><para>If courtesy tone is not specified then this option will be ignored.</para></note> </description> </configOption> <configOption name="parkedcalltransfers" default="no"> - <synopsis>Apply the DTMF transfer features to the caller and/or callee when parked calls are picked up.</synopsis> + <synopsis>Who to apply the DTMF transfer features to when parked calls are picked up or timeout.</synopsis> <description> <xi:include xpointer="xpointer(/docs/configInfo[@name='res_parking']/configFile[@name='res_parking.conf']/configObject[@name='parking_lot']/configOption[@name='parkedplay']/description/enumlist)" /> </description> </configOption> <configOption name="parkedcallreparking" default="no"> - <synopsis>Apply the DTMF parking feature to the caller and/or callee when parked calls are picked up.</synopsis> + <synopsis>Who to apply the DTMF parking feature to when parked calls are picked up or timeout.</synopsis> <description> <xi:include xpointer="xpointer(/docs/configInfo[@name='res_parking']/configFile[@name='res_parking.conf']/configObject[@name='parking_lot']/configOption[@name='parkedplay']/description/enumlist)" /> </description> </configOption> <configOption name="parkedcallhangup" default="no"> - <synopsis>Apply the DTMF Hangup feature to the caller and/or callee when parked calls are picked up.</synopsis> + <synopsis>Who to apply the DTMF hangup feature to when parked calls are picked up or timeout.</synopsis> <description> <xi:include xpointer="xpointer(/docs/configInfo[@name='res_parking']/configFile[@name='res_parking.conf']/configObject[@name='parking_lot']/configOption[@name='parkedplay']/description/enumlist)" /> </description> </configOption> <configOption name="parkedcallrecording" default="no"> - <synopsis>Apply the DTMF recording features to the caller and/or callee when parked calls are picked up</synopsis> + <synopsis>Who to apply the DTMF MixMonitor recording feature to when parked calls are picked up or timeout.</synopsis> <description> <xi:include xpointer="xpointer(/docs/configInfo[@name='res_parking']/configFile[@name='res_parking.conf']/configObject[@name='parking_lot']/configOption[@name='parkedplay']/description/enumlist)" /> </description> |