[svn-commits] pabelanger: branch pabelanger/xmldoc r309628 - in /team/pabelanger/xmldoc: ap...

SVN commits to the Digium repositories svn-commits at lists.digium.com
Fri Mar 4 14:37:35 CST 2011


Author: pabelanger
Date: Fri Mar  4 14:37:26 2011
New Revision: 309628

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309628
Log:
s/manager/manager_action/

Modified:
    team/pabelanger/xmldoc/apps/app_meetme.c
    team/pabelanger/xmldoc/apps/app_mixmonitor.c
    team/pabelanger/xmldoc/apps/app_queue.c
    team/pabelanger/xmldoc/apps/app_senddtmf.c
    team/pabelanger/xmldoc/apps/app_voicemail.c
    team/pabelanger/xmldoc/channels/chan_agent.c
    team/pabelanger/xmldoc/channels/chan_dahdi.c
    team/pabelanger/xmldoc/channels/chan_iax2.c
    team/pabelanger/xmldoc/channels/chan_local.c
    team/pabelanger/xmldoc/channels/chan_sip.c
    team/pabelanger/xmldoc/channels/chan_skinny.c
    team/pabelanger/xmldoc/main/data.c
    team/pabelanger/xmldoc/main/db.c
    team/pabelanger/xmldoc/main/features.c
    team/pabelanger/xmldoc/main/manager.c
    team/pabelanger/xmldoc/main/pbx.c
    team/pabelanger/xmldoc/main/xmldoc.c
    team/pabelanger/xmldoc/res/res_agi.c
    team/pabelanger/xmldoc/res/res_jabber.c
    team/pabelanger/xmldoc/res/res_monitor.c
    team/pabelanger/xmldoc/res/res_odbc.c

Modified: team/pabelanger/xmldoc/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/apps/app_meetme.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/apps/app_meetme.c (original)
+++ team/pabelanger/xmldoc/apps/app_meetme.c Fri Mar  4 14:37:26 2011
@@ -469,36 +469,36 @@
 			<ref type="application">MeetMeChannelAdmin</ref>
 		</see-also>
 	</function>
-	<manager name="MeetmeMute" language="en_US">
+	<manager_action name="MeetmeMute" language="en_US">
 		<synopsis>
 			Mute a Meetme user.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Meetme" required="true" />
 			<parameter name="Usernum" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="MeetmeUnmute" language="en_US">
+	</manager_action>
+	<manager_action name="MeetmeUnmute" language="en_US">
 		<synopsis>
 			Unmute a Meetme user.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Meetme" required="true" />
 			<parameter name="Usernum" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="MeetmeList" language="en_US">
+	</manager_action>
+	<manager_action name="MeetmeList" language="en_US">
 		<synopsis>
 			List participants in a conference.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Conference" required="false">
 				<para>Conference number.</para>
 			</parameter>
@@ -508,20 +508,20 @@
 			MeetmeList will follow as separate events, followed by a final event called
 			MeetmeListComplete.</para>
 		</description>
-	</manager>
-	<manager name="MeetmeListRooms" language="en_US">
+	</manager_action>
+	<manager_action name="MeetmeListRooms" language="en_US">
 		<synopsis>
 			List active conferences.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Lists data about all active conferences.
 				MeetmeListRooms will follow as separate events, followed by a final event called
 				MeetmeListRoomsComplete.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 #define CONFIG_FILE_NAME "meetme.conf"

Modified: team/pabelanger/xmldoc/apps/app_mixmonitor.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/apps/app_mixmonitor.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/apps/app_mixmonitor.c (original)
+++ team/pabelanger/xmldoc/apps/app_mixmonitor.c Fri Mar  4 14:37:26 2011
@@ -125,12 +125,12 @@
 			<ref type="application">MixMonitor</ref>
 		</see-also>
 	</application>
-	<manager name="MixMonitorMute" language="en_US">
+	<manager_action name="MixMonitorMute" language="en_US">
 		<synopsis>
 			Mute / unMute a Mixmonitor recording.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel" required="true">
 				<para>Used to specify the channel to mute.</para>
 			</parameter>
