automerge commit

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

diff --git a/pbx.c b/pbx.c
index f48e6b27a67464f1bc5b69f443beae91128bf7a5..5fae072cafc061ce9a42fb3e119ec9aee41a26a5 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -258,7 +258,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,