[asterisk-commits] dlee: branch dlee/json_main r383330 - in /team/dlee/json_main: ./ main/

[SVN commits to the Asterisk project]

Author: dlee
Date: Mon Mar 18 15:16:23 2013
New Revision: 383330

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383330
Log:
Fixed docs.

* Fixed CHANGES file to reflect Exten/Extension changes
* Added <syntax> tag to userevent doc

Modified:
    team/dlee/json_main/CHANGES
    team/dlee/json_main/main/manager_channels.c

Modified: team/dlee/json_main/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/dlee/json_main/CHANGES?view=diff&rev=383330&r1=383329&r2=383330
==============================================================================
--- team/dlee/json_main/CHANGES (original)
+++ team/dlee/json_main/CHANGES Mon Mar 18 15:16:23 2013
@@ -44,8 +44,8 @@
  * Channel related events now contain a snapshot of channel state, adding new
    fields to many of these events.
 
- * The AMI event 'Newchannel' field 'Exten' is deprecated, and may be removed in
-   a future release. Please use the common 'Extension' field instead.
+ * The AMI event 'Newexten' field 'Extension' is deprecated, and may be removed
+   in a future release. Please use the common 'Exten' field instead.
 
  * The AMI event 'UserEvent' from app_userevent now contains the channel state
    fields. The channel state fields will come before the body fields.

Modified: team/dlee/json_main/main/manager_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/json_main/main/manager_channels.c?view=diff&rev=383330&r1=383329&r2=383330
==============================================================================
--- team/dlee/json_main/main/manager_channels.c (original)
+++ team/dlee/json_main/main/manager_channels.c Mon Mar 18 15:16:23 2013
@@ -329,10 +329,12 @@
 	/*** DOCUMENTATION
 		<managerEventInstance>
 			<synopsis>A user defined event raised from the dialplan.</synopsis>
-			<xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
-			<parameter name="UserEvent">
-				<para>The event name, as specified in the dialplan.</para>
-			</parameter>
+			<syntax>
+				<xi:include xpointer="xpointer(/docs/managerEvent[@name='Newchannel']/managerEventInstance/syntax/parameter)" />
+				<parameter name="UserEvent">
+					<para>The event name, as specified in the dialplan.</para>
+				</parameter>
+			</syntax>
 			<see-also>
 				<ref type="application">UserEvent</ref>
 			</see-also>