[asterisk-commits] russell: branch 1.6.2 r275148 - in /branches/1.6.2: ./ configs/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jul  9 13:11:57 2010
New Revision: 275148

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275148
Log:
Merged revisions 275147 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r275147 | russell | 2010-07-09 13:11:13 -0500 (Fri, 09 Jul 2010) | 2 lines
  
  Move parking lot sample config out from the middle of dynamic features sample config.
........

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

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

Modified: branches/1.6.2/configs/features.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/features.conf.sample?view=diff&rev=275148&r1=275147&r2=275148
==============================================================================
--- branches/1.6.2/configs/features.conf.sample (original)
+++ branches/1.6.2/configs/features.conf.sample Fri Jul  9 13:11:57 2010
@@ -51,6 +51,17 @@
 ;atxferloopdelay = 10       ; Number of seconds to sleep between retries (if atxferdropcall = no)
 ;atxfercallbackretries = 2  ; Number of times to attempt to send the call back to the transferer.
                             ; By default, this is 2.
+
+;
+;*** Define another parking lot
+;
+; You can set parkinglot with the CHANNEL dialplan function
+; or by setting 'parkinglot' directly in the channel configuration file.
+;
+;[parkinglot_edvina]
+;context => edvinapark
+;parkpos => 800-850
+;findslot => next
 
 ; Note that the DTMF features listed below only work when two channels have answered and are bridged together.
 ; They can not be used while the remote party is ringing or in progress. If you require this feature you can use
@@ -127,16 +138,6 @@
 ;                                                  ;on their channel
 ;unpauseMonitor => #3,self/callee,UnPauseMonitor   ;Allow the callee to unpause monitoring
 ;                                                  ;on their channel
-;
-;*** Define another parking lot
-;
-; You can set parkinglot with the CHANNEL dialplan function
-; or by setting 'parkinglot' directly in the channel configuration file.
-;
-;[parkinglot_edvina]
-;context => edvinapark
-;parkpos => 800-850
-;findslot => next
 
 ; GROUPS
 ;   Groups are groupings of features defined in [applicationmap]