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

........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@135475 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/chan_dahdi.conf.sample

@@ -703,10 +703,13 @@ pickupgroup=1
 ; 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
 ;