From a80f1ddcda416c76760acd920a7114382749a71e Mon Sep 17 00:00:00 2001
From: Jeremy Kersten <jke@odoo.com>
Date: Thu, 2 May 2019 14:57:02 +0000
Subject: [FIX] doc: git guidelines, don't use # for task/opw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use task-#xxx is wrong since it will refer to an unexising or wrong hash
of github.

closes odoo/odoo#33121

Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
---
 doc/reference/guidelines.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'doc/reference')

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
 -------------------
-- 
cgit v1.2.3


From 8b7658489259fac1ffcd6f0b3d83390ef7e5700b Mon Sep 17 00:00:00 2001
From: Yenthe666 <yenthevg@gmail.com>
Date: Sun, 14 Apr 2019 08:26:38 +0000
Subject: [FIX] doc: fix typo in qweb documentation

closes odoo/odoo#32670

Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
---
 doc/reference/qweb.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/reference')

diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index a806c3fda8f..813866d9d0e 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>
-- 
cgit v1.2.3