[svn-commits] tilghman: branch 1.6.2 r183917 - in /branches/1.6.2: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Mar 24 10:29:02 2009
New Revision: 183917

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

................
  r183914 | tilghman | 2009-03-24 10:26:42 -0500 (Tue, 24 Mar 2009) | 10 lines
  
  Merged revisions 183913 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183913 | tilghman | 2009-03-24 10:25:42 -0500 (Tue, 24 Mar 2009) | 3 lines
    
    Additionally note that the operator option needs an 'o' extension.
    (Related to issue #14731)
  ........
................

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Tue Mar 24 10:29:02 2009
@@ -1,1 +1,1 @@
-/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865
+/trunk:1-182359,182408,182450,182525,182530,182553,182722,182847,183028,183057,183108,183117,183242,183244,183321,183511,183560,183701,183766,183865,183914

Modified: branches/1.6.2/configs/voicemail.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/configs/voicemail.conf.sample?view=diff&rev=183917&r1=183916&r2=183917
==============================================================================
--- branches/1.6.2/configs/voicemail.conf.sample (original)
+++ branches/1.6.2/configs/voicemail.conf.sample Tue Mar 24 10:29:02 2009
@@ -240,8 +240,10 @@
 ; 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]
+; operator=yes      ; Allow sender to hit 0 before/after/during leaving a voicemail to
+                    ; reach an operator.  This option REQUIRES an 'o' extension in the
+                    ; same context (or in exitcontext, if set), as that is where the
+                    ; 0 key will send you.  [OFF by default]
 ; envelope=no 		; Turn on/off envelope playback before message playback. [ON by default] 
 			;     This does NOT affect option 3,3 from the advanced options menu
 ; delete=yes		; After notification, the voicemail is deleted from the server. [per-mailbox only]