[asterisk-commits] tilghman: trunk r53297 - in /trunk: ./ res/res_jabber.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Feb  6 23:25:54 2007
New Revision: 53297

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53297
Log:
Merged revisions 53294 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r53294 | tilghman | 2007-02-06 23:24:31 -0600 (Tue, 06 Feb 2007) | 2 lines

Text fix for jabber reload command (reported by bkruse via IRC)

........

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

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

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=53297&r1=53296&r2=53297
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Tue Feb  6 23:25:54 2007
@@ -120,7 +120,7 @@
 	debug_usage },
 
 	{ { "jabber", "reload", NULL},
-	aji_do_reload, "Enable Jabber debugging",
+	aji_do_reload, "Reload Jabber configuration",
 	reload_usage },
 
 	{ { "jabber", "show", "connected", NULL},