summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-21 13:58:24 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-21 13:58:24 +0200
commitc88c70e900ed92eda2a692d2cb0a0642e7296037 (patch)
tree7363d1d3b8e62b7913cf713ee790e177ed50c73b /doc/reference
parentda82a6b70553e4abed4ab04c4bd884d5d5126abc (diff)
parentd73f0d8063aaa38aeb77b8a513df84123eaefd11 (diff)
[MERGE] forward port of branch saas-10 up to d73f0d8
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 4511410fee2..86869b529f1 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -680,7 +680,7 @@ Model Reference
.. automethod:: read
.. automethod:: read_group
- .. rubric:: Research
+ .. rubric:: Searching
.. automethod:: search
.. automethod:: search_count
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 6bed888f571..bc2a34e8be6 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -822,7 +822,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