[svn-commits] lmadsen: trunk r291231 - in /trunk: ./ configs/manager.conf.sample

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Tue Oct 12 11:08:53 2010
New Revision: 291231

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=291231
Log:
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)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/configs/manager.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/manager.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/manager.conf.sample?view=diff&rev=291231&r1=291230&r2=291231
==============================================================================
--- trunk/configs/manager.conf.sample (original)
+++ trunk/configs/manager.conf.sample Tue Oct 12 11:08:53 2010
@@ -111,8 +111,8 @@
 ;             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.