diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-12 14:45:20 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-01-12 14:45:20 +0000 |
commit | aa3eea042d8b1f512d9f4ee0405535e45a0434ce (patch) | |
tree | 69228d87ed89eb19c95bf17d8805af31c4187788 /main/pbx.c | |
parent | 1439e0fa75231293326b1dba70def8dc5c46cc71 (diff) |
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
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 198f3b390..10c9911ad 100644 --- 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, |