Finally merge chan_skinny fixes into trunk.

ready...set...GO!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34696 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/skinny.conf.sample

@@ -2,10 +2,10 @@
 ; Skinny Configuration for Asterisk
 ;
 [general]
-port=2000		; Port to bind to, default tcp/2000
 bindaddr=0.0.0.0	; Address to bind to
-dateFormat=M-D-Y	; M,D,Y in any order (5 chars max)
-keepAlive=120
+bindport=2000		; Port to bind to, default tcp/2000
+dateformat=M-D-Y	; M,D,Y in any order (5 chars max)
+keepalive=120
 
 ;allow=all
 ;disallow=
@@ -41,9 +41,6 @@ keepAlive=120
 ; Typical config for 12SP+
 ;[florian]
 ;device=SEP00D0BA847E6B
-;model=12SP		; Specific model of device, for button templates
-			; Valid models: 12SP, 30VIP, 7910, 7920,
-			; 7935, 7940, 7960, 7970 (so far)
 ;version=P002G204	; Thanks critch
 ;context=did
 ;line => 120		; Dial(Skinny/120@florian)
@@ -51,24 +48,24 @@ keepAlive=120
 
 ; Typical config for a 7910
 ;[duba]			; Device name
-;model=7910		; Device model
 ;device=SEP0007EB463101	; Offical identifier
 ;version=P002F202	; Firmware version identifier
 ;host=192.168.1.144
 ;permit=192.168.0/24	; Optional, used for authentication
-;nat=0
+;nat=yes
 ;callerid="George W. Bush" <202-456-1414>
 ;mailbox=500
-;callwaiting=1
-;transfer=1
-;threewaycalling=1
+;callwaiting=yes
+;transfer=yes
+;threewaycalling=yes
 ;context=default
 ;line => 500		; Dial(Skinny/500@duba)
 
-; Typical config for a 7940 / ATA
+
+; Typical config for a 7940 with dual 7914s
 ;[support]
 ;device=SEP0007EB463121
-;nat=0
+;nat=yes
 ;callerid="Customer Support" <810-234-1212>
 ;mailbox=100
 ;context=inbound
@@ -80,3 +77,7 @@ keepAlive=120
 ;linelabel="John"
 ;mailbox=110
 ;line => 110
+;speeddial => 111,Jack Smith
+;speeddial => 112,Bob Peterson
+;addon => 7914
+;addon => 7914