From 8911aced890b8265652252b76d3f162dcf2052b1 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Mon, 18 Sep 2006 16:02:39 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43181 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_math.c | 3 ++- configs/indications.conf.sample | 1 + configs/zapata.conf.sample | 5 ++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/app_math.c b/apps/app_math.c index f1be8d4d1d..f52385c02a 100644 --- a/apps/app_math.c +++ b/apps/app_math.c @@ -69,7 +69,8 @@ static char *math_descrip = "Perform floating point calculation on number 1 to number 2 and \n" "store the result in returnvar. Valid ops are: \n" " +,-,/,*,%,<,>,>=,<=,==\n" -"and behave as their C equivalents.\n"; +"and behave as their C equivalents.\n" +" This application has been deprecated in favor of the MATH function.\n"; #define ADDFUNCTION 0 #define DIVIDEFUNCTION 1 diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample index c0dcb7864b..acafb157f5 100644 --- a/configs/indications.conf.sample +++ b/configs/indications.conf.sample @@ -420,6 +420,7 @@ 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 stutter = !400/100!0/100,!400/100,!0/100,!400/100,!0/100,!400/100!0/100,!400/100,!0/100,!400/100,!0/100,400 +unobtainable = 400/75,0/100,400/75,0/100,400/75,0/100,400/75,0/400 [pl] description = Poland diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample index cd125140a7..1c75a375ad 100644 --- a/configs/zapata.conf.sample +++ b/configs/zapata.conf.sample @@ -237,7 +237,10 @@ usecallerid=yes ; hidecallerid=no ; -; Whether or not to enable call waiting on FXO lines +; Whether or not to enable call waiting on internal extensions +; With this set to 'yes', busy extensions will hear the call-waiting +; tone, and can use hook-flash to switch between callers. The Dial() +; app will not return the "BUSY" result for extensions. ; callwaiting=yes ; -- 2.47.2