[asterisk-commits] rmudgett: branch 1.6.1 r185127 - in /branches/1.6.1: ./ channels/ configs/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Mar 30 15:50:55 2009
New Revision: 185127

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185127
Log:
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.
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/misdn_config.c
    branches/1.6.1/configs/misdn.conf.sample

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

Modified: branches/1.6.1/channels/misdn_config.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/misdn_config.c?view=diff&rev=185127&r1=185126&r2=185127
==============================================================================
--- branches/1.6.1/channels/misdn_config.c (original)
+++ branches/1.6.1/channels/misdn_config.c Mon Mar 30 15:50:55 2009
@@ -134,10 +134,11 @@
 	{ "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"

Modified: branches/1.6.1/configs/misdn.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/configs/misdn.conf.sample?view=diff&rev=185127&r1=185126&r2=185127
==============================================================================
--- branches/1.6.1/configs/misdn.conf.sample (original)
+++ branches/1.6.1/configs/misdn.conf.sample Mon Mar 30 15:50:55 2009
@@ -269,10 +269,11 @@
 ;
 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
 ;