[svn-commits] kpfleming: trunk r40393 - in /trunk: ./ configs/zapata.conf.sample

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Fri Aug 18 14:11:34 2006
New Revision: 40393

URL: http://svn.digium.com/view/asterisk?rev=40393&view=rev
Log:
Merged revisions 40392 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r40392 | kpfleming | 2006-08-18 14:10:51 -0500 (Fri, 18 Aug 2006) | 2 lines

make a feeble attempt to avoid the 'how do I enable my hardware echo canceler' questions

........

Modified:
    trunk/   (props changed)
    trunk/configs/zapata.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/zapata.conf.sample?rev=40393&r1=40392&r2=40393&view=diff
==============================================================================
--- trunk/configs/zapata.conf.sample (original)
+++ trunk/configs/zapata.conf.sample Fri Aug 18 14:11:34 2006
@@ -328,10 +328,17 @@
 ; Use either "yes", "no", or a power of two from 32 to 256 if you wish to
 ; actually set the number of taps of cancellation.
 ;
+; Note that if any of your Zaptel cards have hardware echo cancellers,
+; then this setting only turns them on and off; numeric settings will
+; be treated as "yes". There are no special settings required for
+; hardware echo cancellers; when present and enabled in their kernel
+; modules, they take precedence over the software echo canceller compiled
+; into Zaptel automatically.
+;
 echocancel=yes
 ;
 ; Generally, it is not necessary (and in fact undesirable) to echo cancel when
-; the circuit path is entirely TDM.  You may, however, reverse this behavior
+; the circuit path is entirely TDM.  You may, however, change this behavior
 ; by enabling the echo cancel during pure TDM bridging below.
 ;
 echocancelwhenbridged=yes
@@ -342,6 +349,8 @@
 ; response to pre-train the echo canceller so it can start out with a much
 ; closer idea of the actual echo.  Value may be "yes", "no", or a number of
 ; milliseconds to delay before training (default = 400)
+;
+; Note that these parameters do not apply to hardware echo cancellers.
 ;
 ;echotraining=yes
 ;echotraining=800