aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-29 22:05:22 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-29 22:05:22 +0000
commit1fa8fbb23ce6e313190f4142ffd00e19e826e31d (patch)
treefbdaca9c8e51566f086cf560d4730aa73b7ac8d0 /configs
parentbdd767089a44d908c9c0b7db1b9e850c948ca206 (diff)
Merged revisions 172400 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r172400 | rmudgett | 2009-01-29 14:38:34 -0600 (Thu, 29 Jan 2009) | 12 lines channels/chan_dahdi.c * Added doxygen comments to the major dahdi structures. * Fixed PRI and SS7 using an incorrect string value if the extension delimiter is not present in the Dial() function. * Fixed SS7 not checking if the dialed extension is at least as long as the stripmsd option. * Fixed PRI not handling unknown TON/NPI prefix letters correctly. * Fixed some uninitialized string variables on FXS ports. configs/chan_dahdi.conf.sample * Updated some documentation. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172435 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/chan_dahdi.conf.sample8
1 files changed, 5 insertions, 3 deletions
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index b07a83a79..c78229f09 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -388,12 +388,14 @@ callwaiting=yes
; Whether or not restrict outgoing caller ID (will be sent as ANI only, not
; available for the user)
; Mostly use with FXS ports
+; Does nothing. Use hidecallerid instead.
;
;restrictcid=no
;
-; Whether or not use the caller ID presentation for the outgoing call that the
-; calling switch is sending.
-; See README.callingpres. FIXME: file no longer exists.
+; Whether or not to use the caller ID presentation from the Asterisk channel
+; for outgoing calls.
+; See dialplan function CALLERID(pres) for more information.
+; Only applies to PRI and SS7 channels.
;
usecallingpres=yes
;