[asterisk-commits] russell: branch 1.6.0 r240549 - in /branches/1.6.0: ./ Makefile

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jan 15 17:06:56 2010
New Revision: 240549

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240549
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/Makefile?view=diff&rev=240549&r1=240548&r2=240549
==============================================================================
--- branches/1.6.0/Makefile (original)
+++ branches/1.6.0/Makefile Fri Jan 15 17:06:56 2010
@@ -681,7 +681,7 @@
 		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" ; \