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
........

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

diff --git a/CHANGES b/CHANGES
index b1b2f9f67f9a5162ea3d2a031857a2ed4a25c7d5..46b31d954fcdd1b84679dc9f79160e7a6cec98a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -495,7 +495,7 @@ Queue changes
  * 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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index a982ac2336a0eb8fe24296f491cb632f7fcc64e7..e0a6c9650243631f0aafa9601565f87cb2bebe06 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -3359,7 +3359,7 @@ static int store_next_lin(struct queue_ent *qe, struct callattempt *outgoing)
        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;