res_pjsip: Fix XML typo and update CHANGES.
authorRichard Mudgett <rmudgett@digium.com>
Fri, 3 Oct 2014 21:58:03 +0000 (21:58 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 3 Oct 2014 21:58:03 +0000 (21:58 +0000)
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

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

CHANGES
res/res_pjsip.c

diff --git a/CHANGES b/CHANGES
index 7a36f96..3bef611 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -241,6 +241,12 @@ chan_jingle
  * 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
 ------------------
  * The SIPPEER dialplan function no longer supports using a colon as a
index bbcf543..69feaba 100644 (file)
                                        <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