From: David Vossel Date: Wed, 20 Jan 2010 20:13:37 +0000 (+0000) Subject: Merged revisions 241627 via svnmerge from X-Git-Tag: 1.6.0.23~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5b0542f349a4e28c460350fa7b789f94c907f12;p=thirdparty%2Fasterisk.git Merged revisions 241627 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r241627 | dvossel | 2010-01-20 14:01:07 -0600 (Wed, 20 Jan 2010) | 12 lines Merged revisions 241626 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r241626 | dvossel | 2010-01-20 14:00:04 -0600 (Wed, 20 Jan 2010) | 6 lines fixes parsing error in Makefile. Some echo lines were missing "; . Thanks to jparker for pointing out the problem. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@241631 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/Makefile b/Makefile index 609f08f102..7b4f022771 100644 --- a/Makefile +++ b/Makefile @@ -683,11 +683,11 @@ samples: adsi 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 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 ";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" ; \