diff --git a/doc/appdocsxml.dtd b/doc/appdocsxml.dtd
index 0c0b8256fc..bc72d1324b 100644
--- a/doc/appdocsxml.dtd
+++ b/doc/appdocsxml.dtd
@@ -40,7 +40,7 @@
-
+
diff --git a/res/res_agi.c b/res/res_agi.c
index 45799aea0d..a373649233 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -113,6 +113,61 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+
+
+ Removes database key/value
+
+
+
+
+
+
+ Deletes an entry in the Asterisk database for a given
+ family and key.
+ Returns 1 if successful, 0
+ otherwise.
+
+
+
+
+ Adds/updates database value
+
+
+
+
+
+
+
+ Adds or updates an entry in the Asterisk database for a given
+ family, key, and
+ value.
+ Returns 1 if successful, 0 otherwise.
+
+
+
+
+ Enable/Disable Music on hold generator
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Enables/Disables the music on hold generator. If class
+ is not specified, then the default music on hold class will be
+ used.
+ Always returns 0.
+
+
***/
#define MAX_ARGS 128
@@ -2051,18 +2106,6 @@ static int handle_asyncagi_break(struct ast_channel *chan, AGI *agi, int argc, c
return AST_PBX_KEEPALIVE;
}
-static char usage_setmusic[] =
-" Usage: SET MUSIC ON \n"
-" Enables/Disables the music on hold generator. If is\n"
-" not specified, then the default music on hold class will be used.\n"
-" Always returns 0.\n";
-
-static char usage_dbput[] =
-" Usage: DATABASE PUT \n"
-" Adds or updates an entry in the Asterisk database for a\n"
-" given family, key, and value.\n"
-" Returns 1 if successful, 0 otherwise.\n";
-
static char usage_dbget[] =
" Usage: DATABASE GET \n"
" Retrieves an entry in the Asterisk database for a\n"
@@ -2071,12 +2114,6 @@ static char usage_dbget[] =
" is set and returns the variable in parentheses.\n"
" Example return code: 200 result=1 (testvariable)\n";
-static char usage_dbdel[] =
-" Usage: DATABASE DEL \n"
-" Deletes an entry in the Asterisk database for a\n"
-" given family and key.\n"
-" Returns 1 if successful, 0 otherwise.\n";
-
static char usage_dbdeltree[] =
" Usage: DATABASE DELTREE [keytree]\n"
" Deletes a family or specific keytree within a family\n"
@@ -2321,10 +2358,10 @@ static char usage_speechrecognize[] =
static struct agi_command commands[] = {
{ { "answer", NULL }, handle_answer, NULL, NULL, 0 },
{ { "channel", "status", NULL }, handle_channelstatus, NULL, NULL, 0 },
- { { "database", "del", NULL }, handle_dbdel, "Removes database key/value", usage_dbdel , 1 },
+ { { "database", "del", NULL }, handle_dbdel, NULL, NULL, 1 },
{ { "database", "deltree", NULL }, handle_dbdeltree, "Removes database keytree/value", usage_dbdeltree , 1 },
{ { "database", "get", NULL }, handle_dbget, "Gets database value", usage_dbget , 1 },
- { { "database", "put", NULL }, handle_dbput, "Adds/updates database value", usage_dbput , 1 },
+ { { "database", "put", NULL }, handle_dbput, NULL, NULL, 1 },
{ { "exec", NULL }, handle_exec, "Executes a given Application", usage_exec , 1 },
{ { "get", "data", NULL }, handle_getdata, "Prompts for DTMF on a channel", usage_getdata , 0 },
{ { "get", "full", "variable", NULL }, handle_getvariablefull, "Evaluates a channel expression", usage_getvariablefull , 1 },
@@ -2348,7 +2385,7 @@ static struct agi_command commands[] = {
{ { "set", "callerid", NULL }, handle_setcallerid, "Sets callerid for the current channel", usage_setcallerid , 0 },
{ { "set", "context", NULL }, handle_setcontext, "Sets channel context", usage_setcontext , 0 },
{ { "set", "extension", NULL }, handle_setextension, "Changes channel extension", usage_setextension , 0 },
- { { "set", "music", NULL }, handle_setmusic, "Enable/Disable Music on hold generator", usage_setmusic , 0 },
+ { { "set", "music", NULL }, handle_setmusic, NULL, NULL, 0 },
{ { "set", "priority", NULL }, handle_setpriority, "Set channel dialplan priority", usage_setpriority , 0 },
{ { "set", "variable", NULL }, handle_setvariable, "Sets a channel variable", usage_setvariable , 1 },
{ { "stream", "file", NULL }, handle_streamfile, "Sends audio file on channel", usage_streamfile , 0 },