diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-15 23:07:20 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-15 23:07:20 +0000 |
| commit | 45a911a6d70fea3103e4c04ef428eb1377c673d1 (patch) | |
| tree | c372c39d4953587e7e7fac1363d60ac7f9a9d39d /Makefile | |
| parent | 916ab2d7d2110d6203f3abfc6c3b0a52211b988a (diff) | |
Merged revisions 240548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r240548 | russell | 2010-01-15 17:06:32 -0600 (Fri, 15 Jan 2010) | 9 lines
Merged revisions 240547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r240547 | russell | 2010-01-15 17:06:11 -0600 (Fri, 15 Jan 2010) | 2 lines
Fix a spelling error in the asterisk.conf sample.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@240550 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -683,7 +683,7 @@ samples: adsi echo ";maxfiles = 1000 ; Maximum amount of openfiles" ; \ echo ";minmemfree = 1 ; in MBs, Asterisk stops accepting new calls if the amount of free memory falls below this watermark" ; \ echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \ - echo ";record_cache_dir = /tmp ; Specify cache directory (used in cnjunction with cache_record_files)" ; \ + echo ";record_cache_dir = /tmp ; Specify cache directory (used in conjunction with cache_record_files)" ; \ echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is waiting, being recorded, or DTMF is being generated" ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ |