[asterisk-commits] kpfleming: trunk r84691 - in /trunk: ./ channels/chan_zap.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Thu Oct  4 16:38:22 2007
New Revision: 84691

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84691
Log:
Merged revisions 84690 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84690 | kpfleming | 2007-10-04 16:36:56 -0500 (Thu, 04 Oct 2007) | 2 lines

callers of sig2str already add the word 'signalling' in the appropriate place, so don't duplicate it

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=84691&r1=84690&r2=84691
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Thu Oct  4 16:38:22 2007
@@ -1359,25 +1359,25 @@
 	case SIG_FXOKS:
 		return "FXO Kewlstart";
 	case SIG_PRI:
-		return "PRI Signalling";
+		return "ISDN PRI";
 	case SIG_SS7:
-		return "SS7 Signalling";
+		return "SS7";
 	case SIG_SF:
-		return "SF (Tone) Signalling Immediate";
+		return "SF (Tone) Immediate";
 	case SIG_SFWINK:
-		return "SF (Tone) Signalling Wink";
+		return "SF (Tone) Wink";
 	case SIG_SF_FEATD:
-		return "SF (Tone) Signalling with Feature Group D (DTMF)";
+		return "SF (Tone) with Feature Group D (DTMF)";
 	case SIG_SF_FEATDMF:
-		return "SF (Tone) Signalling with Feature Group D (MF)";
+		return "SF (Tone) with Feature Group D (MF)";
 	case SIG_SF_FEATB:
-		return "SF (Tone) Signalling with Feature Group B (MF)";
+		return "SF (Tone) with Feature Group B (MF)";
 	case SIG_GR303FXOKS:
-		return "GR-303 Signalling with FXOKS";
+		return "GR-303 with FXOKS";
 	case SIG_GR303FXSKS:
-		return "GR-303 Signalling with FXSKS";
+		return "GR-303 with FXSKS";
 	case 0:
-		return "Pseudo Signalling";
+		return "Pseudo";
 	default:
 		snprintf(buf, sizeof(buf), "Unknown signalling %d", sig);
 		return buf;