Merged revisions 334235 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 1 Sep 2011 17:41:09 +0000 (17:41 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 1 Sep 2011 17:41:09 +0000 (17:41 +0000)
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.
  ........
................

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

main/pbx.c

index e0fa318..8204cb5 100644 (file)
@@ -584,10 +584,9 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
                        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