From: Richard Mudgett <rmudgett@digium.com>
Date: Mon, 30 Mar 2009 20:50:55 +0000 (+0000)
Subject: Merged revisions 185123 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43d61af4f452ce9dd46a503d2c9d92fe08550c6e;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@185127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/misdn_config.c b/channels/misdn_config.c
index 972706acd5..d5879fa420 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 5321743be6..567d6addc5 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
 ;