[asterisk-commits] newtonr: trunk r399071 - in /trunk: ./ res/res_pjsip_endpoint_identifier_ip.c

[SVN commits to the Asterisk project]

Author: newtonr
Date: Fri Sep 13 09:27:54 2013
New Revision: 399071

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399071
Log:
Broke the build! Forgot para tags within my description.

https://bamboo.asterisk.org/bamboo/browse/AST-ATRUNKBUILD-304
........

Merged revisions 399064 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_endpoint_identifier_ip.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Fri Sep 13 09:27:54 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399049
+/branches/12:1-398558,398560-398577,398579-398927,398938,398991,399017,399019,399021,399031,399064

Modified: trunk/res/res_pjsip_endpoint_identifier_ip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_endpoint_identifier_ip.c?view=diff&rev=399071&r1=399070&r2=399071
==============================================================================
--- trunk/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ trunk/res/res_pjsip_endpoint_identifier_ip.c Fri Sep 13 09:27:54 2013
@@ -41,12 +41,12 @@
 				</configOption>
 				<configOption name="match">
 					<synopsis>IP addresses or networks to match against</synopsis>
-					<description>
+					<description><para>
 						The value is a comma-delimited list of IP addresses. IP addresses may
 						have a subnet mask appended. The subnet mask may be written in either
 						CIDR or dot-decimal notation. Separate the IP address and subnet
 						mask with a slash ('/')
-					</description>
+					</para></description>
 				</configOption>
 				<configOption name="type">
 					<synopsis>Must be of type 'identify'.</synopsis>