[svn-commits] lmadsen: branch 1.6.2 r270444 - in /branches/1.6.2: ./ configs/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Tue Jun 15 07:53:22 2010
New Revision: 270444

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

................
  r270443 | lmadsen | 2010-06-15 07:51:37 -0500 (Tue, 15 Jun 2010) | 9 lines
  
  Merged revisions 270442 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r270442 | lmadsen | 2010-06-15 07:47:03 -0500 (Tue, 15 Jun 2010) | 1 line
    
    Move information about zonemessages into the [zonemessages] section.
  ........
................

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

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

Modified: branches/1.6.2/configs/voicemail.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/voicemail.conf.sample?view=diff&rev=270444&r1=270443&r2=270444
==============================================================================
--- branches/1.6.2/configs/voicemail.conf.sample (original)
+++ branches/1.6.2/configs/voicemail.conf.sample Tue Jun 15 07:53:22 2010
@@ -175,40 +175,8 @@
 ; NOT use INBOX as the parent. Default is to have no parent folder set.
 ;imapparentfolder=INBOX
 ; 
-; Users may be located in different timezones, or may have different 
-; message announcements for their introductory message when they enter 
-; the voicemail system. Set the message and the timezone each user 
-; hears here. Set the user into one of these zones with the tz= attribute 
-; in the options field of the mailbox. Of course, language substitution 
-; still applies here so you may have several directory trees that have 
-; alternate language choices. 
-; 
-; Look in /usr/share/zoneinfo/ for names of timezones. 
-; Look at the manual page for strftime for a quick tutorial on how the 
-; variable substitution is done on the values below. 
-; 
-; Supported values: 
-; 'filename'    filename of a soundfile (single ticks around the filename
-;               required)
-; ${VAR}        variable substitution 
-; A or a        Day of week (Saturday, Sunday, ...) 
-; B or b or h   Month name (January, February, ...) 
-; d or e        numeric day of month (first, second, ..., thirty-first) 
-; Y             Year 
-; I or l        Hour, 12 hour clock 
-; H             Hour, 24 hour clock (single digit hours preceded by "oh") 
-; k             Hour, 24 hour clock (single digit hours NOT preceded by "oh") 
-; M             Minute, with 00 pronounced as "o'clock" 
-; N             Minute, with 00 pronounced as "hundred" (US military time)
-; P or p        AM or PM 
-; Q             "today", "yesterday" or ABdY
-;               (*note: not standard strftime value) 
-; q             "" (for today), "yesterday", weekday, or ABdY
-;               (*note: not standard strftime value) 
-; R             24 hour time, including minute 
-; 
-; 
-;
+; 
+; 
 ; Each mailbox is listed in the form <mailbox>=<password>,<name>,<email>,<pager_email>,<options>
 ; if the e-mail is specified, a message will be sent when a message is
 ; received, to the given mailbox. If pager is specified, a message will be
@@ -318,6 +286,38 @@
 
 
 [zonemessages]
+; Users may be located in different timezones, or may have different 
+; message announcements for their introductory message when they enter 
+; the voicemail system. Set the message and the timezone each user 
+; hears here. Set the user into one of these zones with the tz= attribute 
+; in the options field of the mailbox. Of course, language substitution 
+; still applies here so you may have several directory trees that have 
+; alternate language choices. 
+; 
+; Look in /usr/share/zoneinfo/ for names of timezones. 
+; Look at the manual page for strftime for a quick tutorial on how the 
+; variable substitution is done on the values below. 
+; 
+; Supported values: 
+; 'filename'    filename of a soundfile (single ticks around the filename
+;               required)
+; ${VAR}        variable substitution 
+; A or a        Day of week (Saturday, Sunday, ...) 
+; B or b or h   Month name (January, February, ...) 
+; d or e        numeric day of month (first, second, ..., thirty-first) 
+; Y             Year 
+; I or l        Hour, 12 hour clock 
+; H             Hour, 24 hour clock (single digit hours preceded by "oh") 
+; k             Hour, 24 hour clock (single digit hours NOT preceded by "oh") 
+; M             Minute, with 00 pronounced as "o'clock" 
+; N             Minute, with 00 pronounced as "hundred" (US military time)
+; P or p        AM or PM 
+; Q             "today", "yesterday" or ABdY
+;               (*note: not standard strftime value) 
+; q             "" (for today), "yesterday", weekday, or ABdY
+;               (*note: not standard strftime value) 
+; R             24 hour time, including minute 
+;
 eastern=America/New_York|'vm-received' Q 'digits/at' IMp
 central=America/Chicago|'vm-received' Q 'digits/at' IMp
 central24=America/Chicago|'vm-received' q 'digits/at' H N 'hours'