diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-18 16:02:39 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-18 16:02:39 +0000 |
| commit | e9b5c737244b6e10b0f529c4045d1683dac6656c (patch) | |
| tree | e648f6cf1c4ad592c1fbaf757eb8dc5f71a62ec1 /configs | |
| parent | 651421500c5a016f6351b19f3e331d36baf3f13c (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43181 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/indications.conf.sample | 1 | ||||
| -rw-r--r-- | configs/zapata.conf.sample | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample index c0dcb7864..acafb157f 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 cd125140a..1c75a375a 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 ; |