Merged revisions 50562 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r50562 | kpfleming | 2007-01-12 08:42:24 -0600 (Fri, 12 Jan 2007) | 10 lines

Merged revisions 50561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r50561 | kpfleming | 2007-01-12 08:34:15 -0600 (Fri, 12 Jan 2007) | 2 lines

minor documentation clarification

........

................

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

diff --git a/main/pbx.c b/main/pbx.c
index 198f3b3..10c9911 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -265,7 +265,8 @@ static struct pbx_builtin {
        "Answer a channel if ringing",
        "  Answer([delay]): If the call has not been answered, this application will\n"
        "answer it. Otherwise, it has no effect on the call. If a delay is specified,\n"
-       "Asterisk will wait this number of milliseconds before answering the call.\n"
+       "Asterisk will wait this number of milliseconds before returning to\n"
+       "the dialplan after answering the call.\n"
        },
 
        { "BackGround", pbx_builtin_background,