[asterisk-commits] kpfleming: trunk r50563 - in /trunk: ./ main/pbx.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Fri Jan 12 08:45:20 2007
New Revision: 50563

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50563
Log:
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

........

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

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=50563&r1=50562&r2=50563
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Fri Jan 12 08:45:20 2007
@@ -265,7 +265,8 @@
 	"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,