[svn-commits] lmadsen: branch 1.6.1 r252764 - in /branches/1.6.1: ./ configs/

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Tue Mar 16 13:49:24 2010
New Revision: 252764

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

................
  r252762 | lmadsen | 2010-03-16 13:48:22 -0500 (Tue, 16 Mar 2010) | 15 lines
  
  Merged revisions 252761 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252761 | lmadsen | 2010-03-16 13:46:20 -0500 (Tue, 16 Mar 2010) | 7 lines
    
    Additional extensions.ael global variable fixes.
    
    Fixing up a couple more overlapping global variable namespaces shared with
    extensions.conf.sample. Also noticed a few of the lines that were commented
    out didn't have the closing semi-colon so I added that as well.
    
    (issue #17035)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/extensions.ael.sample

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

Modified: branches/1.6.1/configs/extensions.ael.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/configs/extensions.ael.sample?view=diff&rev=252764&r1=252763&r2=252764
==============================================================================
--- branches/1.6.1/configs/extensions.ael.sample (original)
+++ branches/1.6.1/configs/extensions.ael.sample Tue Mar 16 13:49:24 2010
@@ -27,11 +27,11 @@
 // NOTE! NOTE! NOTE!
 
 globals {
-	CONSOLE="Console/dsp"; 		// Console interface for demo
-	//CONSOLE=DAHDI/1
-	//CONSOLE=Phone/phone0
-	IAXINFO=guest;				// IAXtel username/password
-	//IAXINFO="myuser:mypass";
+	CONSOLE-AEL="Console/dsp"; 		// Console interface for demo
+	//CONSOLE-AEL=Zap/1;
+	//CONSOLE-AEL=Phone/phone0;
+	IAXINFO-AEL=guest;				// IAXtel username/password
+	//IAXINFO-AEL="myuser:mypass";
 	OUTBOUND-TRUNK="Zap/g2";		// Trunk interface
 	//
 	// Note the 'g2' in the OUTBOUND-TRUNK variable above. It specifies which group (defined
@@ -48,7 +48,7 @@
 	//    time (aka. descending rotary hunt group).
 	//
 	OUTBOUND-TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
-	//TRUNK=IAX2/user:pass at provider
+	//OUTBOUND-TRUNK2=IAX2/user:pass at provider;
 };
 
 //
@@ -194,7 +194,7 @@
 // up, please go to www.gnophone.com or www.iaxtel.com
 //
 context ael-iaxtel700 {
-	_91700XXXXXXX => Dial(IAX2/${IAXINFO}@iaxtel.com/${EXTEN:1}@iaxtel);
+	_91700XXXXXXX => Dial(IAX2/${IAXINFO-AEL}@iaxtel.com/${EXTEN:1}@iaxtel);
 };
 
 //