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

@@ -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

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

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
 ;