From: Mark Michelson Date: Thu, 2 Apr 2009 21:59:44 +0000 (+0000) Subject: Merged revisions 186175 via svnmerge from X-Git-Tag: 1.6.1.0-rc4~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e53222e959beb3cb7015fac48f84f3a361a0d94d;p=thirdparty%2Fasterisk.git 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. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@186177 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 40af118506..22b6e52f29 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -60,7 +60,7 @@ context => parkedcalls ; Which context parked calls are in (default parking lot ;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]