aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-23 16:09:01 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-23 16:09:01 +0000
commitc1c45f8908a422a925541281325c4e1434ba5d9a (patch)
tree11f4ab256ead11acae5735ad02ecedc48f35275c
parent08002568d5959a7bf73394b4175d999d896aed5a (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@59188 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_macro.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 64becf029..2b23b29c9 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! (you can use 'catch' in AEL) \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"