diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-19 15:36:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-19 15:36:54 +0200 |
| commit | 1f7a39964b327e9084fb905c7b325e94774080da (patch) | |
| tree | 0cf9f1d68ece39d0bdb455d76d4e39815c630c85 /doc/reference | |
| parent | c65ca4ec1626ee1c35e727c3b70b64c103917312 (diff) | |
| parent | 0c42dcfc229922e21d83a3f10425fdf86ce3f8f2 (diff) | |
[MERGE] forward port branch saas-11.3 up to 0c42dcfc229
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/cmdline.rst | 7 | ||||
| -rw-r--r-- | doc/reference/guidelines.rst | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/doc/reference/cmdline.rst b/doc/reference/cmdline.rst index 12cd5f7a9d8..058eac51ddd 100644 --- a/doc/reference/cmdline.rst +++ b/doc/reference/cmdline.rst @@ -384,13 +384,6 @@ customize the amount of logging output In case of conflict between :option:`--log-level` and :option:`--log-handler`, the latter is used -translations ------------- - -.. option:: --i18n-import - -.. option:: --i18n-export - emails ------ diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst index c718d82b989..6a62891fffe 100644 --- a/doc/reference/guidelines.rst +++ b/doc/reference/guidelines.rst @@ -222,7 +222,6 @@ Use the following pattern : *concerned_group* is the short name of the concerned group ('user' for the 'model_name_group_user', 'public' for public user, 'company' for multi-company rules, ...). -* For a group : :samp:`{<model_name>}_group_{<group_name>}` where *group_name* is the name of the group, generally 'user', 'manager', ... .. code-block:: xml |