@@ -144,7 +144,7 @@
 		<description>
 			<para>This action may be used to mute a MixMonitor recording.</para>
 		</description>
-	</manager>
+	</manager_action>
 
  ***/
 

Modified: team/pabelanger/xmldoc/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/apps/app_queue.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/apps/app_queue.c (original)
+++ team/pabelanger/xmldoc/apps/app_queue.c Fri Mar  4 14:37:26 2011
@@ -675,45 +675,45 @@
 			<ref type="function">QUEUE_MEMBER_PENALTY</ref>
 		</see-also>
 	</function>
-	<manager name="Queues" language="en_US">
+	<manager_action name="Queues" language="en_US">
 		<synopsis>
 			Queues.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueStatus" language="en_US">
+	</manager_action>
+	<manager_action name="QueueStatus" language="en_US">
 		<synopsis>
 			Show queue status.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" />
 			<parameter name="Member" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueSummary" language="en_US">
+	</manager_action>
+	<manager_action name="QueueSummary" language="en_US">
 		<synopsis>
 			Show queue summary.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueAdd" language="en_US">
+	</manager_action>
+	<manager_action name="QueueAdd" language="en_US">
 		<synopsis>
 			Add interface to queue.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" required="true" />
 			<parameter name="Interface" required="true" />
 			<parameter name="Penalty" />
@@ -723,25 +723,25 @@
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueRemove" language="en_US">
+	</manager_action>
+	<manager_action name="QueueRemove" language="en_US">
 		<synopsis>
 			Remove interface from queue.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" required="true" />
 			<parameter name="Interface" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueuePause" language="en_US">
+	</manager_action>
+	<manager_action name="QueuePause" language="en_US">
 		<synopsis>
 			Makes a queue member temporarily unavailable.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Interface" required="true" />
 			<parameter name="Paused" required="true" />
 			<parameter name="Queue" />
@@ -749,13 +749,13 @@
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueLog" language="en_US">
+	</manager_action>
+	<manager_action name="QueueLog" language="en_US">
 		<synopsis>
 			Adds custom entry in queue_log.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" required="true" />
 			<parameter name="Event" required="true" />
 			<parameter name="Uniqueid" />
@@ -764,37 +764,37 @@
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueuePenalty" language="en_US">
+	</manager_action>
+	<manager_action name="QueuePenalty" language="en_US">
 		<synopsis>
 			Set the penalty for a queue member.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Interface" required="true" />
 			<parameter name="Penalty" required="true" />
 			<parameter name="Queue" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueRule" language="en_US">
+	</manager_action>
+	<manager_action name="QueueRule" language="en_US">
 		<synopsis>
 			Queue Rules.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Rule" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueReload" language="en_US">
+	</manager_action>
+	<manager_action name="QueueReload" language="en_US">
 		<synopsis>
 			Reload a queue, queues, or any sub-section of a queue or queues.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" />
 			<parameter name="Members">
 				<enumlist>
@@ -817,18 +817,18 @@
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="QueueReset" language="en_US">
+	</manager_action>
+	<manager_action name="QueueReset" language="en_US">
 		<synopsis>
 			Reset queue statistics.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Queue" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 enum {

Modified: team/pabelanger/xmldoc/apps/app_senddtmf.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/apps/app_senddtmf.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/apps/app_senddtmf.c (original)
+++ team/pabelanger/xmldoc/apps/app_senddtmf.c Fri Mar  4 14:37:26 2011
@@ -62,12 +62,12 @@
 			<ref type="application">Read</ref>
 		</see-also>
 	</application>
-	<manager name="PlayDTMF" language="en_US">
+	<manager_action name="PlayDTMF" language="en_US">
 		<synopsis>
 			Play DTMF signal on a specific channel.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel" required="true">
 				<para>Channel name to send digit to.</para>
 			</parameter>
