aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-20 20:11:47 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-20 20:11:47 +0000
commit3a05c4292a469f7d9f5504acccb7e6580ff2b6b5 (patch)
tree80205553f68ff8d46b72719c691b48814a0b0278 /Makefile
parent2ade9292b2306871b2d42476f15452156f635b6b (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@241629 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 9457482dc..ada85ff49 100644
--- a/Makefile
+++ b/Makefile
@@ -724,11 +724,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" ; \