Merge branch '12.0-one-doc-edi' of github.com:odoo/documentation-user into 12.0-one-doc-edi

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.

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

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

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 %}
+{%- endblock %}