From 15ea82738671d6a4785edcb2acb01e85c478a9d0 Mon Sep 17 00:00:00 2001
From: eliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 18 May 2009 14:54:38 +0000
Subject: Merged revisions 195162 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

........
  r195162 | eliel | 2009-05-18 10:45:23 -0400 (Mon, 18 May 2009) | 9 lines

  Warn about the use of the application WaitExten() within a Macro().

  Update applications documentation to warn the user about the use of the
  WaitExten() application within a Macro(). Recommend the use of Read()
  instead.

  (closes issue #14444)
  Reported by: ewieling
........


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@195164 f38db490-d61c-443f-a65b-d21fe96a405b
---
 apps/app_dial.c  | 3 +++
 apps/app_macro.c | 5 +++++
 2 files changed, 8 insertions(+)

(limited to 'apps')

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 94f623c73..ca3c45a22 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -248,6 +248,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 						with this option. Also, pbx services are not run on the peer (called) channel,
 						so you will not be able to set timeouts via the TIMEOUT() function in this macro.</para>
 					</note>
+					<warning><para>Be aware of the limitations that macros have, specifically with regards to use of
+					the <literal>WaitExten</literal> application. For more information, see the documentation for
+					Macro()</para></warning>
 				</option>
 				<option name="n">
 					<para>This option is a modifier for the call screening/privacy mode. (See the 
diff --git a/apps/app_macro.c b/apps/app_macro.c
index dfbd3b12c..0a489dab3 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -68,6 +68,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			applications in deeply nested macros could cause asterisk to crash earlier than this limit.
 			It is advised that if you need to deeply nest macro calls, that you use the Gosub application
 			(now allows arguments like a Macro) with explict Return() calls instead.</para></warning>
+			<warning><para>Use of the application <literal>WaitExten</literal> within a macro will not function
+			as expected. Please use the <literal>Read</literal> application in order to read DTMF from a channel
+			currently executing a macro.</para></warning>
 		</description>
 		<see-also>
 			<ref type="application">MacroExit</ref>
@@ -97,6 +100,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			<replaceable>expr</replaceable> is true (otherwise <replaceable>macroiffalse</replaceable>
 			if provided)</para>
 			<para>Arguments and return values as in application Macro()</para>
+			<xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
 		</description>
 		<see-also>
 			<ref type="application">GotoIf</ref>
@@ -120,6 +124,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 			Only one call at a time may run the macro. (we'll wait if another call is busy
 			executing in the Macro)</para>
 			<para>Arguments and return values as in application Macro()</para>
+			<xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
 		</description>
 		<see-also>
 			<ref type="application">Macro</ref>
-- 
cgit v1.2.3