From: Russell Bryant Date: Fri, 15 Jan 2010 23:06:56 +0000 (+0000) Subject: Merged revisions 240548 via svnmerge from X-Git-Tag: 1.6.0.23~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf86123d01300b5aa18c5e75d55378621eb1e354;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@240549 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 8bf8f3f2f4..efe9ebdde3 100644 --- a/Makefile +++ b/Makefile @@ -681,7 +681,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" ; \