diff options
author | Alec L Davis <sivad.a@paradise.net.nz> | 2011-09-07 08:17:24 +0000 |
---|---|---|
committer | Alec L Davis <sivad.a@paradise.net.nz> | 2011-09-07 08:17:24 +0000 |
commit | 5ad57732f56f43a2c178e4c49a77f212fbee06e0 (patch) | |
tree | 38af427e1d878d0178de404cbd875cf76ae0a511 | |
parent | 369ea4e7efdadf22c0918937e598e41a9c7d34ff (diff) |
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
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | CHANGES | 2 | ||||
-rw-r--r-- | apps/app_queue.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -524,7 +524,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 7cd3b9ed8..07b8d7db4 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3377,7 +3377,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; |