diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-12 14:45:20 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-12 14:45:20 +0000 |
commit | 809525b045c4c30f2c724e638e6ca0526f7ec887 (patch) | |
tree | 69228d87ed89eb19c95bf17d8805af31c4187788 /main | |
parent | fed10bc0b7f92452af11016be0374e77a73677c5 (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: http://svn.digium.com/svn/asterisk/trunk@50563 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-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, |