[asterisk-commits] tilghman: branch 1.6.2 r186807 - in /branches/1.6.2: ./ apps/app_macro.c

Tue Apr 7 17:33:41 CDT 2009

Author: tilghman
Date: Tue Apr  7 17:33:38 2009
New Revision: 186807

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=186807
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.2/   (props changed)
    branches/1.6.2/apps/app_macro.c

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

Modified: branches/1.6.2/apps/app_macro.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/apps/app_macro.c?view=diff&rev=186807&r1=186806&r2=186807
==============================================================================

--- branches/1.6.2/apps/app_macro.c (original)
+++ branches/1.6.2/apps/app_macro.c Tue Apr  7 17:33:38 2009
@@ -62,10 +62,6 @@
 			at the location of the Goto.</para>
 			<para>If <variable>MACRO_OFFSET</variable> is set at termination, Macro will attempt to continue
 			at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.</para>
-			<para>Extensions: While a macro is being executed, it becomes the current context. This means that if
-			a hangup occurs, for instance, that the macro will be searched for an <literal>h</literal> extension,
-			NOT the context from which the macro was called. So, make sure to define all appropriate extensions
-			in your macro! (Note: AEL does not use macros)</para>
 			<warning><para>Because of the way Macro is implemented (it executes the priorities contained within
 			it via sub-engine), and a fixed per-thread memory stack allowance, macros are limited to 7 levels
 			of nesting (macro calling macro calling macro, etc.); It may be possible that stack-intensive


