diff options
author | Michael L. Young <elgueromexicano@gmail.com> | 2013-10-28 15:08:00 +0000 |
---|---|---|
committer | Michael L. Young <elgueromexicano@gmail.com> | 2013-10-28 15:08:00 +0000 |
commit | fead41381bff772df7828d8f6df789d7a5b5d34e (patch) | |
tree | 331fd6afbf8fc765f0f407d8db1112511822c6f1 /UPGRADE-12.txt | |
parent | 230141d677043f3cd9330c43291c5c2b35aa5bc8 (diff) |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@402117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'UPGRADE-12.txt')
-rw-r--r-- | UPGRADE-12.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/UPGRADE-12.txt b/UPGRADE-12.txt index 8652320c4..426b1a979 100644 --- a/UPGRADE-12.txt +++ b/UPGRADE-12.txt @@ -25,16 +25,6 @@ There are many significant architectural changes in Asterisk 12. It is 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) |