@@ -78,7 +78,7 @@
 		<description>
 			<para>Plays a dtmf digit on the specified channel.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 static char *app = "SendDTMF";
 

Modified: team/pabelanger/xmldoc/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/apps/app_voicemail.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/apps/app_voicemail.c (original)
+++ team/pabelanger/xmldoc/apps/app_voicemail.c Fri Mar  4 14:37:26 2011
@@ -349,16 +349,16 @@
 			context.</para>
 		</description>
 	</function>
-	<manager name="VoicemailUsersList" language="en_US">
+	<manager_action name="VoicemailUsersList" language="en_US">
 		<synopsis>
 			List All Voicemail User Information.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 #ifdef IMAP_STORAGE

Modified: team/pabelanger/xmldoc/channels/chan_agent.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_agent.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_agent.c (original)
+++ team/pabelanger/xmldoc/channels/chan_agent.c Fri Mar  4 14:37:26 2011
@@ -169,23 +169,23 @@
 		</syntax>
 		<description></description>
 	</function>
-	<manager name="Agents" language="en_US">
+	<manager_action name="Agents" language="en_US">
 		<synopsis>
 			Lists agents and their status.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Will list info about all possible agents.</para>
 		</description>
-	</manager>
-	<manager name="AgentLogoff" language="en_US">
+	</manager_action>
+	<manager_action name="AgentLogoff" language="en_US">
 		<synopsis>
 			Sets an agent as no longer logged in.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Agent" required="true">
 				<para>Agent ID of the agent to log off.</para>
 			</parameter>
@@ -196,7 +196,7 @@
 		<description>
 			<para>Sets an agent as no longer logged in.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 static const char tdesc[] = "Call Agent Proxy Channel";

Modified: team/pabelanger/xmldoc/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_dahdi.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_dahdi.c (original)
+++ team/pabelanger/xmldoc/channels/chan_dahdi.c Fri Mar  4 14:37:26 2011
@@ -167,12 +167,12 @@
 			<para>This application will Accept the R2 call either with charge or no charge.</para>
 		</description>
 	</application>
-	<manager name="DAHDITransfer" language="en_US">
+	<manager_action name="DAHDITransfer" language="en_US">
 		<synopsis>
 			Transfer DAHDI Channel.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true">
 				<para>DAHDI channel name to transfer.</para>
 			</parameter>
@@ -180,13 +180,13 @@
 		<description>
 			<para>Transfer a DAHDI channel.</para>
 		</description>
-	</manager>
-	<manager name="DAHDIHangup" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIHangup" language="en_US">
 		<synopsis>
 			Hangup DAHDI Channel.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true">
 				<para>DAHDI channel name to hangup.</para>
 			</parameter>
@@ -194,62 +194,62 @@
 		<description>
 			<para>Hangup a DAHDI channel.</para>
 		</description>
-	</manager>
-	<manager name="DAHDIDialOffhook" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIDialOffhook" language="en_US">
 		<synopsis>
 			Dial over DAHDI channel while offhook.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true" />
 			<parameter name="Number" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DAHDIDNDon" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIDNDon" language="en_US">
 		<synopsis>
 			Toggle DAHDI channel Do Not Disturb status ON.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DAHDIDNDoff" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIDNDoff" language="en_US">
 		<synopsis>
 			Toggle DAHDI channel Do Not Disturb status OFF.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DAHDIShowChannels" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIShowChannels" language="en_US">
 		<synopsis>
 			Show status DAHDI channels.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="DAHDIChannel" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DAHDIRestart" language="en_US">
+	</manager_action>
+	<manager_action name="DAHDIRestart" language="en_US">
 		<synopsis>
 			Fully Restart DAHDI channels (terminates calls).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 #define SMDI_MD_WAIT_TIMEOUT 1500 /* 1.5 seconds */

Modified: team/pabelanger/xmldoc/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_iax2.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_iax2.c (original)
+++ team/pabelanger/xmldoc/channels/chan_iax2.c Fri Mar  4 14:37:26 2011
@@ -178,28 +178,28 @@
 		</syntax>
 		<description></description>
 	</function>
-	<manager name="IAXpeers" language="en_US">
+	<manager_action name="IAXpeers" language="en_US">
 		<synopsis>
 			List IAX peers.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="IAXpeerlist" language="en_US">
+	</manager_action>
+	<manager_action name="IAXpeerlist" language="en_US">
 		<synopsis>
 			List IAX Peers.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>List all the IAX peers.</para>
 		</description>
-	</manager>
-	<manager name="IAXnetstats" language="en_US">
+	</manager_action>
+	<manager_action name="IAXnetstats" language="en_US">
 		<synopsis>
 			Show IAX Netstats.
 		</synopsis>
@@ -207,18 +207,18 @@
 		<description>
 			<para>Show IAX channels network statistics.</para>
 		</description>
-	</manager>
-	<manager name="IAXregistry" language="en_US">
+	</manager_action>
+	<manager_action name="IAXregistry" language="en_US">
 		<synopsis>
 			Show IAX registrations.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Show IAX registrations.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 /* Define SCHED_MULTITHREADED to run the scheduler in a special

Modified: team/pabelanger/xmldoc/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_local.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_local.c (original)
+++ team/pabelanger/xmldoc/channels/chan_local.c Fri Mar  4 14:37:26 2011
@@ -51,12 +51,12 @@
 #include "asterisk/astobj2.h"
 
 /*** DOCUMENTATION
-	<manager name="LocalOptimizeAway" language="en_US">
+	<manager_action name="LocalOptimizeAway" language="en_US">
 		<synopsis>
 			Optimize away a local channel when possible.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel" required="true">
 				<para>The channel name to optimize away.</para>
 			</parameter>
@@ -66,7 +66,7 @@
 			Calling this command on the local channel will clear that flag and allow
 			it to optimize away if it's bridged or when it becomes bridged.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 static const char tdesc[] = "Local Proxy Channel Driver";

Modified: team/pabelanger/xmldoc/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_sip.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_sip.c (original)
+++ team/pabelanger/xmldoc/channels/chan_sip.c Fri Mar  4 14:37:26 2011
@@ -479,25 +479,25 @@
 			Check the <literal>domain=</literal> configuration in <filename>sip.conf</filename>.</para>
 		</description>
 	</function>
-	<manager name="SIPpeers" language="en_US">
+	<manager_action name="SIPpeers" language="en_US">
 		<synopsis>
 			List SIP peers (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Lists SIP peers in text format with details on current status.
 			Peerlist will follow as separate events, followed by a final event called
 			PeerlistComplete.</para>
 		</description>
-	</manager>
-	<manager name="SIPshowpeer" language="en_US">
+	</manager_action>
+	<manager_action name="SIPshowpeer" language="en_US">
 		<synopsis>
 			show SIP peer (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Peer" required="true">
 				<para>The peer name you want to check.</para>
 			</parameter>
@@ -505,13 +505,13 @@
 		<description>
 			<para>Show one SIP peer with details on current status.</para>
 		</description>
-	</manager>
-	<manager name="SIPqualifypeer" language="en_US">
+	</manager_action>
+	<manager_action name="SIPqualifypeer" language="en_US">
 		<synopsis>
 			Qualify SIP peers.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Peer" required="true">
 				<para>The peer name you want to qualify.</para>
 			</parameter>
@@ -519,25 +519,25 @@
 		<description>
 			<para>Qualify a SIP peer.</para>
 		</description>
-	</manager>
-	<manager name="SIPshowregistry" language="en_US">
+	</manager_action>
+	<manager_action name="SIPshowregistry" language="en_US">
 		<synopsis>
 			Show SIP registrations (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Lists all registration requests and status. Registrations will follow as separate
 			events. followed by a final event called RegistrationsComplete.</para>
 		</description>
-	</manager>
-	<manager name="SIPnotify" language="en_US">
+	</manager_action>
+	<manager_action name="SIPnotify" language="en_US">
 		<synopsis>
 			Send a SIP notify.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel" required="true">
 				<para>Peer to receive the notify.</para>
 			</parameter>
@@ -551,7 +551,7 @@
 			<para>All parameters for this event must be specified in the body of this request
 			via multiple Variable: name=value sequences.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 static int min_expiry = DEFAULT_MIN_EXPIRY;        /*!< Minimum accepted registration time */

