summaryrefslogtreecommitdiff
path: root/doc/reference
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-06-21 12:42:34 +0200
committerChristophe Simonis <chs@odoo.com>2016-06-21 12:42:34 +0200
commitd73f0d8063aaa38aeb77b8a513df84123eaefd11 (patch)
tree885b0ccbca6a74b15e3baf83adf3b0abcdb9f681 /doc/reference
parent10148c3c3ab0a2d7ad2924170a69526aacda7637 (diff)
parent68f51630b923a9dbd0efdac28a2373e0742da005 (diff)
[MERGE] forward port of branch saas-9 up to 68f5163
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 8b7b9c1a4ad..cf8718c6f1c 100644
--- a/doc/reference/orm.rst
+++ b/doc/reference/orm.rst
@@ -641,7 +641,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