From d220c24906819fc40922678865d12f68400bd096 Mon Sep 17 00:00:00 2001 From: rmudgett Date: Tue, 30 Sep 2008 23:55:24 +0000 Subject: channels/chan_misdn.c channels/misdn/isdn_lib.c * Miscellaneous other fixes from trunk to make merging easier later. ........ r145200 | rmudgett | 2008-09-30 16:00:54 -0500 (Tue, 30 Sep 2008) | 7 lines * Miscellaneous formatting changes to make v1.4 and trunk more merge compatible in the mISDN area. channels/chan_misdn.c * Eliminated redundant code in cb_events() EVENT_SETUP ........ r144257 | crichter | 2008-09-24 03:42:55 -0500 (Wed, 24 Sep 2008) | 9 lines improved helptext of misdn_set_opt. ........ r142181 | rmudgett | 2008-09-09 12:30:52 -0500 (Tue, 09 Sep 2008) | 1 line Cleaned up comment ........ r138738 | rmudgett | 2008-08-18 16:07:28 -0500 (Mon, 18 Aug 2008) | 30 lines channels/chan_misdn.c * Made bearer2str() use allowed_bearers_array[] * Made use the causes.h defines instead of hardcoded numbers. * Made use Asterisk presentation indicator values if either of the mISDN presentation or screen options are negative. * Updated the misdn_set_opt application option descriptions. * Renamed the awkward Caller ID presentation misdn_set_opt application option value not_screened to restricted. Deprecated the not_screened option value. channels/misdn/isdn_lib.c * Made use the causes.h defines instead of hardcoded numbers. * Fixed some spelling errors and typos. * Added all defined facility code strings to fac2str(). channels/misdn/isdn_lib.h * Added doxygen comments to struct misdn_bchannel. channels/misdn/isdn_lib_intern.h * Added doxygen comments to struct misdn_stack. channels/misdn_config.c configs/misdn.conf.sample * Updated the mISDN presentation and screen parameter descriptions. doc/misdn.txt (doc/tex/misdn.tex) * Updated the misdn_set_opt application option descriptions. * Fixed some spelling errors and typos. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@145293 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/misdn.conf.sample | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configs/misdn.conf.sample') diff --git a/configs/misdn.conf.sample b/configs/misdn.conf.sample index a8e92b271..bc11ef252 100644 --- a/configs/misdn.conf.sample +++ b/configs/misdn.conf.sample @@ -345,10 +345,10 @@ nodialtone=no ; ; these are the exact isdn screening and presentation indicators -; if -1 is given for both values the presentation indicators are used +; if -1 is given for either value the presentation indicators are used ; from asterisks SetCallerPres application. -; s=0, p=0 -> callerid presented not screened -; s=1, p=1 -> callerid presented but screened (the remote end does not see it!) +; s=0, p=0 -> callerid presented +; s=1, p=1 -> callerid restricted (the remote end does not see it!) ; ; default values s=-1, p=-1 presentation=-1 -- cgit v1.2.3