[asterisk-commits] elguero: trunk r402117 - in /trunk: ./ UPGRADE-11.txt UPGRADE-12.txt

[SVN commits to the Asterisk project]

Author: elguero
Date: Mon Oct 28 10:08:00 2013
New Revision: 402117

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=402117
Log:
Fix UPGRADE.txt Due To Merging From Branch 11

When merging in the patch for ASTERISK-22728, the UPGRADE.txt file was changed
incorrectly.  That change should have gone into ASTERISK-11.txt.

This commit is to fix that.

Also, another comment in the UPGRADE-11.txt was missing and this commit adds
that as well.
........

Merged revisions 402115 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/UPGRADE-11.txt
    trunk/UPGRADE-12.txt

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

Modified: trunk/UPGRADE-11.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE-11.txt?view=diff&rev=402117&r1=402116&r2=402117
==============================================================================
--- trunk/UPGRADE-11.txt (original)
+++ trunk/UPGRADE-11.txt Mon Oct 28 10:08:00 2013
@@ -19,6 +19,23 @@
 === UPGRADE-10.txt -- Upgrade info for 1.8 to 10
 ===
 ===========================================================
+
+From 11.6 to 11.7:
+ConfBridge
+ - ConfBridge now has the ability to set the language of announcements to the
+   conference.  The language can be set on a bridge profile in confbridge.conf
+   or by the dialplan function CONFBRIDGE(bridge,language)=en.
+chan_sip - Clarify The "sip show peers" Forcerport Column And Add Comedia
+ - Under the "Forcerport" column, the "N" used to mean NAT (i.e. Yes).  With
+   the additon of auto_* NAT settings, the meaning changed and there was a
+   certain combination of letters added to indicate the current setting. The
+   combination of using "Y", "N", "A" or "a", can be confusing.  Therefore, we
+   now display clearly what the current Forcerport setting is: "Yes", "No",
+   "Auto (Yes)", "Auto (No)".
+ - Since we are clarifying the Forcerport column, we have added a column to
+   display the Comedia setting since this is useful information as well.  We
+   no longer have a simple "NAT" setting like other versions before 11.
+
 From 11.5 to 11.6:
 * res_agi will now properly indicate if there was an error in streaming an
   audio file.  The result code will be -1 and the result returned from the

Modified: trunk/UPGRADE-12.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE-12.txt?view=diff&rev=402117&r1=402116&r2=402117
==============================================================================
--- trunk/UPGRADE-12.txt (original)
+++ trunk/UPGRADE-12.txt Mon Oct 28 10:08:00 2013
@@ -25,16 +25,6 @@
 recommended that you not only read through this document for important
 changes that affect an upgrade, but that you also read through the CHANGES
 document in depth to better understand the new options available to you.
-chan_sip - Clarify The "sip show peers" Forcerport Column And Add Comedia
- - Under the "Forcerport" column, the "N" used to mean NAT (i.e. Yes).  With
-   the additon of auto_* NAT settings, the meaning changed and there was a
-   certain combination of letters added to indicate the current setting. The
-   combination of using "Y", "N", "A" or "a", can be confusing.  Therefore, we
-   now display clearly what the current Forcerport setting is: "Yes", "No",
-   "Auto (Yes)", "Auto (No)".
- - Since we are clarifying the Forcerport column, we have added a column to
-   display the Comedia setting since this is useful information as well.  We
-   no longer have a simple "NAT" setting like other versions before 11.
 
 Additional information on the architectural changes made in Asterisk can be
 found on the Asterisk wiki (https://wiki.asterisk.org)