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

[SVN commits to the Asterisk project]

Author: newtonr
Date: Fri Sep 13 08:28:26 2013
New Revision: 399032

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=399032
Log:
'identify' configObject doesn't have a synopsis

Add a straightforward synopsis and description to the identify config object
in XML documentation.

(issue ASTERISK-22311)
(closes issue ASTERISK-22311)
Reported By: Rusty Newton
........

Merged revisions 399031 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 08:28:26 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-398927,398938,398991,399017,399019,399021
+/branches/12:1-398558,398560-398577,398579-398927,398938,398991,399017,399019,399021,399031

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=399032&r1=399031&r2=399032
==============================================================================
--- trunk/res/res_pjsip_endpoint_identifier_ip.c (original)
+++ trunk/res/res_pjsip_endpoint_identifier_ip.c Fri Sep 13 08:28:26 2013
@@ -35,11 +35,18 @@
 		<synopsis>Module that identifies endpoints via source IP address</synopsis>
 		<configFile name="pjsip.conf">
 			<configObject name="identify">
+				<synopsis>Identifies endpoints via source IP address</synopsis>
 				<configOption name="endpoint">
 					<synopsis>Name of Endpoint</synopsis>
 				</configOption>
 				<configOption name="match">
 					<synopsis>IP addresses or networks to match against</synopsis>
+					<description>
+						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>
 				</configOption>
 				<configOption name="type">
 					<synopsis>Must be of type 'identify'.</synopsis>