aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-04 16:28:25 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-04 16:28:25 +0000
commit690ea7703d027881683f1a8d1ed452766d5d4838 (patch)
tree102dbb4ec3f9a058264ed08dbec5d034be61c60d /configs
parent795acd9cae5084645e86608d864207db4cd15610 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@135475 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/chan_dahdi.conf.sample5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 9c486b13d..f39e55e45 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/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
;