Merge config sample updates mentioning reload (bug #3697)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5187 f38db490-d61c-443f-a65b-d21fe96a405b

8 files changed, 44 insertions, 1 deletions

diff --git a/configs/enum.conf.sample b/configs/enum.conf.sample
index 905f10fe1..8d7054a24 100755
--- a/configs/enum.conf.sample
+++ b/configs/enum.conf.sample
@@ -2,6 +2,7 @@
 ; ENUM Configuration for resolving phone numbers over DNS
 ;
 ; Sample config for Asterisk
+; This file is reloaded at "reload enum" in the CLI
 ;
 [general]
 ;
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index dd374d34e..9172b123a 100755
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -3,6 +3,9 @@
 ; the pbx_config module. This is where you configure all your 
 ; inbound and outbound calls in Asterisk. 
 ; 
+; This configuration file is reloaded 
+; - With the "extensions reload" command in the CLI
+; - With the "reload" command (that reloads everything) in the CLI
 
 ;
 ; The "General" category is for certain variables.  
diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 9cc204183..6da635789 100755
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -1,6 +1,9 @@
 
 ; Inter-Asterisk eXchange driver definition
 ;
+; This configuration is re-read at reload
+; or with the CLI command
+; 	reload chan_iax2.so
 ;
 ; General settings, like port number to bind to, and
 ; an option address (the default is to bind to all
diff --git a/configs/logger.conf.sample b/configs/logger.conf.sample
index 048d2ad23..d03cdc6d8 100755
--- a/configs/logger.conf.sample
+++ b/configs/logger.conf.sample
@@ -3,6 +3,9 @@
 ;
 ; In this file, you configure logging to files or to
 ; the syslog system.
+;
+; "logger reload" at the CLI will reload configuration
+; of the logging system.
 
 [general]
 ; Customize the display of debug message time stamps
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 5c6195d66..e2d92704a 100755
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -1,5 +1,23 @@
 ;
-; Asterisk Call Management support
+; AMI - The Asterisk Manager Interface
+; 
+; Third party application call management support
+; and PBX event supervision
+;
+; This configuration file is read every time someone
+; logs in
+;
+; Use the "show manager commands" at the CLI to list
+; availabale manager commands and their authorization
+; levels.
+;
+; "show manager command <command>" will show a help text.
+;
+; ------------------- SECURITY NOTE -----------------
+; Note that you should not enable the AMI on a public
+; IP address. If needed, block this TCP port with
+; iptables (or another FW software) and reach it
+; with IPsec, SSH or SSL vpn tunnel
 ;
 [general]
 enabled = no
@@ -11,5 +29,7 @@ bindaddr = 0.0.0.0
 ;secret = mysecret
 ;deny=0.0.0.0/0.0.0.0
 ;permit=209.16.236.73/255.255.255.0
+;
+; Authorization for various classes 
 ;read = system,call,log,verbose,command,agent,user
 ;write = system,call,log,verbose,command,agent,user
diff --git a/configs/meetme.conf.sample b/configs/meetme.conf.sample
index 2bf1f595b..8a26c5464 100755
--- a/configs/meetme.conf.sample
+++ b/configs/meetme.conf.sample
@@ -2,6 +2,8 @@
 ; Configuration file for MeetMe simple conference rooms
 ; for Asterisk of course.
 ;
+; This configuration file is read every time you call app meetme()
+;
 [rooms]
 ;
 ; Usage is conf => confno[,pin][,adminpin]	
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 3fea4a111..16230850e 100755
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -19,6 +19,9 @@
 ;
 ;   sip debug			Show all SIP messages
 ;
+;   reload chan_sip.so		Reload configuration file
+;				Active SIP peers will not be reconfigured
+;
 
 [general]
 context=default			; Default context for incoming calls
diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample
index 84c9d58c6..1a31c0281 100755
--- a/configs/zapata.conf.sample
+++ b/configs/zapata.conf.sample
@@ -2,6 +2,14 @@
 ; Zapata telephony interface
 ;
 ; Configuration file
+;
+; You need to restart Asterisk to re-configure the Zap channel
+; CLI> reload chan_zap.so 
+;		will reload the configuration file,
+;		but not all configuration options are 
+; 		re-configured during a reload.
+
+
 
 [trunkgroups]
 ;