[svn-commits] tilghman: trunk r43447 - in /trunk: ./ apps/app_url.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Thu Sep 21 15:24:50 2006
New Revision: 43447

URL: http://svn.digium.com/view/asterisk?rev=43447&view=rev
Log:
Merged revisions 43445 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43445 | tilghman | 2006-09-21 15:22:43 -0500 (Thu, 21 Sep 2006) | 2 lines

Fix documentation to reflect how Url() really works

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_url.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Sep 21 15:24:50 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445

Modified: trunk/apps/app_url.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_url.c?rev=43447&r1=43446&r2=43447&view=diff
==============================================================================
--- trunk/apps/app_url.c (original)
+++ trunk/apps/app_url.c Thu Sep 21 15:24:50 2006
@@ -53,20 +53,18 @@
 "Result is returned in the SENDURLSTATUS channel variable:\n"
 "    SUCCESS       URL successfully sent to client\n"
 "    FAILURE       Failed to send URL\n"
-"    NOLOAD        Clien failed to load URL (wait enabled)\n"
+"    NOLOAD        Client failed to load URL (wait enabled)\n"
 "    UNSUPPORTED   Channel does not support URL transport\n"
 "\n"
 "If the option 'wait' is specified, execution will wait for an\n"
 "acknowledgement that the URL has been loaded before continuing\n"
-"and will return -1 if the peer is unable to load the URL\n"
 "\n"
-"Old behaviour (deprecated): \n"
-" If the client does not support Asterisk \"html\" transport, \n"
-" and there exists a step with priority n + 101, then execution will\n"
-" continue at that step.\n"
-" Otherwise, execution will continue at the next priority level.\n"
-" SendURL only returns 0 if the URL was sent correctly  or if\n"
-" the channel does not support HTML transport, and -1 otherwise.\n";
+"If jumping is specified as an option (the 'j' flag), the client does not\n"
+"support Asterisk \"html\" transport, and there exists a step with priority\n"
+"n + 101, then execution will continue at that step.\n"
+"\n"
+"SendURL continues normally if the URL was sent correctly or if the channel\n"
+"does not support HTML transport.  Otherwise, the channel is hung up.\n";
 
 
 static int sendurl_exec(struct ast_channel *chan, void *data)