aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 20:52:51 +0000
committerrmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>2009-03-30 20:52:51 +0000
commit8dcb5f16287277db4588da97421f3adaa89423e5 (patch)
tree8fad4dfa4112919892a110ef168acac74ac5f2ce
parentf1be0fd9e6c911b57f42d17174f3c84c54be0214 (diff)
Merged revisions 185123 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r185123 | rmudgett | 2009-03-30 15:42:14 -0500 (Mon, 30 Mar 2009) | 9 lines Merged revisions 185121 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r185121 | rmudgett | 2009-03-30 15:40:11 -0500 (Mon, 30 Mar 2009) | 1 line Update the channel allocation method documentation. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@185129 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/misdn_config.c9
-rw-r--r--configs/misdn.conf.sample9
2 files changed, 10 insertions, 8 deletions
diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 0a7109276..50d18ed57 100644
--- a/channels/misdn_config.c
+++ b/channels/misdn_config.c
@@ -134,10 +134,11 @@ static const struct misdn_cfg_spec port_spec[] = {
{ "callerid", MISDN_CFG_CALLERID, MISDN_CTYPE_STR, "", NONE,
"Sets the caller ID." },
{ "method", MISDN_CFG_METHOD, MISDN_CTYPE_STR, "standard", NONE,
- "Sets the method to use for channel selection:\n"
- "\t standard - always choose the first free channel with the lowest number\n"
- "\t round_robin - use the round robin algorithm to select a channel. use this\n"
- "\t if you want to balance your load." },
+ "Set the method to use for channel selection:\n"
+ "\t standard - Use the first free channel starting from the lowest number.\n"
+ "\t standard_dec - Use the first free channel starting from the highest number.\n"
+ "\t round_robin - Use the round robin algorithm to select a channel. Use this\n"
+ "\t if you want to balance your load." },
{ "dialplan", MISDN_CFG_DIALPLAN, MISDN_CTYPE_INT, "0", NONE,
"Dialplan means Type Of Number in ISDN Terms (for outgoing calls)\n"
"\n"
diff --git a/configs/misdn.conf.sample b/configs/misdn.conf.sample
index ad38766d2..ca7f45497 100644
--- a/configs/misdn.conf.sample
+++ b/configs/misdn.conf.sample
@@ -269,10 +269,11 @@ need_more_infos=no
;
nttimeout=no
-; set the method to use for channel selection:
-; standard - always choose the first free channel with the lowest number
-; round_robin - use the round robin algorithm to select a channel. use this
-; if you want to balance your load.
+; Set the method to use for channel selection:
+; standard - Use the first free channel starting from the lowest number.
+; standard_dec - Use the first free channel starting from the highest number.
+; round_robin - Use the round robin algorithm to select a channel. Use this
+; if you want to balance your load.
;
; default value: standard
;