From: Steve Murphy Date: Fri, 23 Mar 2007 16:17:57 +0000 (+0000) Subject: Merged revisions 59188 via svnmerge from X-Git-Tag: 1.6.0-beta1~3^2~2972 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=36642f6982eea52e41eae38cbe1d234201133204;p=thirdparty%2Fasterisk.git 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@59190 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_macro.c b/apps/app_macro.c index f34b4df646..ed100ffef2 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -61,6 +61,11 @@ static char *descrip = "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"