Merged revisions 200477 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r200477 | moy | 2009-06-14 01:13:48 -0500 (Sun, 14 Jun 2009) | 3 lines
  
  added openr2 to menuselect-deps.in, recent commit in menuselect made me realize this was never done but was working anyways
  also added support for skip category request feature of openr2 and updated chan_dahdi.conf.sample
........


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

1 files changed, 20 insertions, 6 deletions

diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 9619b7691..def6cf25c 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -997,8 +997,19 @@ pickupgroup=1
 
 ; ---------------- Options for use with signalling=mfcr2 --------------
 
+; MFC-R2 signaling has lots of variants from country to country and even sometimes
+; minor variants inside the same country. The only mandatory parameters here are:
+; mfcr2_variant, mfcr2_max_ani and mfcr2_max_dnis.
+; IT IS RECOMMENDED that you leave the default values (leaving it commented) for the 
+; other parameters unless you have problems or you have been instructed to change some 
+; parameter. OpenR2 library uses the mfcr2_variant parameter to try to determine the 
+; best defaults for your country, also refer to the OpenR2 package directory 
+; doc/asterisk/ where you can find sample configurations for some countries. If you 
+; want to contribute your configs for a particular country send them to the e-mail 
+; of the primary OpenR2 developer that you can find in the AUTHORS file of the OpenR2 package
+
 ; MFC/R2 variant. This depends on the OpenR2 supported variants
-; A list of values can be found at libopenr2.org
+; A list of values can be found by executing the openr2 command r2test -l
 ; some valid values are:
 ; ar (Argentina)
 ; br (Brazil)
@@ -1007,17 +1018,17 @@ pickupgroup=1
 ; itu (per ITU spec)
 ; mfcr2_variant=mx
 
-; whether or not to get the ANI before getting DNIS.
-; some telcos require ANI first some others do not care
-; if this go wrong, change this value
-; mfcr2_get_ani_first=no
-
 ; Max amount of ANI to ask for
 ; mfcr2_max_ani=10
 
 ; Max amount of DNIS to ask for
 ; mfcr2_max_dnis=4
 
+; whether or not to get the ANI before getting DNIS.
+; some telcos require ANI first some others do not care
+; if this go wrong, change this value
+; mfcr2_get_ani_first=no
+
 ; Caller Category to send
 ; national_subscriber
 ; national_priority_subscriber
@@ -1117,6 +1128,9 @@ pickupgroup=1
 ; or implicitly through the Answer() application. 
 ; mfcr2_accept_on_offer=yes
 
+; Skip request of calling party category and ANI
+; mfcr2_skip_category=no
+
 ; WARNING: advanced users only! I really mean it
 ; this parameter is commented by default because
 ; YOU DON'T NEED IT UNLESS YOU REALLY GROK MFC/R2