automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37170 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/funcs/func_db.c b/funcs/func_db.c
index bc135a6b33ad42c98943889e58008cb2e6a08cd1..58f9987be75fc07855917262da052f5405a44b40 100644 (file)
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -108,14 +108,14 @@ static
 #endif
 struct ast_custom_function db_function = {
        .name = "DB",
-       .synopsis = "Read or Write from/to the Asterisk database",
+       .synopsis = "Read from or write to the Asterisk database",
        .syntax = "DB(<family>/<key>)",
-       .desc = "This function will read or write a value from/to the Asterisk database.\n"
-               "DB(...) will read a value from the database, while DB(...)=value\n"
-               "will write a value to the database.  On a read, this function\n"
-               "returns the value from the datase, or NULL if it does not exist.\n"
-               "On a write, this function will always return NULL.  Reading a database value\n"
-               "will also set the variable DB_RESULT.\n",
+       .desc =
+"This function will read from or write a value to the Asterisk database.  On a\n"
+"read, this function returns the corresponding value from the database, or blank\n"
+"if it does not exist.  Reading a database value will also set the variable\n"
+"DB_RESULT.  If you wish to find out if an entry exists, use the DB_EXISTS\n"
+"function.\n",
        .read = function_db_read,
        .write = function_db_write,
 };