Merged revisions 234008 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r234008 | russell | 2009-12-09 17:13:28 -0600 (Wed, 09 Dec 2009) | 5 lines
  
  Fix up the faxdetect entry in CHANGES.
  
  This feature was listed as a 1.6.2 feature, even though it's in all 1.6.X
  versions.  The description of the feature was also no longer accurate.
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@234012 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 3 deletions

diff --git a/CHANGES b/CHANGES
index cdbe7b242..37c4efa6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,9 +25,6 @@ SIP Changes
    remote services. For backwards compatibility, "secret" still has the
    same function as before, but now you can configure both a remote secret and a
    local secret for mutual authentication.
- * Added a new 'faxdetect=yes|no' configuration option to sip.conf.  When this
-   option is enabled, a SIP channel will go to the fax extension (if it exists)
-   after T38 is negotiated.  This option is disabled by default.
  * If the channel variable  ATTENDED_TRANSFER_COMPLETE_SOUND is set, 
    the sound will be played to the target of an attended transfer
  * Added two new configuration options, "qualifygap" and "qualifypeers", which allow
@@ -530,6 +527,10 @@ CLI Changes
 
 SIP changes
 -----------
+ * Added a new 'faxdetect=yes|no' configuration option to sip.conf.  When this
+    option is enabled, Asterisk will watch for a CNG tone in the incoming audio
+    for a received call.  If it is detected, the channel will jump to the 
+    'fax' extension in the dialplan.
   * Improved NAT and STUN support.
      chan_sip now can use port numbers in bindaddr, externip and externhost
      options, as well as contact a STUN server to detect its external address