aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-15 23:06:56 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-15 23:06:56 +0000
commitdd92aff04681aae8653757dddfa855fac8070ce7 (patch)
tree7c736c5e6b1783d0585fc6ad19d408c6b47f3fbf
parent7f2b08dabf46749e87e4c404fc654a7ca05adbf4 (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.0@240549 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8bf8f3f2f..efe9ebdde 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" ; \