summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-20 13:34:46 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-20 13:34:46 +0200
commitb87a93a091010905ae9bee1628fcfadb8d59d358 (patch)
tree70c3b91774566d7881da0431b12828a4806c8c5c /doc/reference
parentdf95b1fc9d971137c1b73a5125c69f42c8531603 (diff)
parent5b1beec1f2840f3558b279b5726b0afa722128db (diff)
[MERGE] forward port of branch 8.0 up to 5b1beec
Diffstat (limited to 'doc/reference')
-rw-r--r--doc/reference/orm.rst2
-rw-r--r--doc/reference/views.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/reference/orm.rst b/doc/reference/orm.rst
index 10ac368e950..07d2a40315f 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -640,7 +640,7 @@ Model Reference
.. automethod:: read
- .. rubric:: Research
+ .. rubric:: Searching
.. automethod:: search
.. automethod:: search_count
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 1667b731b08..c0e639eb9ac 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -804,7 +804,7 @@ attributes:
``default_group_by``
whether the kanban view should be grouped if no grouping is specified via
- the action or the current research. Should be the name of the field to group
+ the action or the current search. Should be the name of the field to group
by when no grouping is otherwise specified
``default_order``
cards sorting order used if the user has not already sorted the records (via