automerge commit

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

diff --git a/pbx.c b/pbx.c
index 7851f3d370047affe4b0e08fc944cfd13770272b..d1da3a498e40ea64aa062c603bf1fe9b05c9d9b1 100644 (file)
--- a/pbx.c
+++ b/pbx.c
@@ -324,11 +324,13 @@ static struct pbx_builtin {
 
        { "GotoIf", pbx_builtin_gotoif,
        "Conditional goto",
-       "  GotoIf(Condition?[label1]:[label2]): This application will cause the calling\n"
-       "channel to jump to the speicifed location in the dialplan based on the\n"
-       "evaluation of the given condition. The channel will continue at 'label1' if the\n"
-       "condition is true, or 'label2' if the condition is false. The labels are\n"
-       "specified in the same syntax that is used with the Goto application.\n"
+       "  GotoIf(condition?[labeliftrue]:[labeliffalse]): This application will cause\n"
+       "the calling channel to jump to the specified location in the dialplan based on\n"
+       "the evaluation of the given condition. The channel will continue at\n"
+       "'labeliftrue' if the condition is true, or 'labeliffalse' if the condition is\n"
+       "false. The labels are specified with the same syntax as used within the Goto\n"
+       "application.  If the label chosen by the condition is omitted, no jump is\n"
+       "performed, but execution continues with the next priority in the dialplan.\n"
        },
 
        { "GotoIfTime", pbx_builtin_gotoiftime,