[asterisk-commits] trunk r16083 - in /trunk: ./ pbx.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed Mar 29 08:24:30 2006
New Revision: 16083

URL: http://svn.digium.com/view/asterisk?rev=16083&view=rev
Log:
Merged revisions 16082 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r16082 | tilghman | 2006-03-29 08:10:23 -0600 (Wed, 29 Mar 2006) | 2 lines

Bug 6835 - Updates to GotoIf help text

........

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

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

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=16083&r1=16082&r2=16083&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Wed Mar 29 08:24:30 2006
@@ -314,11 +314,13 @@
 
 	{ "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,