Merged revisions 332504 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r332504 | kmoore | 2011-08-18 14:29:15 -0500 (Thu, 18 Aug 2011) | 15 lines
  
  Merged revisions 332503 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r332503 | kmoore | 2011-08-18 14:28:00 -0500 (Thu, 18 Aug 2011) | 8 lines
    
    CRC4 in "dahdi show status" gives wrong impression to T1 users
    
    Change CRC4 to CRC in the output of "dahdi show status" so that it can apply in
    more situations without confusing users, especially since T1 lines use CRC6
    instead of CRC4.
    
    (closes issue AST-471)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@332505 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_dahdi.c

@@ -15477,7 +15477,7 @@ static char *dahdi_show_status(struct ast_cli_entry *e, int cmd, struct ast_cli_
 		ast_cli(a->fd, "No DAHDI found. Unable to open /dev/dahdi/ctl: %s\n", strerror(errno));
 		return CLI_FAILURE;
 	}
-	ast_cli(a->fd, FORMAT2, "Description", "Alarms", "IRQ", "bpviol", "CRC4", "Framing", "Coding", "Options", "LBO");
+	ast_cli(a->fd, FORMAT2, "Description", "Alarms", "IRQ", "bpviol", "CRC", "Framing", "Coding", "Options", "LBO");
 	for (span = 1; span < DAHDI_MAX_SPANS; ++span) {
 		s.spanno = span;