Goodbye Zaptel, hello DAHDI. Removes Zaptel driver support with DAHDI. Configuration file and dialplan backwards compatability has been put in place where appropiate. Release announcement to follow.

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123332 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 8 insertions, 8 deletions

diff --git a/configs/extensions.ael.sample b/configs/extensions.ael.sample
index 3bc16a315..21680a4db 100644
--- a/configs/extensions.ael.sample
+++ b/configs/extensions.ael.sample
@@ -20,19 +20,19 @@
 
 globals {
 	CONSOLE="Console/dsp"; 		// Console interface for demo
-	//CONSOLE=Zap/1
+	//CONSOLE=DAHDI/1
 	//CONSOLE=Phone/phone0
 	IAXINFO=guest;				// IAXtel username/password
 	//IAXINFO="myuser:mypass";
-	TRUNK="Zap/G2";					// Trunk interface
+	TRUNK="DAHDI/G2";					// Trunk interface
 	//
 	// Note the 'G2' in the TRUNK variable above. It specifies which group (defined
-	// in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in
+	// in 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:
 	//
-	// g: select the lowest-numbered non-busy Zap channel
+	// g: select the lowest-numbered non-busy DAHDI channel
 	//    (aka. ascending sequential hunt group).
-	// G: select the highest-numbered non-busy Zap channel
+	// G: select the highest-numbered non-busy DAHDI channel
 	//    (aka. descending sequential hunt group).
 	// r: use a round-robin search, starting at the next highest channel than last
 	//    time (aka. ascending rotary hunt group).
@@ -129,8 +129,8 @@ context ael-dundi-e164-via-pstn {
 	//
 	// If you are freely delivering calls to the PSTN, list them here
 	//
-	//_1256428XXXX => Dial(Zap/G2/${EXTEN:7}); // Expose all of 256-428 
-	//_1256325XXXX => Dial(Zap/G2/${EXTEN:7}); // Ditto for 256-325
+	//_1256428XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Expose all of 256-428 
+	//_1256325XXXX => Dial(DAHDI/G2/${EXTEN:7}); // Ditto for 256-325
 };
 
 context ael-dundi-e164-local {
@@ -418,7 +418,7 @@ context ael-default {
 // 6389 => Dial(MGCP/aaln/1@192.168.0.14);
 // 6394 => Dial(Local/6275/n);                    // this will dial ${MARK}
 
-// 6275 => &ael-stdexten(6275,${MARK});           // assuming ${MARK} is something like Zap/2
+// 6275 => &ael-stdexten(6275,${MARK});           // assuming ${MARK} is something like DAHDI/2
 // mark => goto 6275|1;                          // alias mark to 6275
 // 6536 => &ael-stdexten(6236,${WIL});            // Ditto for wil
 // wil  => goto 6236|1;