Index: UPGRADE.txt
===================================================================
RCS file: /usr/cvsroot/asterisk/UPGRADE.txt,v
retrieving revision 1.28
diff -u -r1.28 UPGRADE.txt
--- UPGRADE.txt	13 Nov 2005 00:46:06 -0000	1.28
+++ UPGRADE.txt	18 Nov 2005 23:58:29 -0000
@@ -52,8 +52,10 @@
 
 IAX: 
 
-* The naming convention for IAX channels has changed in a minor way such 
-  that the call number follows a "-" rather than a "/" character.
+* The naming convention for IAX channels has changed in two ways:
+   1. The call number follows a "-" rather than a "/" character.
+   2. The name of the channel has been simplified to IAX2/peer-callno,
+   rather than IAX2/peer@peer-callno or even IAX2/peer@peer/callno.
 
 SIP:
 
Index: channels/chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.378
diff -u -r1.378 chan_iax2.c
--- channels/chan_iax2.c	12 Nov 2005 20:04:57 -0000	1.378
+++ channels/chan_iax2.c	18 Nov 2005 23:58:29 -0000
@@ -1954,8 +1954,8 @@
 
 		ast_cli(fd, "  Status       : ");
 		peer_status(peer, status, sizeof(status));	
-		ast_cli(fd, " Qualify        : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
 		ast_cli(fd, "%s\n",status);
+		ast_cli(fd, " Qualify        : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
 		ast_cli(fd,"\n");
 		if (ast_test_flag(peer, IAX_TEMPONLY))
 			destroy_peer(peer);