[asterisk-commits] russell: branch 1.6.0 r135475 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Aug  4 11:28:25 2008
New Revision: 135475

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135475
Log:
Merged revisions 135474 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r135474 | russell | 2008-08-04 11:28:07 -0500 (Mon, 04 Aug 2008) | 10 lines

Merged revisions 135473 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r135473 | russell | 2008-08-04 11:26:17 -0500 (Mon, 04 Aug 2008) | 2 lines

Add a minor clarification to the documentation of mohinterpret and mohsuggest

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/chan_dahdi.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/chan_dahdi.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/chan_dahdi.conf.sample?view=diff&rev=135475&r1=135474&r2=135475
==============================================================================
--- branches/1.6.0/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.0/configs/chan_dahdi.conf.sample Mon Aug  4 11:28:25 2008
@@ -703,10 +703,13 @@
 ; passed through as signalling instead of generating hold music locally. This
 ; setting is only valid when used on a channel that uses digital signalling.
 ;
+; This option may be set globally or on a per-channel basis.
+;
 ;mohinterpret=default
 ;
 ; This option specifies which music on hold class to suggest to the peer channel
-; when this channel places the peer on hold. 
+; when this channel places the peer on hold.  This option may be set globally,
+; or on a per-channel basis.
 ;
 ;mohsuggest=default
 ;