[svn-commits] dvossel: branch 1.6.1 r240889 - in /branches/1.6.1: ./ Makefile

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Jan 18 10:46:21 2010
New Revision: 240889

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240889
Log:
Merged revisions 240887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r240887 | dvossel | 2010-01-18 10:45:28 -0600 (Mon, 18 Jan 2010) | 7 lines
  
  updated transmit_silence option documentation in asterisk.conf
  
  This patch updates the transmit_silence option to better document
  why the option exists, and what it affects.  Thanks to russell
  for providing the verbage for this update.
........

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

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

Modified: branches/1.6.1/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/Makefile?view=diff&rev=240889&r1=240888&r2=240889
==============================================================================
--- branches/1.6.1/Makefile (original)
+++ branches/1.6.1/Makefile Mon Jan 18 10:46:21 2010
@@ -685,7 +685,11 @@
 		echo ";cache_record_files = yes ; Cache recorded sound files to another directory during recording" ; \
 		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 ";transmit_silence = yes ; Transmit silence while a channel is in a waiting state, a recording only state, or when DTMF is \
+		echo "                        ; being generated.  Note that the silence internally is generated in raw signed linear format. \
+		echo "                        ; This means that it must be transcoded into the native format of the channel before it can be sent \
+		echo "                        ; to the device.  It is for this reason that this is optional, as it may result in requiring a \
+		echo "                        ; temporary codec translation path for a channel that may not otherwise require one. \
 		echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \