diff -r 8209da83e256 -r 542a4d23a9f0 VirtualMailManager/cli/subcommands.py
--- a/VirtualMailManager/cli/subcommands.py	Thu Feb 24 20:47:35 2011 +0000
+++ b/VirtualMailManager/cli/subcommands.py	Thu Feb 24 22:01:06 2011 +0000
@@ -633,7 +633,8 @@
                    _(u'get the address of the user with the given UID')),
     'useradd': cmd('useradd', 'ua', user_add, _(u'address [password]'),
                    _(u'create a new e-mail user with the given address')),
-    'userdelete': cmd('userdelete', 'ud', user_delete, _(u'address [force]'),
+    'userdelete': cmd('userdelete', 'ud', user_delete,
+                      _(u'address') + ' [force]', 
                       _(u'delete the specified user')),
     'userdisable': cmd('userdisable', 'u0', user_disable,
                        _(u'address [service ...]'),
@@ -681,15 +682,15 @@
     'domainadd': cmd('domainadd', 'da', domain_add, _(u'fqdn [transport]'),
                      _(u'create a new domain')),
     'domaindelete': cmd('domaindelete', 'dd', domain_delete,
-                      _(u'fqdn [force]'),
+                      _(u'fqdn') + ' [force]',
                       _(u'delete the given domain and all its alias domains')),
     'domaininfo': cmd('domaininfo', 'di', domain_info, _(u'fqdn [details]'),
                       _(u'display information about the given domain')),
     'domainquota': cmd('domainquota', 'dq', domain_quota,
-                       _(u'fqdn storage [messages] [force]'),
+                       _(u'fqdn storage [messages]') + ' [force]',
                        _(u'update the quota limit of the specified domain')),
     'domaintransport': cmd('domaintransport', 'dt', domain_transport,
-                           _(u'fqdn transport [force]'),
+                           _(u'fqdn transport') + ' [force]',
                            _(u'update the transport of the specified domain')),
     'listdomains': cmd('listdomains', 'ld', list_domains, _(u'[pattern]'),
                        _(u'list all domains / search domains by pattern')),