[svn-commits] rmudgett: branch 12 r424528 - in /branches/12: UPGRADE.txt res/res_pjsip.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri Oct  3 16:51:17 2014
New Revision: 424528

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424528
Log:
res_pjsip: Fix XML typo and update UPGRADE.txt.

ASTERISK-24199

Modified:
    branches/12/UPGRADE.txt
    branches/12/res/res_pjsip.c

Modified: branches/12/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/branches/12/UPGRADE.txt?view=diff&rev=424528&r1=424527&r2=424528
==============================================================================
--- branches/12/UPGRADE.txt (original)
+++ branches/12/UPGRADE.txt Fri Oct  3 16:51:17 2014
@@ -20,6 +20,13 @@
 === UPGRADE-11.txt  -- Upgrade info for 10 to 11
 ===
 ===========================================================
+
+From 12.6.0 to 12.7.0:
+
+PJSIP:
+ - Added the CLI command 'pjsip list ciphers' so a user can know what
+   OpenSSL names are available on their system for the pjsip.conf cipher
+   option.
 
 From 12.5.0 to 12.6.0:
 

Modified: branches/12/res/res_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip.c?view=diff&rev=424528&r1=424527&r2=424528
==============================================================================
--- branches/12/res/res_pjsip.c (original)
+++ branches/12/res/res_pjsip.c Fri Oct  3 16:51:17 2014
@@ -823,7 +823,7 @@
 					<synopsis>Preferred cryptography cipher names (TLS ONLY)</synopsis>
 					<description>
 					<para>Comma separated list of cipher names or numeric equivalents.
-						Numeric quivalents can be either decimal or hexadecimal (0xX).
+						Numeric equivalents can be either decimal or hexadecimal (0xX).
 					</para>
 					<para>There are many cipher names.  Use the CLI command
 						<literal>pjsip list ciphers</literal> to see a list of cipher