[svn-commits] bbryant: trunk r132514 - /trunk/configs/

[SVN commits to the Digium repositories]

Author: bbryant
Date: Mon Jul 21 16:12:51 2008
New Revision: 132514

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132514
Log:
Update configuration files to add missing options for jingle, gtalk, 
manager.conf, and features.conf.

(closes issue #13128)
Reported by: caio1982
Patches:
      missing_options1.diff uploaded by caio1982 (license 22)

Modified:
    trunk/configs/features.conf.sample
    trunk/configs/gtalk.conf.sample
    trunk/configs/jingle.conf.sample
    trunk/configs/manager.conf.sample

Modified: trunk/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/features.conf.sample?view=diff&rev=132514&r1=132513&r2=132514
==============================================================================
--- trunk/configs/features.conf.sample (original)
+++ trunk/configs/features.conf.sample Mon Jul 21 16:12:51 2008
@@ -8,9 +8,12 @@
 				; These needs to be numeric, as Asterisk starts from the start position
 				; and increments with one for the next parked call.
 context => parkedcalls		; Which context parked calls are in (default parking lot)
-context => parkedcalls		; Which context parked calls are in
+;parkinghints = no		; Add hints priorities automatically for parking slots (default is no).
 ;parkingtime => 45		; Number of seconds a call can be parked for 
 				; (default is 45 seconds)
+;comebacktoorigin = yes	; Whether to return to the original calling extension upon parking
+				; timeout or to send the call to context 'parkedcallstimeout' at
+				; extension 's', priority '1' (default is yes).
 ;courtesytone = beep		; Sound file to play to the parked caller 
 				; when someone dials a parked call
 				; or the Touch Monitor is activated/deactivated.
@@ -114,7 +117,7 @@
 ;*** Define another parking lot
 ;
 ; You can set parkinglot with the CHANNEL dialplan function
-; or configure it in the device configuration in the channel
+; or by setting 'parkinglot' directly in the channel configuration file.
 ;
 ;[parkinglot_edvina]
 ;context => edvinapark

Modified: trunk/configs/gtalk.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/gtalk.conf.sample?view=diff&rev=132514&r1=132513&r2=132514
==============================================================================
--- trunk/configs/gtalk.conf.sample (original)
+++ trunk/configs/gtalk.conf.sample Mon Jul 21 16:12:51 2008
@@ -1,5 +1,6 @@
 ;[general]
 ;context=default		;;Context to dump call into
+;bindaddr=0.0.0.0		;;Address to bind to
 ;allowguest=yes			;;Allow calls from people not in
 				;;list of peers
 ;

Modified: trunk/configs/jingle.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/jingle.conf.sample?view=diff&rev=132514&r1=132513&r2=132514
==============================================================================
--- trunk/configs/jingle.conf.sample (original)
+++ trunk/configs/jingle.conf.sample Mon Jul 21 16:12:51 2008
@@ -1,5 +1,6 @@
 ;[general]
 ;context=default		;;Context to dump call into
+;bindaddr=0.0.0.0		;;Address to bind to
 ;allowguest=yes			;;Allow calls from people not in
 				;;list of peers
 ;

Modified: trunk/configs/manager.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/manager.conf.sample?view=diff&rev=132514&r1=132513&r2=132514
==============================================================================
--- trunk/configs/manager.conf.sample (original)
+++ trunk/configs/manager.conf.sample Mon Jul 21 16:12:51 2008
@@ -43,6 +43,7 @@
 ;   sslbindport=5039		; the port to bind to
 ;   sslbindaddr=0.0.0.0		; address to bind to, default to bindaddr
 ;   sslcert=/tmp/asterisk.pem	; path to the certificate.
+;   sslcipher=<cipher string>   ; string specifying which SSL ciphers to use or not use
 
 
 ;