diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-07-18 17:59:23 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-07-18 17:59:23 +0200 |
| commit | e5fab318d9ca1e578c88b543c72380c7df521cbb (patch) | |
| tree | 80c3499118807a85b3ab47294457d2e029446995 /doc/reference | |
| parent | 1969168affbe76d43d607f386eca26b19b5abcc7 (diff) | |
| parent | 02f38beffbb5053c81e9f6828d36a2de9468b2bc (diff) | |
[MERGE] forward port branch saas-11.2 up to 02f38beffbb
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 ae0ab00555d..ec7e3c98cbe 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 |