[asterisk-commits] rmudgett: trunk r286648 - in /trunk: ./ doc/tex/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Sep 14 10:31:51 2010
New Revision: 286648

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286648
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/doc/tex/channelvariables.tex
    trunk/doc/tex/partymanip.tex

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/doc/tex/channelvariables.tex
URL: http://svnview.digium.com/svn/asterisk/trunk/doc/tex/channelvariables.tex?view=diff&rev=286648&r1=286647&r2=286648
==============================================================================
--- trunk/doc/tex/channelvariables.tex (original)
+++ trunk/doc/tex/channelvariables.tex Tue Sep 14 10:31:51 2010
@@ -1046,21 +1046,21 @@
 
 \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}
-
-${CONNECTED_LINE_SEND_CALLEE_MACRO}
+${REDIRECTING_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLER_SEND_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}
-\end{verbatim}
+${CONNECTED_LINE_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${CONNECTED_LINE_CALLER_SEND_MACRO}
+\end{verbatim}

Modified: trunk/doc/tex/partymanip.tex
URL: http://svnview.digium.com/svn/asterisk/trunk/doc/tex/partymanip.tex?view=diff&rev=286648&r1=286647&r2=286648
==============================================================================
--- trunk/doc/tex/partymanip.tex (original)
+++ trunk/doc/tex/partymanip.tex Tue Sep 14 10:31:51 2010
@@ -164,28 +164,28 @@
 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_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}.
-
-${CONNECTED_LINE_SEND_CALLEE_MACRO}
+${REDIRECTING_CALLER_SEND_MACRO_ARGS}
+  Arguments to pass to ${REDIRECTING_CALLER_SEND_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}
 
 \section{Manipulation examples}