[svn-commits] qwell: branch 1.6.0 r116411 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed May 14 15:43:45 2008
New Revision: 116411

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116411
Log:
Merged revisions 116410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r116410 | qwell | 2008-05-14 15:43:26 -0500 (Wed, 14 May 2008) | 9 lines

Merged revisions 116409 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r116409 | qwell | 2008-05-14 15:43:08 -0500 (Wed, 14 May 2008) | 1 line

Document exitcontext in app_voicemail sample config
........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/voicemail.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/voicemail.conf.sample?view=diff&rev=116411&r1=116410&r2=116411
==============================================================================
--- branches/1.6.0/configs/voicemail.conf.sample (original)
+++ branches/1.6.0/configs/voicemail.conf.sample Wed May 14 15:43:45 2008
@@ -218,6 +218,8 @@
 			; This option restores the old behavior [DEFAULT=no]
 ; callback=fromvm 	; Context to call back from  
 			;     if not listed, calling the sender back will not be permitted
+; exitcontext=fromvm    ; Context to go to on user exit such as * or 0
+                        ;     The default is the current context.
 ; review=yes 		; Allow sender to review/rerecord their message before saving it [OFF by default
 ; operator=yes 		; Allow sender to hit 0 before/after/during  leaving a voicemail to 
 			;     reach an operator  [OFF by default]