Index: tools/msynctool.c
===================================================================
--- tools/msynctool.c	(revision 170)
+++ tools/msynctool.c	(working copy)
@@ -44,24 +44,34 @@
 
 static void usage (char *name, int ecode)
 {
-  fprintf (stderr, "Usage: %s\n", name);
-  fprintf (stderr, "--listgroups\tLists all groups\n");
-  fprintf (stderr, "--listplugins\tLists all plugins\n");
-  fprintf (stderr, "--listobjects\tLists all objtypes that the engine understands\n");
-  fprintf (stderr, "--showformats <objtype>\tLists all formats that a objtype can have\n");
-  fprintf (stderr, "--showgroup <groupname>\tLists all members of the group\n");
-  fprintf (stderr, "--sync <groupname>\tSync all members in a group\n");
-  fprintf (stderr, "--filter-objtype <objtype>\tFilter object type\n");
-  fprintf (stderr, "--slow-sync <objtype>\tPerform a slow-sync of all members in the group\n");
-  fprintf (stderr, "[--wait] \tDont immediatly start to sync, but wait for a client to initialize the sync\n");
-  fprintf (stderr, "[--multi] \tRepeat to wait for sync alerts\n");
-  fprintf (stderr, "--addgroup <groupname>\tAdd a new group\n");
-  fprintf (stderr, "--delgroup <groupname>\tDelete the given group\n");
+  fprintf (stderr, "Usage: %s [options]\n\n", name);
+  fprintf (stderr, "--listgroups\t\t\t\tLists all groups\n");
+  fprintf (stderr, "--listplugins\t\t\t\tLists all plugins\n");
+  fprintf (stderr, "--listobjects\t\t\t\tLists all object types that the\n");
+  fprintf (stderr, "\t\t\t\t\t  engine understands\n");
+  fprintf (stderr, "--showformats <objtype>\t\t\tLists all formats that a object\n");
+  fprintf (stderr, "\t\t\t\t\t  type can have\n");
+  fprintf (stderr, "--showgroup <groupname>\t\t\tLists all members of the group\n");
+  fprintf (stderr, "--sync <groupname>\t\t\tSync all members in a group\n");
+  fprintf (stderr, "--filter-objtype <objtype>\t\tFilter out object type\n");
+  fprintf (stderr, "--slow-sync <objtype>\t\t\tPerform a slow-sync of all members\n");
+  fprintf (stderr, "\t\t\t\t\t  in the group\n");
+  fprintf (stderr, "[--wait]\t\t\t\tDon't immediately start to sync, but\n");
+  fprintf (stderr, "\t\t\t\t\t  wait for a client to initialize the\n");
+  fprintf (stderr, "\t\t\t\t\t  sync\n");
+  fprintf (stderr, "[--multi]\t\t\t\tRepeat to wait for sync alerts\n");
+  fprintf (stderr, "--addgroup <groupname>\t\t\tAdd a new group\n");
+  fprintf (stderr, "--delgroup <groupname>\t\t\tDelete the given group\n");
   fprintf (stderr, "--addmember <groupname> <plugintype>\tAdd a member to the group\n");
-  fprintf (stderr, "--configure <groupname> <memberid> \tConfigure a member. memberid as returned by --showgroup\n");
-  fprintf (stderr, "[--manual] \tMake manual engine iterations. Only for debugging\n");
-  fprintf (stderr, "[--configdir] \tSet a different configdir than ~/.opensync\n");
-  fprintf (stderr, "[--conflict 1-9/d/i/n] \tResolve all conflicts as side [1-9] wins, [d]uplicate, [i]gnore, or keep [n]ewer\n");
+  fprintf (stderr, "--configure <groupname> <memberid>\tConfigure a member.  Memberid as\n");
+  fprintf (stderr, "\t\t\t\t\t  returned by --showgroup\n");
+  fprintf (stderr, "[--manual]\t\t\t\tMake manual engine iterations. Only\n");
+  fprintf (stderr, "\t\t\t\t\tfor debugging.\n");
+  fprintf (stderr, "[--configdir]\t\t\t\tUse a different configdir than\n");
+  fprintf (stderr, "\t\t\t\t\t  ~/.opensync\n");
+  fprintf (stderr, "[--conflict 1-9/d/i/n]\t\t\tResolve all conflicts as side [1-9]\n");
+  fprintf (stderr, "\t\t\t\t\twins, [d]uplicate, [i]gnore, or\n");
+  fprintf (stderr, "\t\t\t\t\t  keep [n]ewer\n");
   exit (ecode);
 }