[asterisk-commits] jrose: trunk r329711 - in /trunk: ./ configs/indications.conf.sample

[SVN commits to the Asterisk project]

Author: jrose
Date: Wed Jul 27 13:12:14 2011
New Revision: 329711

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329711
Log:
Merged revisions 329710 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329710 | jrose | 2011-07-27 13:11:07 -0500 (Wed, 27 Jul 2011) | 14 lines
  
  Merged revisions 329709 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329709 | jrose | 2011-07-27 13:10:30 -0500 (Wed, 27 Jul 2011) | 8 lines
    
    Fix New Zealand indications profile based on http://www.telepermit.co.nz/TNA102.pdf
    
    (closes issue ASTERISK-16263)
    Reported by: richardf
    Patches: 
          nz-indications.patch uploaded by richardf (License #6015)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/indications.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-merged (original)
+++ branch-10-merged Wed Jul 27 13:12:14 2011
@@ -1,1 +1,1 @@
-/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528,329538,329614,329670
+/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528,329538,329614,329670,329710

Modified: trunk/configs/indications.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/indications.conf.sample?view=diff&rev=329711&r1=329710&r2=329711
==============================================================================
--- trunk/configs/indications.conf.sample (original)
+++ trunk/configs/indications.conf.sample Wed Jul 27 13:12:14 2011
@@ -469,13 +469,12 @@
 
 [nz]
 description = New Zealand
-;NOTE - the ITU has different tonesets for NZ, but according to some residents there,
-;      this is, indeed, the correct way to do it.
+; Reference = http://www.telepermit.co.nz/TNA102.pdf
 ringcadence = 400,200,400,2000
 dial = 400
-busy = 400/250,0/250
+busy = 400/500,0/500
 ring = 400+450/400,0/200,400+450/400,0/2000
-congestion = 400/375,0/375
+congestion = 400/250,0/250
 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