From 6bb35e43366d9ad81f64086dff0ec96b4a22b607 Mon Sep 17 00:00:00 2001
From: lmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Tue, 16 Mar 2010 18:49:24 +0000
Subject: 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)
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@252764 f38db490-d61c-443f-a65b-d21fe96a405b
---
 configs/extensions.ael.sample | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 25bce30d5..fc74aab4c 100644
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -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 @@ globals {
 	//    time (aka. descending rotary hunt group).
 	//
 	OUTBOUND-TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
-	//TRUNK=IAX2/user:pass@provider
+	//OUTBOUND-TRUNK2=IAX2/user:pass@provider;
 };
 
 //
@@ -194,7 +194,7 @@ macro ael-dundi-e164(exten) {
 // 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);
 };
 
 //
-- 
cgit v1.2.3