[asterisk-commits] mmichelson: branch 1.6.1 r186177 - in /branches/1.6.1: ./ configs/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Apr  2 16:59:44 2009
New Revision: 186177

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186177
Log:
Merged revisions 186175 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186175 | mmichelson | 2009-04-02 16:56:21 -0500 (Thu, 02 Apr 2009) | 11 lines
  
  Merged revisions 186174 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186174 | mmichelson | 2009-04-02 16:55:34 -0500 (Thu, 02 Apr 2009) | 5 lines
    
    Fix instructions in one-step parking comment to make more sense.
    
    Changed a capital K to a lowercase k.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/configs/features.conf.sample

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/configs/features.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configs/features.conf.sample?view=diff&rev=186177&r1=186176&r2=186177
==============================================================================
--- branches/1.6.1/configs/features.conf.sample (original)
+++ branches/1.6.1/configs/features.conf.sample Thu Apr  2 16:59:44 2009
@@ -60,7 +60,7 @@
 ;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!
+;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]