From e0ebbec92315a95a4dad0623cc3967a023e914de Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Wed, 28 Apr 2021 17:37:07 +0200
Subject: [PATCH 1/4] strip jinja empty lines: forgotten search page

---
 extensions/odoo_theme/search.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/odoo_theme/search.html b/extensions/odoo_theme/search.html
index 9d4ff9103..5863c5c79 100644
--- a/extensions/odoo_theme/search.html
+++ b/extensions/odoo_theme/search.html
@@ -1,14 +1,14 @@
-{% extends "basic/search.html" %}
+{%- extends "basic/search.html" %}
 
 <!-- This is an override of the search page of the basic theme.
      The original page included a static "Search Result" section that would always be replaced by
      the JS, so it's not reproduced here. -->
-{% block body %}
+{%- block body %}
 <div id="fallback" class="alert alert-warning">
     <script>$('#fallback').hide();</script>
     <p>
-        {% trans %}Please activate JavaScript to enable the search functionality.{% endtrans %}
+        {%- trans %}Please activate JavaScript to enable the search functionality.{%- endtrans %}
     </p>
 </div>
 <div id="search-results"></div>
-{% endblock %}
\ No newline at end of file
+{%- endblock %}

From 63f7b5556419d9f89e6e86388ef4c6b83f74b96b Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Wed, 28 Apr 2021 18:29:21 +0200
Subject: [PATCH 2/4] pygments: reference file location

---
 conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf.py b/conf.py
index a2396f7cb..ba9349fe9 100644
--- a/conf.py
+++ b/conf.py
@@ -149,6 +149,7 @@ redirects_file = 'redirects.txt'
 html_theme = 'odoo_theme'
 
 # The name of the Pygments (syntax highlighting) style to use.
+# See extensions/odoo_theme/pygments_override.py
 pygments_style = 'odoo'
 
 # The paths that contain custom themes, relative to this directory.

From 595daf0799a0688b7839727ce58f72a1507f8c0f Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Wed, 28 Apr 2021 18:29:38 +0200
Subject: [PATCH 3/4] [IMP] dev/howtos/backend: csv formatting

---
 content/developer/howtos/backend.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/developer/howtos/backend.rst b/content/developer/howtos/backend.rst
index 763850ec0..d30d81efa 100644
--- a/content/developer/howtos/backend.rst
+++ b/content/developer/howtos/backend.rst
@@ -1272,7 +1272,7 @@ access), and a set of permissions: read, write, create, unlink. Such access
 rights are usually created by a CSV file named after its model:
 ``ir.model.access.csv``.
 
-.. code-block:: text
+.. code-block:: csv
 
     id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
     access_idea_idea,idea.idea,model_idea_idea,base.group_user,1,1,1,0

From d092823f087869f0dea56a6ec21929172efd80ea Mon Sep 17 00:00:00 2001
From: Victor Feyens <vfe@odoo.com>
Date: Fri, 23 Apr 2021 14:13:58 +0200
Subject: [PATCH 4/4] [FIX] views.rst: sphinx error (cannot lex literal_block
 'xml')

---
 content/developer/reference/views.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/developer/reference/views.rst b/content/developer/reference/views.rst
index 0760705be..152b1b752 100644
--- a/content/developer/reference/views.rst
+++ b/content/developer/reference/views.rst
@@ -1456,7 +1456,7 @@ Possible children elements of the search view are:
 
         .. code-block:: xml
 
-          <filter name="groupby_category" string="Category" context = {'group_by': 'category_id'}/>
+          <filter name="groupby_category" string="Category" context="{'group_by': 'category_id'}"/>
 
         The groupby defined above allows to group data by category.
 
@@ -1471,7 +1471,7 @@ Possible children elements of the search view are:
 
         .. code-block:: xml
 
-          <filter name="groupby_create_date" string="Creation Date" context = {'group_by': 'create_date:week'}/>
+          <filter name="groupby_create_date" string="Creation Date" context="{'group_by': 'create_date:week'}"/>
 
     ``name``
         logical name for the filter, can be used to :ref:`enable it by default