update indications to be current with cvs head (inspired by bug #4440)

git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@5905 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 174 insertions, 32 deletions

diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample
index 7875e3257..7298a3612 100755
--- a/configs/indications.conf.sample
+++ b/configs/indications.conf.sample
@@ -1,14 +1,14 @@
+; indications.conf
+; Configuration file for location specific tone indications
+; used by the pbx_indications module.
 ;
-; Static indications configuration files, used by
-; the pbx_indications module.
+; The [general] category is for certain global variables.
+; All other categories are interpreted as location specific indications
 ;
-; The "general" category is for certain variables.  All other categories
-; are interpreted as indication countries
-;
-; Please note that there are NOT spaces allowed in lists!
 ;
 [general]
-country=us
+country=us		; default location
+
 
 ; [example]
 ; description = string
@@ -23,28 +23,36 @@ country=us
 ; busy = tonelist
 ;      Set of tones played when the receiving end is busy.
 ; congestion = tonelist
-;      Set of tones played when the is some congestion (on the network?)
+;      Set of tones played when there is some congestion (on the network?)
 ; callwaiting = tonelist
-;      Set of tones played when there is a callwaiting in the background.
+;      Set of tones played when there is a call waiting in the background.
 ; dialrecall = tonelist
-;      Set of tones played when there is somebody ???
+;      Not well defined, many phone systems play a recall dial tone after hook flash
 ; record = tonelist
-;      Set of tones played whenver we feel like it ???
+;      Set of tones played when call recording is in progress
 ; info = tonelist
-;      Set of tones played when information is to be tranfered?
-; every other variable will be available as a shortcut for the "PlayList" command
-; but will not automaticly be used by Asterisk.
+;      Set of tones played with special information messages (e.g., "number is out of service")
+; 'name' = tonelist
+;	Every other variable will be available as a shortcut for the "PlayList" command
+;	but will not automaticly be used by Asterisk.
+;
 ;
-; The tonelist itself is defined by a sequence of elements, separated by ,'s.
-; Each element consist of a frequency (f) with a possible frequency attached
-; (f1+f2) to it. Behind the frequency there is an optional duration, in
-; milliseconds. If the element starts with a !, that element is NOT repeat,
-; so only if all elements start with !, the tonelist is time-limited, all
-; others will repeat indefinitly.
+; The tonelist itself is defined by a comma-separated sequence of elements.
+; Each element consist of a frequency (f) with an optional duration (in ms)
+; attached to it (f/duration). The frequency component may be a mixture of two
+; frequencies (f1+f2) or a frequency modulated by another frequency (f1*f2).
+; The implicit modulation depth is fixed at 90%, though.
+; If the list element starts with a !, that element is NOT repeated,
+; therefore, only if all elements start with !, the tonelist is time-limited,
+; all others will repeat indefinitely.
 ;
-; In tech-talk:
+; concisely:
+;   element = [!]freq[+|*freq2][/duration]
 ;   tonelist = element[,element]*
-;   element = [!]freq[+freq2][/duration]
+;
+; Please note that SPACES ARE NOT ALLOWED in tone lists!
+;
+
 
 ; Tone definitions for Chile
 ; According to specs from Telefonica CTC Chile
@@ -61,7 +69,6 @@ record = 1400/500,0/15000
 info = 950/333,1400/333,1800/333,0/1000
 
 [tw]
-; 參考資料 :
 ; http://nemesis.lonestar.org/reference/telecom/signaling/dialtone.html
 ; http://nemesis.lonestar.org/reference/telecom/signaling/busy.html
 ; http://www.iproducts.com.tw/ee/kylink/06ky-1000a.htm
@@ -69,14 +76,11 @@ info = 950/333,1400/333,1800/333,0/1000
 ; http://www.nettwerked.net/tones.txt
 ; http://www.cisco.com/univercd/cc/td/doc/product/tel_pswt/vco_prod/taiw_sup/taiw2.htm
 ;
-; 詢問中華電信後得到的回覆 :
-; dial tone 350+440Hz continuous
 ; busy tone 480+620Hz 0.5 sec. on ,0.5 sec. off
 ; reorder tone 480+620Hz 0.25 sec. on,0.25 sec. off
 ; ringing tone 440+480Hz 1 sec. on ,2 sec. off
 ;
 description = Taiwan
-alias = tw
 ringcadance = 1000,4000
 dial = 350+440
 busy = 480+620/500,0/500
@@ -181,15 +185,36 @@ info = 950/330,1400/330,1800/330,0/1000
 [uk]
 description = United Kingdom
 ringcadance = 400,200,400,2000
+; These are the official tones taken from BT SIN350. The actual tones
+; used by BT include some volume differences so sound slightly different
+; from Asterisk-generated ones.
 dial = 350+440
+; Special dial is the intermittent dial tone heard when, for example,
+; you have a divert active on the line
+specialdial = 350+440/750,440/750
+; Busy is also called "Engaged"
 busy = 400/375,0/375
-ring = 400+450/400,0/200,400+450/400,0/2000
+; "Congestion" is the Beep-bip engaged tone
 congestion = 400/400,0/350,400/225,0/525
-callwaiting = 440/100,0/4000
-dialrecall = 350+440
-; XXX Not sure about the RECORDTONE
-record = 1400/500,0/10000
-info = 950/330,1400/330,1800/330
+; "Special Congestion" is not used by BT very often if at all
+specialcongestion = 400/200,1004/300
+unobtainable = 400
+ring = 400+450/400,0/200,400+450/400,0/2000
+callwaiting = 400/100,0/4000
+; BT seem to use "Special Call Waiting" rather than just "Call Waiting" tones
+specialcallwaiting = 400/250,0/250,400/250,0/250,400/250,0/5000
+; "Pips" used by BT on payphones. (Souds wrong, but this is what BT claim it
+; is and I've not used a payphone for years)
+creditexpired = 400/125,0/125
+; These two are used to confirm/reject service requests on exchanges that
+; don't do voice announcements.
+confirm = 1400
+switching = 400/200,0/400,400/2000,0/400
+; This is the three rising tones Doo-dah-dee "Special Information Tone",
+; usually followed by the BT woman saying an appropriate message.
+info = 950/330,0/15,1400/330,0/15,1800/330,0/1000
+; Not listed in SIN350
+record = 1400/500,0/60000
 
 [fi]
 description = Finland
@@ -317,3 +342,120 @@ callwaiting = !400/200,!0/3000,!400/200,!0/3000,!400/200,!0/3000,!400/200
 dialrecall = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,400
 record = 1400/425,0/15000
 info = 400/750,0/100,400/750,0/100,400/750,0/100,400/750,0/400
+
+; Singapore
+; Reference: http://www.ida.gov.sg/idaweb/doc/download/I397/ida_ts_pstn1_i4r2.pdf 
+; Frequency specs are:   425 Hz +/- 20Hz; 24 Hz +/- 2Hz; modulation depth 100%; SIT +/- 50Hz
+[sg]
+description = Singapore
+ringcadence = 400,200,400,2000
+dial       = 425
+ring       = 425*24/400,0/200,425*24/400,0/2000	; modulation should be 100%, not 90%
+busy       = 425/750,0/750
+congestion = 425/250,0/250
+callwaiting= 425*24/300,0/200,425*24/300,0/3200
+stutter    = !425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,!425/200,!0/200,!425/600,!0/200,425
+info       = 950/330,1400/330,1800/330,0/1000	; not currently in use acc. to reference
+dialrecall = 425*24/500,0/500,425/500,0/2500	; unspecified in IDA reference, use repeating Holding Tone A,B
+record     = 1400/500,0/15000			; unspecified in IDA reference, use 0.5s tone every 15s
+; additionally defined in reference
+nutone     = 425/2500,0/500
+intrusion  = 425/250,0/2000
+warning    = 425/624,0/4376			; end of period tone, warning
+acceptance = 425/125,0/125
+holdinga   = !425*24/500,!0/500			; followed by holdingb
+holdingb   = !425/500,!0/2500
+
+[hu]
+description = Hungary
+ringcadance = 1000,4000
+dial = 425
+busy = 425/300,0/300
+ring = 425/1250,0/3750
+congestion = 425/300,0/300
+callwaiting = 425/40,0/1960
+; Dialrecall not used in Hungary, use standard (using UK standard)
+dialrecall = 350+440
+; Record tone is not used in Hungary, use busy tone
+record = 425/250,0/250
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+
+[lt]
+description = Lithuania
+ringcadence = 1000,4000
+dial = 425
+busy = 425/350,0/350
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 425/150,0/150,425/150,0/4000
+; XXX I'm making up the dialrecall tone XXX
+dialrecall = 425/500,0/50
+; XXX I'm making up the record tone XXX
+record = 1400/500,0/15000
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0
+
+[pl]
+description = Poland
+ringcadence = 1000,4000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/500,0/500
+callwaiting = 425/150,0/150,425/150,0/4000
+; DIALRECALL - not specified
+dialrecall = 425/500,0/50
+; RECORDTONE - not specified
+record = 1400/500,0/15000
+; 950/1400/1800 3x0.33 on 1.0 off  repeated 3 times 
+info = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000
+
+
+[pt]
+description = Portugal
+ringcadance = 1000,5000
+dial = 425
+busy = 425/500,0/500
+ring = 425/1000,0/5000
+congestion = 425/200,0/200
+callwaiting = 440/300,0/10000
+dialrecall = 425/1000,0/200
+record = 1400/500,0/15000
+info = 950/330,1400/330,1800/330,0/1000
+
+[ee]
+description = Estonia
+ringcadance = 1000,4000
+dial = 425
+busy = 425/300,0/300
+ring = 425/1000,0/4000
+congestion = 425/200,0/200
+callwaiting = 950/650,0/325,950/325,0/30,1400/1300,0/2600
+dialrecall = 425/650,0/25
+record = 1400/500,0/15000
+info = 950/650,0/325,950/325,0/30,1400/1300,0/2600
+
+[mx]
+description = Mexico
+ringcadance = 2000,4000
+dial = 425
+busy = 425/250,0/250
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 425/200,0/600,425/200,0/10000
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+record = 1400/500,0/15000
+info = 950/330,0/30,1400/330,0/30,1800/330,0/1000
+
+[se]
+description = Sweden
+ringcadance = 1000,5000
+dial = 425
+busy = 425/250,0/250
+ring = 425/1000,0/5000
+congestion = 425/250,0/750
+callwaiting = 425/200,0/500,425/200,0/9100
+dialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+record = 1400/500,0/15000
+info = !950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,0
+stutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425
+; stutter = 425/320,0/20        ; Real swedish standard, not used for now