[svn-commits] may: branch may/ooh323_ipv6_direct_rtp r308284 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Digium repositories]

Author: may
Date: Fri Feb 18 13:14:46 2011
New Revision: 308284

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308284
Log:
Merged revisions 308220,308258 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/team/may/ooh323_ipv6

................
  r308220 | root | 2011-02-18 00:20:43 +0300 (Fri, 18 Feb 2011) | 9 lines
  
  Merged revisions 308205 via svnmerge from 
  file:///srv/subversion/repos/asterisk/trunk
  
  ........
    r308205 | rmudgett | 2011-02-17 14:21:56 -0600 (Thu, 17 Feb 2011) | 1 line
    
    Add more verbage to CLI command 'pri show channels' usage.
  ........
................
  r308258 | root | 2011-02-18 03:20:42 +0300 (Fri, 18 Feb 2011) | 1 line
  
  automerge cancel
................

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-custom (original)
+++ svnmerge-custom Fri Feb 18 13:14:46 2011
@@ -1,1 +1,1 @@
-/team/may/ooh323_ipv6:1-308201
+/team/may/ooh323_ipv6:1-308201,308220-308258

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 18 13:14:46 2011
@@ -1,1 +1,1 @@
-/trunk:1-308199
+/trunk:1-308219

Modified: team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c?view=diff&rev=308284&r1=308283&r2=308284
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/channels/chan_dahdi.c Fri Feb 18 13:14:46 2011
@@ -14181,7 +14181,10 @@
 		e->command = "pri show channels";
 		e->usage =
 			"Usage: pri show channels\n"
-			"       Displays PRI channel information\n";
+			"       Displays PRI channel information such as the current mapping\n"
+			"       of DAHDI B channels to Asterisk channel names and which calls\n"
+			"       are on hold or call-waiting.  Calls on hold or call-waiting\n"
+			"       are not associated with any B channel.\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;