Author: rmudgett Date: Fri Oct 3 16:58:03 2014 New Revision: 424530 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424530 Log: res_pjsip: Fix XML typo and update CHANGES.
ASTERISK-24199 ........ Merged revisions 424528 from http://svn.asterisk.org/svn/asterisk/branches/12 ........ Merged revisions 424529 from http://svn.asterisk.org/svn/asterisk/branches/13 Modified: trunk/ (props changed) trunk/CHANGES trunk/res/res_pjsip.c Propchange: trunk/ ------------------------------------------------------------------------------ Binary property 'branch-13-merged' - no diff available. Modified: trunk/CHANGES URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=424530&r1=424529&r2=424530 ============================================================================== --- trunk/CHANGES (original) +++ trunk/CHANGES Fri Oct 3 16:58:03 2014 @@ -240,6 +240,12 @@ ------------------ * This module was deprecated and has been removed. Users of chan_jingle should use chan_motif. + +chan_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. chan_sip ------------------ Modified: trunk/res/res_pjsip.c URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip.c?view=diff&rev=424530&r1=424529&r2=424530 ============================================================================== --- trunk/res/res_pjsip.c (original) +++ trunk/res/res_pjsip.c Fri Oct 3 16:58:03 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 -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
