[asterisk-commits] murf: trunk r59190 - in /trunk: ./ apps/app_macro.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Fri Mar 23 11:17:57 2007
New Revision: 59190

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

................
r59188 | murf | 2007-03-23 10:09:01 -0600 (Fri, 23 Mar 2007) | 9 lines

Merged revisions 59186 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59186 | murf | 2007-03-23 09:57:26 -0600 (Fri, 23 Mar 2007) | 1 line

Added a few words in the Macro doc strings about the behavior of macros with hangups (et al.), as per 9337
........

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

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

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

Modified: trunk/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_macro.c?view=diff&rev=59190&r1=59189&r2=59190
==============================================================================
--- trunk/apps/app_macro.c (original)
+++ trunk/apps/app_macro.c Fri Mar 23 11:17:57 2007
@@ -61,6 +61,11 @@
 "will be returned at the location of the Goto.\n"
 "If ${MACRO_OFFSET} is set at termination, Macro will attempt to continue\n"
 "at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n"
+"Extensions: While a macro is being executed, it becomes the current context.\n"
+"            This means that if a hangup occurs, for instance, that the macro\n"
+"            will be searched for an 'h' extension, NOT the context from which\n"
+"            the macro was called. So, make sure to define all appropriate\n"
+"            extensions in your macro! (Note: AEL does not use macros)\n"
 "WARNING: Because of the way Macro is implemented (it executes the priorities\n"
 "         contained within it via sub-engine), and a fixed per-thread\n"
 "         memory stack allowance, macros are limited to 7 levels\n"