From: Automerge Script <automerge@asterisk.org>
Date: Fri, 12 Jan 2007 15:18:07 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.15-netsec~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=075c32cbb99ce8ce519a1c55cad515df6f28e2a3;p=thirdparty%2Fasterisk.git

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 f48e6b27a6..5fae072caf 100644
--- 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,