[asterisk-commits] alecdavis: trunk r334623 - in /trunk: ./ CHANGES apps/app_queue.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Wed Sep  7 03:17:24 2011
New Revision: 334623

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334623
Log:
Merged revisions 334621 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334621 | alecdavis | 2011-09-07 20:14:50 +1200 (Wed, 07 Sep 2011) | 9 lines
  
  Merged revisions 334620 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334620 | alecdavis | 2011-09-07 20:12:49 +1200 (Wed, 07 Sep 2011) | 2 lines
    
    peroid typo
  ........
................

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/apps/app_queue.c

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

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=334623&r1=334622&r2=334623
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Wed Sep  7 03:17:24 2011
@@ -524,7 +524,7 @@
  * A new option, 'I' has been added to both app_queue and app_dial.
    By setting this option, Asterisk will not update the caller with
    connected line changes or redirecting party changes when they occur.
- * A 'relative-peroidic-announce' option has been added to queues.conf.  When
+ * A 'relative-periodic-announce' option has been added to queues.conf.  When
    enabled, this option will cause periodic announce times to be calculated
    from the end of announcements rather than from the beginning.
  * The autopause option in queues.conf can be passed a new value, "all." The

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=334623&r1=334622&r2=334623
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Sep  7 03:17:24 2011
@@ -3377,7 +3377,7 @@
 	return 0;
 }
 
-/*! \brief Playback announcement to queued members if peroid has elapsed */
+/*! \brief Playback announcement to queued members if period has elapsed */
 static int say_periodic_announcement(struct queue_ent *qe, int ringing)
 {
 	int res = 0;