diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-08-16 12:15:24 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-16 12:15:24 -0500 |
commit | 455bc789013a5f79ff37d68be4b3847173ecaca7 (patch) | |
tree | 2e72b10cc2f1f5b4e9178898a0885e5f1ad8d5ff /channels | |
parent | 5c246771276928722cc1df06cbf6cd597d387e24 (diff) | |
parent | f4e28b3a09d3223fad1c736d59f06abf0667b5fa (diff) |
Merge "Refactor usage pattern of xmldoc info tag." into 13
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
-rw-r--r-- | channels/chan_iax2.c | 2 | ||||
-rw-r--r-- | channels/chan_sip.c | 4 | ||||
-rw-r--r-- | channels/pjsip/dialplan_functions.c | 4 | ||||
-rw-r--r-- | channels/sip/dialplan_functions.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index ac55f5864..2e139a234 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -180,7 +180,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <para>This application will Accept the R2 call either with charge or no charge.</para> </description> </application> - <info name="DAHDICHANNEL" language="en_US" tech="DAHDI"> + <info name="CHANNEL" language="en_US" tech="DAHDI"> <enumlist> <enum name="dahdi_channel"> <para>R/O DAHDI channel related to this channel.</para> diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index bd773fc84..db5e4fa4d 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -213,7 +213,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <para>Gets or sets a variable that is sent to a remote IAX2 peer during call setup.</para> </description> </function> - <info name="IAXCHANNEL" language="en_US" tech="IAX"> + <info name="CHANNEL" language="en_US" tech="IAX"> <enumlist> <enum name="osptoken"> <para>R/O Get the peer's osptoken.</para> diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 9cc6252fd..f58c19e6d 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -568,11 +568,11 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") for all of the sip peers will be retrieved.</para> </description> </manager> - <info name="SIPMessageFromInfo" language="en_US" tech="SIP"> + <info name="MessageFromInfo" language="en_US" tech="SIP"> <para>The <literal>from</literal> parameter can be a configured peer name or in the form of "display-name" <URI>.</para> </info> - <info name="SIPMessageToInfo" language="en_US" tech="SIP"> + <info name="MessageToInfo" language="en_US" tech="SIP"> <para>Specifying a prefix of <literal>sip:</literal> will send the message as a SIP MESSAGE request.</para> </info> diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c index 380a05eed..ecf5105f8 100644 --- a/channels/pjsip/dialplan_functions.c +++ b/channels/pjsip/dialplan_functions.c @@ -109,7 +109,7 @@ <ref type="function">PJSIP_MEDIA_OFFER</ref> </see-also> </function> -<info name="PJSIPCHANNEL" language="en_US" tech="PJSIP"> +<info name="CHANNEL" language="en_US" tech="PJSIP"> <enumlist> <enum name="rtp"> <para>R/O Retrieve media related information.</para> @@ -411,7 +411,7 @@ </enum> </enumlist> </info> -<info name="PJSIPCHANNEL_EXAMPLES" language="en_US" tech="PJSIP"> +<info name="CHANNEL_EXAMPLES" language="en_US" tech="PJSIP"> <example title="PJSIP specific CHANNEL examples"> ; Log the current Call-ID same => n,Log(NOTICE, ${CHANNEL(pjsip,call-id)}) diff --git a/channels/sip/dialplan_functions.c b/channels/sip/dialplan_functions.c index e53981d65..b859c601b 100644 --- a/channels/sip/dialplan_functions.c +++ b/channels/sip/dialplan_functions.c @@ -24,7 +24,7 @@ ***/ /*** DOCUMENTATION -<info name="SIPCHANNEL" language="en_US" tech="SIP"> +<info name="CHANNEL" language="en_US" tech="SIP"> <enumlist> <enum name="peerip"> <para>R/O Get the IP address of the peer.</para> |