[asterisk-commits] lmadsen: trunk r291287 - in /trunk: ./ configs/phoneprov.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Tue Oct 12 12:21:15 2010
New Revision: 291287

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=291287
Log:
Merged revisions 291284 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291284 | lmadsen | 2010-10-12 12:20:43 -0500 (Tue, 12 Oct 2010) | 15 lines
  
  Merged revisions 291280 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r291280 | lmadsen | 2010-10-12 12:20:02 -0500 (Tue, 12 Oct 2010) | 7 lines
    
    Add undocumented variables to phoneprov.conf.sample
    
    
    (closes issue #18107)
    Reported by: lathama
    Patches:
          phoneprov.conf.sample.diff uploaded by lathama (license 1028)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/phoneprov.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/phoneprov.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/phoneprov.conf.sample?view=diff&rev=291287&r1=291286&r2=291287
==============================================================================
--- trunk/configs/phoneprov.conf.sample (original)
+++ trunk/configs/phoneprov.conf.sample Tue Oct 12 12:21:15 2010
@@ -36,10 +36,24 @@
 ;   CALLERID (cid_number)
 ;   VOCIEMAIL_EXTEN (vmexten)
 ;   EXTENSION_LENGTH (localextenlength)
+;   LINE
+;   LINEKEYS
 
 ; Built-in variables and the options in phoneprov.conf that they come from
 ;   SERVER (server)
 ;   SERVER_PORT (serverport)
+
+
+; Built-in variables for managing timezones and daylight savings time.
+;   TZOFFSET
+;   DST_ENABLE
+;   DST_START_MONTH
+;   DST_START_MDAY
+;   DST_START_HOUR
+;   DST_END_MONTH
+;   DST_END_MDAY
+;   DST_END_HOUR
+;   TIMEZONE
 
 [polycom]
 staticdir => configs/ ; Sub directory of AST_DATA_DIR/phoneprov that static files reside