Merged revisions 226384 via svnmerge from

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

................
  r226384 | lmadsen | 2009-10-28 15:11:07 -0500 (Wed, 28 Oct 2009) | 17 lines
  
  Merged revisions 226382 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r226382 | lmadsen | 2009-10-28 15:06:13 -0500 (Wed, 28 Oct 2009) | 9 lines
    
    Update documentation in sip.conf.sample.
    
    Update the documentation in sip.conf.sample in order to make it more clear
    that directmedia/canreinvite do not cause Asterisk to ignore reINVITEs. It
    is only used to stop Asterisk from generating a reINVITE, but does not stop
    it from accepting them if necessary.
    
    (closes issue #15644)
    Reported by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@226385 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/sip.conf.sample

@@ -664,6 +664,13 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
                                 ; callers INVITE. This will also fail if directmedia is enabled when
                                 ; the device is actually behind NAT.
 
+                                ; Additionally this option does not disable all reINVITE operations.
+                                ; It only controls Asterisk generating reINVITEs for the specific
+                                ; purpose of setting up a direct media path. If a reINVITE is
+                                ; needed to switch a media stream to inactive (when placed on
+                                ; hold) or to T.38, it will still be done, regardless of this 
+                                ; setting.
+
 ;directmedia=nonat              ; An additional option is to allow media path redirection
                                 ; (reinvite) but only when the peer where the media is being
                                 ; sent is known to not be behind a NAT (as the RTP core can