diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-05-09 21:07:44 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-05-09 21:07:44 +0200 |
| commit | cc3a2c1bf3c8aa2a7f85b5c2f8eb4e9415f3e6c7 (patch) | |
| tree | f97b6171e54f052126a1fad2f55a33c603e18bef /doc/reference | |
| parent | 92cb648882082cc8d84d3bbe75304def5196998c (diff) | |
| parent | e11bacfe512a3170f44d6d43646af914a9cf3b73 (diff) | |
[MERGE] forward port branch 12.0 up to e11bacfe512
Diffstat (limited to 'doc/reference')
| -rw-r--r-- | doc/reference/guidelines.rst | 8 | ||||
| -rw-r--r-- | doc/reference/qweb.rst | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst index df8f0b5d4c2..d71f62971cd 100644 --- a/doc/reference/guidelines.rst +++ b/doc/reference/guidelines.rst @@ -1102,10 +1102,10 @@ description. Try to follow the preferred structure for your commit messages End the message with references, such as task or bug numbers, PR numbers, and OPW tickets, following the suggested format: - Related to task #taskId - Fixes #12345 (link and close issue on Github) - Closes #7865 (link and close PR on Github) - OPW-112233 + task-123 (related to task) + Fixes #123 (close related issue on Github) + Closes #123 (close related PR on Github) + opw-123 (related to ticket) Tag and module name ------------------- diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst index a55765551ba..2954d0bf167 100644 --- a/doc/reference/qweb.rst +++ b/doc/reference/qweb.rst @@ -99,7 +99,7 @@ Extra conditional branching directives ``t-elif`` and ``t-else`` are also available:: <div> - <p t-if="user.birthday == today()">Happy bithday!</p> + <p t-if="user.birthday == today()">Happy birthday!</p> <p t-elif="user.login == 'root'">Welcome master!</p> <p t-else="">Welcome!</p> </div> |