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: https://origsvn.digium.com/svn/asterisk/trunk@291231 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 253a3ff..8259080 100644 (file)
--- 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.