Modified: team/pabelanger/xmldoc/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/channels/chan_skinny.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/channels/chan_skinny.c (original)
+++ team/pabelanger/xmldoc/channels/chan_skinny.c Fri Mar  4 14:37:26 2011
@@ -72,25 +72,25 @@
 #include "asterisk/linkedlists.h"
 
 /*** DOCUMENTATION
-	<manager name="SKINNYdevices" language="en_US">
+	<manager_action name="SKINNYdevices" language="en_US">
 		<synopsis>
 			List SKINNY devices (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Lists Skinny devices in text format with details on current status.
 			Devicelist will follow as separate events, followed by a final event called
 			DevicelistComplete.</para>
 		</description>
-	</manager>
-	<manager name="SKINNYshowdevice" language="en_US">
+	</manager_action>
+	<manager_action name="SKINNYshowdevice" language="en_US">
 		<synopsis>
 			Show SKINNY device (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Device" required="true">
 				<para>The device name you want to check.</para>
 			</parameter>
@@ -98,26 +98,26 @@
 		<description>
 			<para>Show one SKINNY device with details on current status.</para>
 		</description>
-	</manager>
-	<manager name="SKINNYlines" language="en_US">
+	</manager_action>
+	<manager_action name="SKINNYlines" language="en_US">
 		<synopsis>
 			List SKINNY lines (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Lists Skinny lines in text format with details on current status.
 			Linelist will follow as separate events, followed by a final event called
 			LinelistComplete.</para>
 		</description>
-	</manager>
-	<manager name="SKINNYshowline" language="en_US">
+	</manager_action>
+	<manager_action name="SKINNYshowline" language="en_US">
 		<synopsis>
 			Show SKINNY line (text format).
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Line" required="true">
 				<para>The line name you want to check.</para>
 			</parameter>
@@ -125,7 +125,7 @@
 		<description>
 			<para>Show one SKINNY line with details on current status.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 /* Hack to allow for easy debugging in trunk.

Modified: team/pabelanger/xmldoc/main/data.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/main/data.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/main/data.c (original)
+++ team/pabelanger/xmldoc/main/data.c Fri Mar  4 14:37:26 2011
@@ -43,12 +43,12 @@
 #include "asterisk/frame.h"
 
 /*** DOCUMENTATION
-	<manager name="DataGet" language="en_US">
+	<manager_action name="DataGet" language="en_US">
 		<synopsis>
 			Retrieve the data api tree.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Path" required="true" />
 			<parameter name="Search" />
 			<parameter name="Filter" />
@@ -56,7 +56,7 @@
 		<description>
 			<para>Retrieve the data api tree.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 #define NUM_DATA_NODE_BUCKETS	59

Modified: team/pabelanger/xmldoc/main/db.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/main/db.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/main/db.c (original)
+++ team/pabelanger/xmldoc/main/db.c Fri Mar  4 14:37:26 2011
@@ -49,55 +49,55 @@
 #include "db1-ast/include/db.h"
 
 /*** DOCUMENTATION
-	<manager name="DBGet" language="en_US">
+	<manager_action name="DBGet" language="en_US">
 		<synopsis>
 			Get DB Entry.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Family" required="true" />
 			<parameter name="Key" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DBPut" language="en_US">
+	</manager_action>
+	<manager_action name="DBPut" language="en_US">
 		<synopsis>
 			Put DB entry.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Family" required="true" />
 			<parameter name="Key" required="true" />
 			<parameter name="Val" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DBDel" language="en_US">
+	</manager_action>
+	<manager_action name="DBDel" language="en_US">
 		<synopsis>
 			Delete DB entry.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Family" required="true" />
 			<parameter name="Key" required="true" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
-	<manager name="DBDelTree" language="en_US">
+	</manager_action>
+	<manager_action name="DBDelTree" language="en_US">
 		<synopsis>
 			Delete DB Tree.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Family" required="true" />
 			<parameter name="Key" />
 		</syntax>
 		<description>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 static DB *astdb;

Modified: team/pabelanger/xmldoc/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/main/features.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/main/features.c (original)
+++ team/pabelanger/xmldoc/main/features.c Fri Mar  4 14:37:26 2011
@@ -281,23 +281,23 @@
 			<ref type="application">ParkedCall</ref>
 		</see-also>
 	</application>
-	<manager name="ParkedCalls" language="en_US">
+	<manager_action name="ParkedCalls" language="en_US">
 		<synopsis>
 			List parked calls.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>List parked calls.</para>
 		</description>
-	</manager>
-	<manager name="Park" language="en_US">
+	</manager_action>
+	<manager_action name="Park" language="en_US">
 		<synopsis>
 			Park a channel.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel" required="true">
 				<para>Channel name to park.</para>
 			</parameter>
@@ -314,13 +314,13 @@
 		<description>
 			<para>Park a channel.</para>
 		</description>
-	</manager>
-	<manager name="Bridge" language="en_US">
+	</manager_action>
+	<manager_action name="Bridge" language="en_US">
 		<synopsis>
 			Bridge two channels already in the PBX.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Channel1" required="true">
 				<para>Channel to Bridge to Channel2.</para>
 			</parameter>
@@ -338,7 +338,7 @@
 		<description>
 			<para>Bridge together two channels already in the PBX.</para>
 		</description>
-	</manager>
+	</manager_action>
  ***/
 
 #define DEFAULT_PARK_TIME							45000	/*!< ms */

