diff -r 867d950ce7b7 -r 62f2daff853e VirtualMailManager/cli/subcommands.py
--- a/VirtualMailManager/cli/subcommands.py	Sun Apr 15 17:51:00 2012 +0200
+++ b/VirtualMailManager/cli/subcommands.py	Sun Apr 15 15:56:01 2012 +0000
@@ -782,14 +782,14 @@
                              'domain to an other domain')),
     # CatchallAlias commands
     'catchalladd': cmd('catchalladd', 'caa', catchall_add,
-                       'domain destination ...',
+                       'fqdn destination ...',
                        _(u'add one or more catch-all destinations for a '
                          u'domain')),
     'catchalldelete': cmd('catchalldelete', 'cad', catchall_delete,
-                       'domain [destination]',
+                       'fqdn [destination]',
                        _(u'delete the specified catch-all destination or all '
                          u'of a domain\'s destinations')),
-    'catchallinfo': cmd('catchallinfo', 'cai', catchall_info, 'domain',
+    'catchallinfo': cmd('catchallinfo', 'cai', catchall_info, 'fqdn',
                      _(u'show the catch-all destination(s) of the specified domain')),
     # Domain commands
     'domainadd': cmd('domainadd', 'da', domain_add, 'fqdn [transport]',