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

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Sep  2 11:35:39 2010
New Revision: 284699

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284699
Log:
Merged revisions 284698 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284698 | rmudgett | 2010-09-02 11:34:32 -0500 (Thu, 02 Sep 2010) | 5 lines
  
  Added documentation for CONNECTEDLINE and REDIRECTING functions.
  
  (closes issue #17808)
  Reported by: jtodd
........

Added:
    trunk/doc/tex/partymanip.tex
      - copied unchanged from r284698, branches/1.8/doc/tex/partymanip.tex
Modified:
    trunk/   (props changed)
    trunk/doc/tex/asterisk.tex
    trunk/doc/tex/channelvariables.tex

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

Modified: trunk/doc/tex/asterisk.tex
URL: http://svnview.digium.com/svn/asterisk/trunk/doc/tex/asterisk.tex?view=diff&rev=284699&r1=284698&r2=284699
==============================================================================
--- trunk/doc/tex/asterisk.tex (original)
+++ trunk/doc/tex/asterisk.tex Thu Sep  2 11:35:39 2010
@@ -151,6 +151,9 @@
 \chapter{Secure Calls}
   \input{secure-calls.tex}
 
+\chapter{Manipulating Party ID Information}
+  \input{partymanip.tex}
+
 \chapter{Call Completion Supplementary Services}
   \input{ccss.tex}
 

Modified: trunk/doc/tex/channelvariables.tex
URL: http://svnview.digium.com/svn/asterisk/trunk/doc/tex/channelvariables.tex?view=diff&rev=284699&r1=284698&r2=284699
==============================================================================
--- trunk/doc/tex/channelvariables.tex (original)
+++ trunk/doc/tex/channelvariables.tex Thu Sep  2 11:35:39 2010
@@ -1044,10 +1044,23 @@
 ${OSPOUTAUDIOQOS}       The outbound call leg audio QoS string.
 \end{verbatim}
 
-\subsection{Connected line digit manipulation}
-\begin{verbatim}
-${CONNECTED_LINE_SEND_CALLEE_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}        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}
+\subsection{Digit manipulation}
+\begin{verbatim}
+${REDIRECTING_SEND_CALLEE_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}
+  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}
+  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}
+  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}