From: Paul Belanger Date: Wed, 16 Jun 2010 15:07:15 +0000 (+0000) Subject: Merged revisions 270801 via svnmerge from X-Git-Tag: 1.6.2.10-rc1~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09e33984ac67ea3285066d7c1ee834f0882efa7c;p=thirdparty%2Fasterisk.git Merged revisions 270801 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r270801 | pabelanger | 2010-06-16 11:05:11 -0400 (Wed, 16 Jun 2010) | 9 lines Update formatting for channelvariables.tex (closes issue #17511) Reported by: klaus3000 Patches: channelvariables.tex-patch.txt uploaded by klaus3000 (license 65) Tested by: pabelanger ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@270802 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/doc/tex/channelvariables.tex b/doc/tex/channelvariables.tex index 90eba97471..31e5a83ca9 100644 --- a/doc/tex/channelvariables.tex +++ b/doc/tex/channelvariables.tex @@ -288,7 +288,7 @@ with equal precedence are grouped within \{ \} symbols. Exactly the same as the ':' operator, except that the match is not anchored to the beginning of the string. Pardon any similarity to seemingly similar operators in other programming languages! - The ":" and "=\~" operators share the same precedence. + The ":" and "=\verb!~!" operators share the same precedence. \item \verb!expr1 ? expr2 :: expr3! @@ -649,11 +649,11 @@ of possible concern with "legacy" extension.conf files: Basically, if the string or number is null, empty, or '0', a '1' is returned. Otherwise a '0' is returned. -\item Added the '=~' operator, just in case someone is just looking for +\item Added the '=\verb!~!' operator, just in case someone is just looking for match anywhere in the string. The only diff with the ':' is that match doesn't have to be anchored to the beginning of the string. -\item Added the conditional operator 'expr1 ? true\_expr : false\_expr' +\item Added the conditional operator 'expr1 ? true\_expr :: false\_expr' First, all 3 exprs are evaluated, and if expr1 is false, the 'false\_expr' is returned as the result. See above for details.