[svn-commits] twilson: trunk r310045 - in /trunk: ./ res/res_calendar.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Mar  8 12:19:46 2011
New Revision: 310045

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310045
Log:
Merged revisions 310039 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r310039 | twilson | 2011-03-08 10:10:50 -0800 (Tue, 08 Mar 2011) | 11 lines
  
  Spelling fix in "calendar show calandar"
  
  s/Cartegories/Catagories/
  
  (closes issue #18931)
  Reported by: pdugas
  Patches: 
        res_calendar.c.patch uploaded by pdugas (license 1222)
  
  Review: [full review board URL with trailing slash]
........

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

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

Modified: trunk/res/res_calendar.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_calendar.c?view=diff&rev=310045&r1=310044&r2=310045
==============================================================================
--- trunk/res/res_calendar.c (original)
+++ trunk/res/res_calendar.c Tue Mar  8 12:19:46 2011
@@ -1559,7 +1559,7 @@
 		ast_cli(a->fd, FORMAT2, "Description", event->description);
 		ast_cli(a->fd, FORMAT2, "Organizer", event->organizer);
 		ast_cli(a->fd, FORMAT2, "Location", event->location);
-		ast_cli(a->fd, FORMAT2, "Cartegories", event->categories);
+		ast_cli(a->fd, FORMAT2, "Categories", event->categories);
 		ast_cli(a->fd, "%-12.12s: %d\n", "Priority", event->priority);
 		ast_cli(a->fd, FORMAT2, "UID", event->uid);
 		ast_cli(a->fd, FORMAT2, "Start", epoch_to_string(buf, sizeof(buf), event->start));