Index: apps/app_queue.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_queue.c,v
retrieving revision 1.105
diff -u -r1.105 app_queue.c
--- apps/app_queue.c	26 Dec 2004 11:08:34 -0000	1.105
+++ apps/app_queue.c	27 Dec 2004 19:47:50 -0000
@@ -2203,7 +2203,7 @@
 								q->members = cur;
 							prev = cur;
 						}
-					} else if (!strcasecmp(var->name, "music")) {
+					} else if (!strcasecmp(var->name, "music") || !strcasecmp(var->name, "musiconhold")) {
 						strncpy(q->moh, var->value, sizeof(q->moh) - 1);
 					} else if (!strcasecmp(var->name, "announce")) {
 						strncpy(q->announce, var->value, sizeof(q->announce) - 1);
Index: configs/queues.conf.sample
===================================================================
RCS file: /usr/cvsroot/asterisk/configs/queues.conf.sample,v
retrieving revision 1.19
diff -u -r1.19 queues.conf.sample
--- configs/queues.conf.sample	6 Dec 2004 05:54:16 -0000	1.19
+++ configs/queues.conf.sample	27 Dec 2004 19:47:51 -0000
@@ -23,10 +23,10 @@
 ;
 ; A sample call queue
 ;
-; Music sets which musiconhold applies for this particular
-; call queue
+; Musiconhold sets which music applies for this particular
+; call queue (configure classes in musiconhold.conf)
 ;
-;music = default
+;musiconhold = default
 ;
 ; An announcement may be specified which is played for the member as
 ; soon as they answer a call, typically to indicate to them which queue