[svn-commits] murf: branch 1.6.0 r111411 - in /branches/1.6.0: ./ apps/ main/

[SVN commits to the Digium repositories]

Author: murf
Date: Thu Mar 27 08:42:39 2008
New Revision: 111411

URL: http://svn.digium.com/view/asterisk?view=rev&rev=111411
Log:
Merged revisions 111410 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r111410 | murf | 2008-03-27 07:29:41 -0600 (Thu, 27 Mar 2008) | 17 lines

Merged revisions 111391 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r111391 | murf | 2008-03-27 07:03:28 -0600 (Thu, 27 Mar 2008) | 9 lines

These small documentation updates made in response to a query in
asterisk-users, where a user was using Playback, but needed the
features of Background, and had no idea that Background existed,
or that it might provide the features he needed. I thought the
best way to avert these kinds of queries was to provide "See Also"
references in all three of "Background", "Playback", "WaitExten".
Perhaps a project to do this with all related apps is in order.


........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_playback.c
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_playback.c?view=diff&rev=111411&r1=111410&r2=111411
==============================================================================
--- branches/1.6.0/apps/app_playback.c (original)
+++ branches/1.6.0/apps/app_playback.c Thu Mar 27 08:42:39 2008
@@ -55,6 +55,8 @@
 "This application sets the following channel variable upon completion:\n"
 " PLAYBACKSTATUS    The status of the playback attempt as a text string, one of\n"
 "               SUCCESS | FAILED\n"
+"See Also: Background (application) -- for playing soundfiles that are interruptible\n"
+"          WaitExten (application) -- wait for digits from caller, optionally play music on hold\n"
 ;
 
 

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=111411&r1=111410&r2=111411
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Thu Mar 27 08:42:39 2008
@@ -463,6 +463,8 @@
 	"This application sets the following channel variable upon completion:\n"
 	" BACKGROUNDSTATUS    The status of the background attempt as a text string, one of\n"
 	"               SUCCESS | FAILED\n"
+	"See Also: Playback (application) -- Play sound file(s) to the channel,\n"
+	"                                    that cannot be interrupted\n"
 	},
 
 	{ "Busy", pbx_builtin_busy,
@@ -674,6 +676,7 @@
 	"  Options:\n"
 	"    m[(x)] - Provide music on hold to the caller while waiting for an extension.\n"
 	"               Optionally, specify the class for music on hold within parenthesis.\n"
+	"See Also: Playback(application), Background(application).\n"
 	},
 
 	{ "KeepAlive", pbx_builtin_keepalive,