aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authoreliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 14:54:38 +0000
committereliel <eliel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-05-18 14:54:38 +0000
commit15ea82738671d6a4785edcb2acb01e85c478a9d0 (patch)
tree0362469302013e2031f81c6c623f285b212cb3e1 /main
parenta243655fb337094af26109e5422d111385b7f681 (diff)
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
Diffstat (limited to 'main')
-rw-r--r--main/pbx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 256e9c37f..f11978b64 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -679,6 +679,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
<description>
<para>This application waits for the user to enter a new extension for a specified number
of <replaceable>seconds</replaceable>.</para>
+ <xi:include xpointer="xpointer(/docs/application[@name='Macro']/description/warning[2])" />
</description>
<see-also>
<ref type="application">Background</ref>