From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 22 Apr 2010 17:38:08 +0000 (+0000)
Subject: Merged revisions 258515 via svnmerge from
X-Git-Tag: 1.6.2.8-rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ab2543fda7b84e23b499b72f2657dc8c43a2e87;p=thirdparty%2Fasterisk.git

Merged revisions 258515 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r258515 | russell | 2010-04-22 12:36:34 -0500 (Thu, 22 Apr 2010) | 2 lines

  Add MEETMEBOOKID from r256019.
........


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

diff --git a/doc/tex/channelvariables.tex b/doc/tex/channelvariables.tex
index 353a518606..90eba97471 100644
--- a/doc/tex/channelvariables.tex
+++ b/doc/tex/channelvariables.tex
@@ -876,6 +876,7 @@ ${MEETMESECS}              * Number of seconds a user participated in a MeetMe c
 ${CONF_LIMIT_TIMEOUT_FILE}   File to play when time is up.  Used with the L() option.
 ${CONF_LIMIT_WARNING_FILE}   File to play as warning if 'y' is defined.
                              The default is to say the time remaining.  Used with the L() option.
+${MEETMEBOOKID}            * This variable exposes the bookid column for a realtime configured conference bridge.
 \end{verbatim}
 
 \subsection{The VoiceMail() application}