From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 14 Sep 2010 15:31:51 +0000 (+0000)
Subject: Merged revisions 286647 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fa454010ea4c04b203345464484c640f4914277;p=thirdparty%2Fasterisk.git

Merged revisions 286647 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r286647 | rmudgett | 2010-09-14 10:30:49 -0500 (Tue, 14 Sep 2010) | 1 line

  Corrected documented CONNECTED_LINE and REDIRECTING party manipulation macro names.
........


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

diff --git a/doc/tex/channelvariables.tex b/doc/tex/channelvariables.tex
index a493e05fbe..d0aeae6ea2 100644
--- a/doc/tex/channelvariables.tex
+++ b/doc/tex/channelvariables.tex
@@ -1046,21 +1046,21 @@ ${OSPOUTAUDIOQOS}       The outbound call leg audio QoS string.
 
 \subsection{Digit manipulation}
 \begin{verbatim}
-${REDIRECTING_SEND_CALLEE_MACRO}
+${REDIRECTING_CALLEE_SEND_MACRO}
   Macro to call before sending a redirecting update to the callee
-${REDIRECTING_SEND_CALLEE_MACRO_ARGS}
-  Arguments to pass to ${REDIRECTING_SEND_CALLEE_MACRO}
-${REDIRECTING_SEND_CALLER_MACRO}
+${REDIRECTING_CALLEE_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLEE_SEND_MACRO}
+${REDIRECTING_CALLER_SEND_MACRO}
   Macro to call before sending a redirecting update to the caller
-${REDIRECTING_SEND_CALLER_MACRO_ARGS}
-  Arguments to pass to ${REDIRECTING_SEND_CALLER_MACRO}
+${REDIRECTING_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLER_SEND_MACRO}
 
-${CONNECTED_LINE_SEND_CALLEE_MACRO}
+${CONNECTED_LINE_CALLEE_SEND_MACRO}
   Macro to call before sending a connected line update to the callee
-${CONNECTED_LINE_SEND_CALLEE_MACRO_ARGS}
-  Arguments to pass to ${CONNECTED_LINE_SEND_CALLEE_MACRO}
-${CONNECTED_LINE_SEND_CALLER_MACRO}
+${CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS}
+  Arguments to pass to ${CONNECTED_LINE_CALLEE_SEND_MACRO}
+${CONNECTED_LINE_CALLER_SEND_MACRO}
   Macro to call before sending a connected line update to the caller
-${CONNECTED_LINE_SEND_CALLER_MACRO_ARGS}
-  Arguments to pass to ${CONNECTED_LINE_SEND_CALLER_MACRO}
+${CONNECTED_LINE_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${CONNECTED_LINE_CALLER_SEND_MACRO}
 \end{verbatim}
diff --git a/doc/tex/partymanip.tex b/doc/tex/partymanip.tex
index 2ca05569f2..a356e4fc7a 100644
--- a/doc/tex/partymanip.tex
+++ b/doc/tex/partymanip.tex
@@ -164,28 +164,28 @@ useful for the interception macros to provide some information about where
 the information originally came from.
 
 \begin{verbatim}
-${REDIRECTING_SEND_CALLEE_MACRO}
+${REDIRECTING_CALLEE_SEND_MACRO}
   Macro to call before sending a redirecting update to the callee.
   This macro may never be needed since the redirecting updates
   should only go from the callee to the caller direction.  It is
   available for completeness.
-${REDIRECTING_SEND_CALLEE_MACRO_ARGS}
-  Arguments to pass to ${REDIRECTING_SEND_CALLEE_MACRO}.
+${REDIRECTING_CALLEE_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLEE_SEND_MACRO}.
 
-${REDIRECTING_SEND_CALLER_MACRO}
+${REDIRECTING_CALLER_SEND_MACRO}
   Macro to call before sending a redirecting update to the caller.
-${REDIRECTING_SEND_CALLER_MACRO_ARGS}
-  Arguments to pass to ${REDIRECTING_SEND_CALLER_MACRO}.
+${REDIRECTING_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLER_SEND_MACRO}.
 
-${CONNECTED_LINE_SEND_CALLEE_MACRO}
+${CONNECTED_LINE_CALLEE_SEND_MACRO}
   Macro to call before sending a connected line update to the callee.
-${CONNECTED_LINE_SEND_CALLEE_MACRO_ARGS}
-  Arguments to pass to ${CONNECTED_LINE_SEND_CALLEE_MACRO}.
+${CONNECTED_LINE_CALLEE_SEND_MACRO_ARGS}
+  Arguments to pass to ${CONNECTED_LINE_CALLEE_SEND_MACRO}.
 
-${CONNECTED_LINE_SEND_CALLER_MACRO}
+${CONNECTED_LINE_CALLER_SEND_MACRO}
   Macro to call before sending a connected line update to the caller.
-${CONNECTED_LINE_SEND_CALLER_MACRO_ARGS}
-  Arguments to pass to ${CONNECTED_LINE_SEND_CALLER_MACRO}.
+${CONNECTED_LINE_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${CONNECTED_LINE_CALLER_SEND_MACRO}.
 \end{verbatim}
 
 \section{Manipulation examples}