[asterisk-commits] tilghman: trunk r334236 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Sep  1 12:41:09 2011
New Revision: 334236

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

................
  r334235 | tilghman | 2011-09-01 12:39:32 -0500 (Thu, 01 Sep 2011) | 9 lines
  
  Merged revisions 334234 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334234 | tilghman | 2011-09-01 12:38:33 -0500 (Thu, 01 Sep 2011) | 2 lines
    
    Remove 1.6 compatibility documentation from 1.8, as it no longer applies.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

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

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=334236&r1=334235&r2=334236
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Sep  1 12:41:09 2011
@@ -584,10 +584,9 @@
 			If the variable name is prefixed with <literal>__</literal>, the variable will be
 			inherited into channels created from the current channel and all children channels.</para>
 			<note><para>If (and only if), in <filename>/etc/asterisk/asterisk.conf</filename>, you have
-			a <literal>[compat]</literal> category, and you have <literal>app_set = 1.6</literal> under that,then
-			the behavior of this app changes, and does not strip surrounding quotes from the right hand side as
-			it did previously in 1.4. The <literal>app_set = 1.6</literal> is only inserted if <literal>make samples</literal>
-			is executed, or if users insert this by hand into the <filename>asterisk.conf</filename> file.
+			a <literal>[compat]</literal> category, and you have <literal>app_set = 1.4</literal> under that, then
+			the behavior of this app changes, and strips surrounding quotes from the right hand side as
+			it did previously in 1.4.
 			The advantages of not stripping out quoting, and not caring about the separator characters (comma and vertical bar)
 			were sufficient to make these changes in 1.6. Confusion about how many backslashes would be needed to properly
 			protect separators and quotes in various database access strings has been greatly