[svn-commits] tilghman: branch 1.6.0 r173111 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Feb  2 18:26:08 2009
New Revision: 173111

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

................
  r173104 | tilghman | 2009-02-02 18:24:52 -0600 (Mon, 02 Feb 2009) | 12 lines
  
  Merged revisions 173070 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173070 | tilghman | 2009-02-02 18:15:59 -0600 (Mon, 02 Feb 2009) | 5 lines
    
    Add warning to standard config, that globals may be overridden by other
    dialplan configuration files.
    (closes issue #14388)
     Reported by: macli
  ........
................

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

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

Modified: branches/1.6.0/configs/extensions.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/extensions.conf.sample?view=diff&rev=173111&r1=173110&r2=173111
==============================================================================
--- branches/1.6.0/configs/extensions.conf.sample (original)
+++ branches/1.6.0/configs/extensions.conf.sample Mon Feb  2 18:26:08 2009
@@ -137,7 +137,13 @@
 ;
 TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
 ;TRUNK=IAX2/user:pass at provider
-
+;
+; WARNING WARNING WARNING WARNING
+; If you load any other extension configuration engine, such as pbx_ael.so,
+; your global variables may be overridden by that file.  Please take care to
+; use only one location to set global variables, and you will likely save
+; yourself a ton of grief.
+; WARNING WARNING WARNING WARNING
 ;
 ; Any category other than "General" and "Globals" represent 
 ; extension contexts, which are collections of extensions.