Changeset 6674

Show
Ignore:
Timestamp:
09/09/08 13:33:07 (5 years ago)
Author:
fskrotzki
Message:

update inline help for file referances, fixed a few typos in extensions comments.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.5/core/etc/extensions.conf

    r6673 r6674  
    2222; This include file is to be used with extreme caution. In almost all cases    * 
    2323; any custom dialplan SHOULD be put in extensions_custom.conf which will       * 
    24 ; not hurt freepbx generated dialplan. In some very rare and custom situation  * 
    25 ; users have a need to override what freepbx generates. Anything in this file  * 
    26 ; will do such.                                                                * 
     24; not hurt a FreePBX generated dialplan. In some very rare and custom          * 
     25; situations users may have a need to override what freepbx automatically      * 
     26; generates. If so anything in this file will do that.  If you come up with a  * 
     27; situation where you need to modify the existing dialplan or macro, please    * 
     28; put it here and also notify the FreePBX development team so they can take it * 
     29; into account in the future.                                                  * 
    2730;                                                                              * 
    2831#include extensions_override_freepbx.conf 
     
    3437 
    3538; Customizations to this dialplan should be made in extensions_custom.conf 
    36 ; See extensions_custom.conf.sample for an example 
     39; See extensions_custom.conf.sample for an example. 
     40; If you need to use [macro-dialout-trunk-predial-hook], [ext-did-custom], or  
     41; [from-internal-custom] for example, place these in this file or they will get overwritten. 
     42
    3743#include extensions_custom.conf 
    3844 
     
    674680[macro-dialout-trunk-predial-hook] 
    675681; this macro intentially left blank so it may be safely overwritten for any custom 
    676 ; requirements that an installatin may have. 
     682; requirements that an installation may have. 
    677683; 
    678684; MACRO RETURN CODE: ${PREDIAL_HOOK_RET} 
  • modules/branches/2.5/core/etc/iax.conf

    r6673 r6674  
    1616; These should all be expected to come after the [general] context 
    1717; 
     18;iax_custom.conf is the proper place to start creating new contexts that you  
     19;might have a need for.  Dundi IAX trunks is one example of when this file is needed. 
     20; 
    1821#include iax_custom.conf 
    1922#include iax_additional.conf 
     23; 
     24;iax_custom_post.conf will allow you to modify FreePBX generated IAX setups so 
     25;that you can add additional parameters to a auto-generated setup. 
     26;if you have a auto-generated context of [foobar] and need to add a parameter  
     27;to it then create this line [foobar](+) and place your additions on the next line 
     28; 
    2029#include iax_custom_post.conf 
    2130 
  • modules/branches/2.5/core/etc/sip.conf

    r6673 r6674  
    77 
    88[general] 
     9 
     10; These files will all be included in the [general] context 
    911; 
    10 ; enable and force the sip jitterbuffer. If these settings are desired 
    11 ; they should be set in the sip_general_custom.conf file as this file 
    12 ; will get overwritten during reloads and upgrades. 
     12#include sip_general_additional.conf 
     13 
     14;sip_general_custom.conf is the proper file location for placing any sip general  
     15;options that you might need set. For example: enable and force the sip jitterbuffer.  
     16;If these settings are desired they should be set the sip_general_custom.conf file. 
    1317; 
    1418; jbenable=yes 
    1519; jbforce=yes 
     20; 
     21;It is also the proper place to add the lines needed for sip nat'ing when going 
     22;through a firewall.  For nat'ing you'd need to add the following lines:  
     23; nat=yes , externip= , localhost= , and optionally fromdomain= . 
     24; 
     25#include sip_general_custom.conf 
    1626 
    17 ; These will all be included in the [general] context 
     27;sip_nat.conf is here for legacy support reasons and for those that upgrade  
     28;from previous versions.  If you have this file with lines in it please make 
     29;sure they are not duplicated in sip_general_custom.conf, if so remove them  
     30from sip_nat.conf as sip_general_custom.conf will have precedence. 
     31#include sip_nat.conf 
     32 
     33;sip_registrations_custom.conf is for any customizations you might need to do to 
     34;the automatically generated registrations that FreePBX makes. 
    1835; 
    19 #include sip_general_additional.conf 
    20 #include sip_general_custom.conf 
    21 #include sip_nat.conf 
    2236#include sip_registrations_custom.conf 
    2337#include sip_registrations.conf 
    2438 
    25 ; These should all be expected to come after the [general] context 
     39; These files should all be expected to come after the [general] context 
    2640; 
    2741#include sip_custom.conf 
    2842#include sip_additional.conf 
     43 
     44;sip_custom_post.conf If you have extra parameters that are needed for a  
     45;extension to work to for example, those go here.  So you have extension  
     46;1000 defined in your system you start by creating a line [1000](+) in this  
     47;file.  Then on the next line add the extra parameter that is needed.   
     48;When the sip.conf is loaded it will append your additions to the end of  
     49;that extension.  
     50; 
    2951#include sip_custom_post.conf