vmm: comparison doc/web/source/howto/manage

equal deleted inserted replaced

-:4cab983479db
+:697350dd9369
 .. _domainadd:
 domainadd
 ---------
 Syntax:
-| **vmm domainadd** *fqdn* [*transport*]
+| **vmm domainadd** *fqdn* [**-t** *transport*]
-| **vmm da** *fqdn* [*transport*]
+| **vmm da** *fqdn* [**-t** *transport*]
 Adds the new domain into the database and creates the domain directory.
 If the optional argument transport is given, it will override the default
 transport (*domain.transport*) from :file:`vmm.cfg`.
 Example:
 .. code-block:: console
-root@host:~# vmm domainadd support.example.com smtp:[mx1.example.com]:2025
+root@host:~# vmm domainadd support.example.com -t smtp:[mx1.example.com]:2025
 Creating account for postmaster@support.example.com
 Enter new password:
 Retype new password:
 root@host:~# vmm cs account.random_password true
 root@host:~# vmm da sales.example.com
 Generated password: pLJUQ6Xg_z
 domaindelete
 ------------
 Syntax:
-| **vmm domaindelete** *fqdn* [**force**]
+| **vmm domaindelete** *fqdn* [**‒‒force**]
-| **vmm dd** *fqdn* [**force**]
+| **vmm dd** *fqdn* [**‒‒force**]
 This subcommand deletes the domain specified by *fqdn*.
 If there are accounts, aliases and/or relocated users assigned to the given
 domain, :command:`vmm` will abort the requested operation and show an error
 message.
-If you know, what you are doing, you can specify the optional keyword
+If you know, what you are doing, you can specify the optional argument
-**force**.
+**‒‒force**.
 If you really always know what you are doing, edit your :file:`vmm.cfg` and
 set the option *domain.force_deletion* to **true**.
 domaininfo
 ----------
 Syntax:
-| **vmm domaininfo** *fqdn* [*details*]
+| **vmm domaininfo** *fqdn* [**-d** *details*]
-| **vmm di** *fqdn* [*details*]
+| **vmm di** *fqdn* [**-d** *details*]
 This subcommand shows some information about the given domain.
 For a more detailed information about the domain the optional argument
 *details* can be specified.
 Catch-All Dests..: 0
 domainnote
 ----------
 Syntax:
-| **vmm domainnote** *fqdn* [*note*]
+| **vmm domainnote** *fqdn* [**-n** *note*]
-| **vmm do** *fqdn* [*note*]
+| **vmm do** *fqdn* [**-n** *note*]
 With this subcommand, it is possible to attach a note to the specified
 domain.
 Without an argument, an existing note is removed.
 Example:
 .. code-block:: console
-root@host:~# vmm do example.com Belongs to Robert
+root@host:~# vmm do example.com -n 'Belongs to Robert'
 .. versionadded:: 0.6.0
 domainquota
 -----------
 Syntax:
-| **vmm domainquota** *fqdn storage* [*messages*] [**force**]
+| **vmm domainquota** *fqdn storage* [**-m** *messages*] [**‒‒force**]
-| **vmm dq** *fqdn storage* [*messages*] [**force**]
+| **vmm dq** *fqdn storage* [**-m** *messages*] [**‒‒force**]
 This subcommand is used to configure a new quota limit for the accounts
 of the domain - not for the domain itself.
 The default quota limit for accounts is defined in the :file:`vmm.cfg`
 (*domain.quota_bytes* and *domain.quota_messages*).
 The new quota limit will affect only those accounts for which the limit has
 not been overridden.
-If you want to restore the default to all accounts, you may pass the keyword
+If you want to restore the default to all accounts, you may pass the optional
-**force**.
+argument **‒‒force**.
 When the argument *messages* was omitted the default number of messages
 **0** (zero) will be applied.
 Example:
 .. code-block:: console
-root@host:~# vmm domainquota example.com 1g force
+root@host:~# vmm domainquota example.com 1g ‒‒force
 .. versionadded:: 0.6.0
 domainservices
 --------------
 Syntax:
-| **vmm domainservices** *fqdn* [*service ...*] [**force**]
+| **vmm domainservices** *fqdn* [**-s** *service ...*] [**‒‒force**]
-| **vmm ds** *fqdn* [*service ...*] [**force**]
+| **vmm ds** *fqdn* [**-s** *service ...*] [**‒‒force**]
 To define which services could be used by the users of the domain — with
 the given *fqdn* — use this subcommand.
 Each specified *service* will be enabled/usable.
 All other services will be deactivated/unusable.
 Possible service names are: **imap**, **pop3**, **sieve** and **smtp**.
 The new service set will affect only those accounts for which the set has
 not been overridden.
 If you want to restore the default to all accounts, you may pass the
-keyword **force**.
+option **‒‒force**.
 .. versionadded:: 0.6.0
 domaintransport
 ---------------
 Syntax:
-| **vmm domaintransport** *fqdn transport* [**force**]
+| **vmm domaintransport** *fqdn transport* [**‒‒force**]
-| **vmm dt** *fqdn transport* [**force**]
+| **vmm dt** *fqdn transport* [**‒‒force**]
 A new transport for the indicated domain can be set with this subcommand.
 The new transport will affect only those accounts for which the transport
 has not been overridden.
 If you want to restore the default to all accounts, you may pass the
-keyword **force**.
+option **‒‒force**.
 Example:
 .. code-block:: console

branch	v0.7.x
changeset 682	697350dd9369
parent 591	2b165e90e225
child 687	5eb033796444