Modified: team/pabelanger/xmldoc/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/pabelanger/xmldoc/main/manager.c?view=diff&rev=309628&r1=309627&r2=309628
==============================================================================
--- team/pabelanger/xmldoc/main/manager.c (original)
+++ team/pabelanger/xmldoc/main/manager.c Fri Mar  4 14:37:26 2011
@@ -79,24 +79,24 @@
 #include "asterisk/aoc.h"
 
 /*** DOCUMENTATION
-	<manager name="Ping" language="en_US">
+	<manager_action name="Ping" language="en_US">
 		<synopsis>
 			Keepalive command.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>A 'Ping' action will ellicit a 'Pong' response. Used to keep the
 			manager connection open.</para>
 		</description>
-	</manager>
-	<manager name="Events" language="en_US">
+	</manager_action>
+	<manager_action name="Events" language="en_US">
 		<synopsis>
 			Control Event Flow.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="EventMask" required="true">
 				<enumlist>
 					<enum name="on">
@@ -114,19 +114,19 @@
 		<description>
 			<para>Enable/Disable sending of events to this manager client.</para>
 		</description>
-	</manager>
-	<manager name="Logoff" language="en_US">
+	</manager_action>
+	<manager_action name="Logoff" language="en_US">
 		<synopsis>
 			Logoff Manager.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />
 		</syntax>
 		<description>
 			<para>Logoff the current manager session.</para>
 		</description>
-	</manager>
-	<manager name="Login" language="en_US">
+	</manager_action>
+	<manager_action name="Login" language="en_US">
 		<synopsis>
 			Login Manager.
 		</synopsis>
@@ -138,24 +138,24 @@
 		<description>
 			<para>Login Manager.</para>
 		</description>
-	</manager>
-	<manager name="Challenge" language="en_US">
+	</manager_action>
+	<manager_action name="Challenge" language="en_US">
 		<synopsis>
 			Generate Challenge for MD5 Auth.
 		</synopsis>
 		<syntax>
-			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
+			<xi:include xpointer="xpointer(/docs/manager_action[@name='Login']/syntax/parameter[@name='ActionID'])" />

[... 775 lines stripped ...]



More information about the svn-commits mailing list