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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@252764 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 25bce30d5d679223c79a5c53e5ec9e160b727b27..fc74aab4c0bd67c4fd6473efec0adf8de181e4f0 100644 (file)
--- 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);
 };
 
 //