Merged revisions 152216,152287,152369,152467,152569,152605 via svnmerge from

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

................
  r152216 | tilghman | 2008-10-27 16:34:04 -0500 (Mon, 27 Oct 2008) | 13 lines
  
  Merged revisions 152215 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152215 | tilghman | 2008-10-27 16:32:00 -0500 (Mon, 27 Oct 2008) | 6 lines
    
    Inherit ALL elements of CallerID across a local channel.
    (closes issue #13368)
     Reported by: Peter Schlaile
     Patches: 
           20080826__bug13368.diff.txt uploaded by Corydon76 (license 14)
  ........
................
  r152287 | jpeeler | 2008-10-27 18:31:39 -0500 (Mon, 27 Oct 2008) | 10 lines
  
  Merged revisions 152286 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152286 | jpeeler | 2008-10-27 18:28:49 -0500 (Mon, 27 Oct 2008) | 2 lines
  
  Buffer policy setting for half is not needed.
  
  ........
................
  r152369 | tilghman | 2008-10-28 12:07:39 -0500 (Tue, 28 Oct 2008) | 15 lines
  
  Merged revisions 152368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152368 | tilghman | 2008-10-28 12:04:56 -0500 (Tue, 28 Oct 2008) | 8 lines
    
    Reset all DIAL variables back to blank, in case Dial is called multiple times
    per call (which could otherwise lead to inconsistent status reports).
    (closes issue #13216)
     Reported by: ruddy
     Patches: 
           20081014__bug13216.diff.txt uploaded by Corydon76 (license 14)
     Tested by: ruddy
  ........
................
  r152467 | tilghman | 2008-10-28 17:33:40 -0500 (Tue, 28 Oct 2008) | 10 lines
  
  Merged revisions 152463 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r152463 | tilghman | 2008-10-28 17:32:34 -0500 (Tue, 28 Oct 2008) | 3 lines
    
    Quoting in the wrong direction
    (Fixes AST-107)
  ........
................
  r152569 | russell | 2008-10-29 00:34:26 -0500 (Wed, 29 Oct 2008) | 15 lines
  
  Merged revisions 152539 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152539 | russell | 2008-10-29 00:23:51 -0500 (Wed, 29 Oct 2008) | 7 lines
  
  Fix an incorrect usage of sizeof()
  
  (closes issue #13795)
  Reported by: andrew53
  Patches:
  	chan_sip_sizeof.patch uploaded by andrew53 (license 519)
  
  ........
................
  r152605 | murf | 2008-10-29 00:47:13 -0500 (Wed, 29 Oct 2008) | 22 lines
  
  Merged revisions 152538 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r152538 | murf | 2008-10-28 23:19:04 -0600 (Tue, 28 Oct 2008) | 14 lines
  
  A little documentation cross-ref between features and
  dial and queue... I wasted some time (stupidly) trying
  to get the one-touch parking stuff working, because it
  didn't occur to me that I had to also have the corresponding
  options in the dial command! Duh! (In all this time, I never
  set this up before!)
  So, to keep some poor fool from suffering the same fate,
  I made the features.conf.sample file mention the corresponding
  opts in dial/queue; and the docs for dial/app specifically
  mention the corresponding decls in the feature.conf file.
  
  I hope this doesn't spoil some vast, eternal plan...
  
  
  ........
................


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

1 files changed, 6 insertions, 6 deletions

diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index b3dd4d549..0516160cd 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -50,12 +50,12 @@ parkpos => 701-720		; What extensions to park calls on. These needs to be
 ; chan_local in combination with Answer to accomplish it.
 
 [featuremap]
-;blindxfer => #1		; Blind transfer  (default is #)
-;disconnect => *0		; Disconnect  (default is *)
-;automon => *1			; One Touch Record a.k.a. Touch Monitor
-;atxfer => *2			; Attended transfer
-;parkcall => #72                ; Park call (one step parking)
-;automixmon => *3		; One Touch Record a.k.a. Touch MixMonitor
+;blindxfer => #1		; Blind transfer  (default is #) -- Make sure to set the T and/or t option in the Dial() or Queue() app call!
+;disconnect => *0		; Disconnect  (default is *) -- Make sure to set the H and/or h option in the Dial() or Queue() app call!
+;automon => *1			; One Touch Record a.k.a. Touch Monitor -- Make sure to set the W and/or w option in the Dial() or Queue() app call!
+;atxfer => *2			; Attended transfer  -- Make sure to set the T and/or t option in the Dial() or Queue()  app call!
+;parkcall => #72        ; Park call (one step parking)  -- Make sure to set the K and/or K option in the Dial() app call!
+;automixmon => *3		; One Touch Record a.k.a. Touch MixMonitor -- Make sure to set the X and/or x option in the Dial() or Queue() app call!
 
 [applicationmap]
 ; Note that the DYNAMIC_FEATURES channel variable must be set to use the features