[asterisk-commits] tilghman: branch 1.6.0 r186805 - in /branches/1.6.0: ./ apps/app_macro.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Apr  7 17:30:27 2009
New Revision: 186805

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

................
  r186799 | tilghman | 2009-04-07 17:23:46 -0500 (Tue, 07 Apr 2009) | 10 lines
  
  Merged revisions 186775 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r186775 | tilghman | 2009-04-07 17:16:50 -0500 (Tue, 07 Apr 2009) | 3 lines
    
    Fix Macro documentation to match current (and intended) behavior.
    (See -dev mailing list)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_macro.c

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

Modified: branches/1.6.0/apps/app_macro.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/apps/app_macro.c?view=diff&rev=186805&r1=186804&r2=186805
==============================================================================
--- branches/1.6.0/apps/app_macro.c (original)
+++ branches/1.6.0/apps/app_macro.c Tue Apr  7 17:30:27 2009
@@ -46,26 +46,22 @@
 "  Macro(macroname,arg1,arg2...): Executes a macro using the context\n"
 "'macro-<macroname>', jumping to the 's' extension of that context and\n"
 "executing each step, then returning when the steps end. \n"
-"The calling extension, context, and priority are stored in ${MACRO_EXTEN}, \n"
+"The calling extension, context, and priority are stored in ${MACRO_EXTEN},\n"
 "${MACRO_CONTEXT} and ${MACRO_PRIORITY} respectively.  Arguments become\n"
 "${ARG1}, ${ARG2}, etc in the macro context.\n"
 "If you Goto out of the Macro context, the Macro will terminate and control\n"
 "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"
-"         of nesting (macro calling macro calling macro, etc.); It\n"
-"         may be possible that stack-intensive applications in deeply nested macros\n"
-"         could cause asterisk to crash earlier than this limit. It is advised that\n"
-"         if you need to deeply nest macro calls, that you use the Gosub application\n"
-"         (now allows arguments like a Macro) with explict Return() calls instead.\n";
+"         contained within it via sub-engine), and a fixed per-thread memory\n"
+"         stack allowance, macros are limited to 7 levels of nesting (macro\n"
+"         calling macro calling macro, etc.). It may be possible that\n"
+"         stack-intensive applications in deeply nested macros could cause\n"
+"         Asterisk to crash earlier than this limit. It is advised that if you\n"
+"         need to deeply nest macro calls, that you use the Gosub application\n"
+"         (now allows arguments like a Macro) with explict Return() calls\n"
+"         instead.\n";
 
 static char *if_descrip =
 "  MacroIf(<expr>?macroname_a[,arg1][:macroname_b[,arg1]])\n"