[svn-commits] newtonr: trunk r410877 - in /trunk: ./ res/res_ari.c

[SVN commits to the Digium repositories]

Author: newtonr
Date: Tue Mar 18 18:32:00 2014
New Revision: 410877

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=410877
Log:
res_ari: Add notes about Asterisk HTTP server to the "enabled" config option for the res_ari general section

Added note and see-also reminding user to enable the HTTP server.

(closes issue ASTERISK-22499)
Reported by: Rusty Newton
........

Merged revisions 410876 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_ari.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_ari.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_ari.c?view=diff&rev=410877&r1=410876&r2=410877
==============================================================================
--- trunk/res/res_ari.c (original)
+++ trunk/res/res_ari.c Tue Mar 18 18:32:00 2014
@@ -84,6 +84,14 @@
 				<synopsis>General configuration settings</synopsis>
 				<configOption name="enabled">
 					<synopsis>Enable/disable the ARI module</synopsis>
+					<description>This option enables or disables the ARI module.
+						<note><para>Asterisk's HTTP server also needs to be enabled for ARI to communicate over it.
+						</para></note>
+					</description>
+					<see-also>
+						<ref type="filename">http.conf</ref>
+						<ref type="link">https://wiki.asterisk.org/wiki/display/AST/Asterisk+Builtin+mini-HTTP+Server</ref>
+					</see-also>
 				</configOption>
 				<configOption name="pretty">
 					<synopsis>Responses from ARI are formatted to be human readable</synopsis>