[asterisk-commits] lmadsen: branch 1.4 r252532 - in /branches/1.4: ./ configs/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Mar 15 15:46:47 2010
New Revision: 252532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=252532
Log:
Revert last commit that had bad changed to configure.

Modified:
    branches/1.4/configs/extensions.ael.sample
    branches/1.4/configure

Modified: branches/1.4/configs/extensions.ael.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/configs/extensions.ael.sample?view=diff&rev=252532&r1=252531&r2=252532
==============================================================================
--- branches/1.4/configs/extensions.ael.sample (original)
+++ branches/1.4/configs/extensions.ael.sample Mon Mar 15 15:46:47 2010
@@ -18,23 +18,15 @@
 // function: ${ENV(VARIABLE)}
 //
 
-// NOTE! NOTE! NOTE!
-// Asterisk by default will load both extensions.conf and extensions.ael files.
-// Upon loading these files the dialplans generated from both with be merged,
-// so you must make sure that you don't have any overlapping contexts or global
-// variables. If you do, then unexpected behavior may result when the data is
-// merged.
-// NOTE! NOTE! NOTE!
-
 globals {
 	CONSOLE="Console/dsp"; 		// Console interface for demo
 	//CONSOLE=Zap/1
 	//CONSOLE=Phone/phone0
 	IAXINFO=guest;				// IAXtel username/password
 	//IAXINFO="myuser:mypass";
-	OUTBOUND-TRUNK="Zap/g2";		// Trunk interface
-	//
-	// Note the 'g2' in the OUTBOUND-TRUNK variable above. It specifies which group (defined
+	TRUNK="Zap/g2";					// Trunk interface
+	//
+	// Note the 'g2' in the TRUNK variable above. It specifies which group (defined
 	// in chan_dahdi.conf) to dial, i.e. group 2, and how to choose a channel to use in
 	// the specified group. The four possible options are:
 	//
@@ -47,7 +39,7 @@
 	// R: use a round-robin search, starting at the next lowest channel than last
 	//    time (aka. descending rotary hunt group).
 	//
-	OUTBOUND-TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
+	TRUNKMSD=1;					// MSD digits to strip (usually 1 or 0)
 	//TRUNK=IAX2/user:pass at provider
 };
 
@@ -218,7 +210,7 @@
 	};
 	_9011. => {
 		&ael-dundi-e164(${EXTEN:4});
-		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
 	};
 };
 
@@ -231,7 +223,7 @@
 	};
 	_91NXXNXXXXXX => {
 		&ael-dundi-e164(${EXTEN:1});
-		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
 	};
 };
 
@@ -240,7 +232,7 @@
 	// Local seven-digit dialing accessed through trunk interface
 	//
 	_9NXXXXXX => {
-		Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+		Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
 	};
 };
 
@@ -249,10 +241,10 @@
 	// Long distance context accessed through trunk interface
 	//
 	
-	_91800NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
-	_91888NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
-	_91877NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
-	_91866NXXXXXX => Dial(${OUTBOUND-TRUNK}/${EXTEN:${OUTBOUND-TRUNKMSD}});
+	_91800NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+	_91888NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+	_91877NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
+	_91866NXXXXXX => Dial(${TRUNK}/${EXTEN:${TRUNKMSD}});
 };
 
 context ael-international {