[asterisk-commits] dvossel: branch dvossel/hd_confbridge r310413 - in /team/dvossel/hd_confbridg...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Fri Mar 11 17:16:16 2011
New Revision: 310413

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310413
Log:
Updates to ConfBridge documentation

Modified:
    team/dvossel/hd_confbridge/apps/app_confbridge.c
    team/dvossel/hd_confbridge/configs/confbridge.conf.sample

Modified: team/dvossel/hd_confbridge/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/apps/app_confbridge.c?view=diff&rev=310413&r1=310412&r2=310413
==============================================================================
--- team/dvossel/hd_confbridge/apps/app_confbridge.c (original)
+++ team/dvossel/hd_confbridge/apps/app_confbridge.c Fri Mar 11 17:16:16 2011
@@ -60,13 +60,13 @@
                                 <para>The conference number</para>
                         </parameter>
                         <parameter name="bridge_profile">
-                                <para>The bridge profile name from confbridge.conf</para>
+                                <para>The bridge profile name from confbridge.conf.  When left blank, the 'default_bridge' profile found in confbridge.conf will be used if present.</para>
                         </parameter>
                         <parameter name="user_profile">
-                                <para>The user profile name from confbridge.conf</para>
+                                <para>The user profile name from confbridge.conf.  When left blank, the 'default_user' profile found in confbridge.conf will be used if present.</para>
                         </parameter>
                         <parameter name="menu">
-                                <para>The name of the DTMF menu in confbridge.conf to be applied to this channel.</para>
+                                <para>The name of the DTMF menu in confbridge.conf to be applied to this channel.  No menu is applied by default if this option is left blank.</para>
                         </parameter>
                 </syntax>
                 <description>

Modified: team/dvossel/hd_confbridge/configs/confbridge.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/dvossel/hd_confbridge/configs/confbridge.conf.sample?view=diff&rev=310413&r1=310412&r2=310413
==============================================================================
--- team/dvossel/hd_confbridge/configs/confbridge.conf.sample (original)
+++ team/dvossel/hd_confbridge/configs/confbridge.conf.sample Fri Mar 11 17:16:16 2011
@@ -3,11 +3,14 @@
 ; is not currently used, but reserved
 ; for future use.
 
+;
+; --- Default Information ---
+; The default_user and default_bridge sections are applied
+; automatically to all ConfBridge instances invoked without
+; a user, or bridge argument.  No menu is applied by default.
+;
 
-; --- ConfBridge User and Bride Profiles ---
-; The default_user, default_bridge sections are applied
-; automatically to all ConfBridge instances invoked without
-; a user, bridge, or menu argument.
+; --- ConfBridge User Profile Options ---
 [default_user]
 type=user
 ;admin=yes     ; Sets if the user is an admin or not. Off by default.
@@ -28,6 +31,9 @@
 ;pin=1234  ; Sets if this user must enter a PIN number before entering
            ; the conference.  The PIN will be prompted for.
 
+
+
+; --- ConfBridge Bridge Profile Options ---
 [default_bridge]
 type=bridge
 ;internal_sample_rate=auto     ; Sets the internal native sample rate the
@@ -41,7 +47,7 @@
 
 ; --- ConfBridge Menu Options ---
 ; The ConfBridge application also has the ability to
-; apply custom DTMF menu's to each channel using the
+; apply custom DTMF menus to each channel using the
 ; application.  Like the User and Bridge profiles
 ; a menu is passed in to ConfBridge as an argument in
 ; the dialplan.