Merged revisions 229228 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r229228 | diruggles | 2009-11-10 12:33:47 -0500 (Tue, 10 Nov 2009) | 18 lines

  Merged revisions 229191 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r229191 | diruggles | 2009-11-10 12:23:59 -0500 (Tue, 10 Nov 2009) | 11 lines

    Document ExternalIVR event tag collision

    ExternalIVR uses the D tag for two different event types. This documents that
    behavior and how to differentiate between the two cases. Also includes a minor
    spelling fix and clarification

    (closes issue #16211)
    Reported by: thedavidfactor
    Patches:
          externalivr.txt.20091109.1507.patch uploaded by thedavidfactor (license 903)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229229 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/doc/externalivr.txt b/doc/externalivr.txt
index 73fb5820fa3296d1461564265709c4e0e8800db2..b675dafb12d70cc97ccb5785afbd5bf4e0406d74 100644 (file)
--- a/doc/externalivr.txt
+++ b/doc/externalivr.txt
@@ -44,7 +44,7 @@ DTMF (and other) events
 
 All events will be newline-terminated strings.
 
-Events send to the child's stdin will be in the following format:
+Events sent to the child's stdin will be in the following format:
 
 tag,timestamp[,data]
 
@@ -58,9 +58,11 @@ H: the channel was hung up by the connected party
 E: the script requested an exit
 Z: the previous command was unable to be executed (file does not
 exist, etc.)
-T: the play list was interrupted (see below)
+T: the play list was interrupted (see S command below)
 D: a file was dropped from the play list due to interruption (the
-data element will be the dropped file name)
+data element will be the dropped file name) NOTE: this tag conflicts
+with the D DTMF event tag. The existence of the data element is used
+to differentiate between the two cases
 F: a file has finished playing (the data element will be the file
 name)