From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 3 Oct 2014 21:51:17 +0000 (+0000)
Subject: res_pjsip: Fix XML typo and update UPGRADE.txt.
X-Git-Tag: 12.7.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5629ed3d4142323a9120091ab0cf7f2f1528965b;p=thirdparty%2Fasterisk.git

res_pjsip: Fix XML typo and update UPGRADE.txt.

ASTERISK-24199


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

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 3f9d576e00..3262d769d3 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -21,6 +21,13 @@
 ===
 ===========================================================
 
+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:
 
 ConfBridge:
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 886366482e..334c63a1fd 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -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