aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-12 16:08:53 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-12 16:08:53 +0000
commit99e0108b1cc57693632a892f04b327f9e65e7a08 (patch)
tree0113a5e5853a05bd7d3db3db7a92203293d6f98c /configs
parent7152c502d00671cb2f62bbb5f9780f6b7053a885 (diff)
Merged revisions 291230 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r291230 | lmadsen | 2010-10-12 11:08:04 -0500 (Tue, 12 Oct 2010) | 10 lines Merged revisions 291229 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r291229 | lmadsen | 2010-10-12 11:07:28 -0500 (Tue, 12 Oct 2010) | 2 lines Add documention that mentions options are defined but not used. (Issue #18101) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@291231 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/manager.conf.sample4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 253a3ffa4..82590801a 100644
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -111,8 +111,8 @@ bindaddr = 0.0.0.0
; management commands, such as Shutdown, Restart, and Reload.
; call - Information about channels and ability to set information in a
; running channel.
-; log - Logging information. Read-only.
-; verbose - Verbose information. Read-only.
+; log - Logging information. Read-only. (Defined but not yet used.)
+; verbose - Verbose information. Read-only. (Defined but not yet used.)
; agent - Information about queues and agents and ability to add queue
; members to a queue.
; user - Permission to send and receive UserEvent.