[asterisk-commits] mmichelson: branch mmichelson/rls-config r416735 - in /team/mmichelson/rls-co...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Jun 19 14:38:36 2014
New Revision: 416735

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416735
Log:
Try resetting the automerge property again.


Modified:
    team/mmichelson/rls-config/   (props changed)
    team/mmichelson/rls-config/res/res_pjsip_pubsub.c

Propchange: team/mmichelson/rls-config/
------------------------------------------------------------------------------
    automerge = *

Modified: team/mmichelson/rls-config/res/res_pjsip_pubsub.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/rls-config/res/res_pjsip_pubsub.c?view=diff&rev=416735&r1=416734&r2=416735
==============================================================================
--- team/mmichelson/rls-config/res/res_pjsip_pubsub.c (original)
+++ team/mmichelson/rls-config/res/res_pjsip_pubsub.c Thu Jun 19 14:38:36 2014
@@ -147,8 +147,8 @@
 					<synopsis>The name of a resource to report state on</synopsis>
 					<description>
 						<para>In general Asterisk looks up list items in the following way:</para>
-						<para>1. Check if the list item refers to another configured resource list.
-						2. Pass the name of the resource off to event-package-specific handlers
+						<para>1. Check if the list item refers to another configured resource list.</para>
+						<para>2. Pass the name of the resource off to event-package-specific handlers
 						   to find the specified resource.</para>
 						<para>The second part means that the way the list item is specified depends
 						on what type of list this is. For instance, if you have the <replaceable>event</replaceable>