diff --git a/addons/barcodes/static/src/js/barcode_form_view.js b/addons/barcodes/static/src/js/barcode_form_view.js
index 82ca913d752..5e24923f20c 100644
--- a/addons/barcodes/static/src/js/barcode_form_view.js
+++ b/addons/barcodes/static/src/js/barcode_form_view.js
@@ -61,7 +61,7 @@ FormController.include({
     _barcodeAddX2MQuantity: function (barcode, activeBarcode) {
         if (this.mode === 'readonly') {
             this.do_warn(_t('Error: Document not editable'),
-                _t('To modify this document, please first start edition.'));
+                _t('To modify this document, please enable edit mode.'));
             return Promise.reject();
         }
 
diff --git a/addons/hr/models/res_config_settings.py b/addons/hr/models/res_config_settings.py
index e6d209afb58..72a4516794b 100644
--- a/addons/hr/models/res_config_settings.py
+++ b/addons/hr/models/res_config_settings.py
@@ -18,4 +18,4 @@ class ResConfigSettings(models.TransientModel):
     module_hr_attendance = fields.Boolean(string="Based on attendances")
     hr_presence_control_email_amount = fields.Integer(related="company_id.hr_presence_control_email_amount", readonly=False)
     hr_presence_control_ip_list = fields.Char(related="company_id.hr_presence_control_ip_list", readonly=False)
-    hr_employee_self_edit = fields.Boolean(string="Employee Edition", config_parameter='hr.hr_employee_self_edit')
+    hr_employee_self_edit = fields.Boolean(string="Employee Editing", config_parameter='hr.hr_employee_self_edit')
diff --git a/addons/hr/tests/test_self_user_access.py b/addons/hr/tests/test_self_user_access.py
index bd165a31932..248232b9f04 100644
--- a/addons/hr/tests/test_self_user_access.py
+++ b/addons/hr/tests/test_self_user_access.py
@@ -45,7 +45,7 @@ class TestSelfAccessProfile(TestHrCommon):
 
         form = Form(james, view=view)
         for field in employee_related_fields:
-            with self.assertRaises(AssertionError, msg="Field '%s' should be readonly in the employee profile when self edition is not allowed." % field):
+            with self.assertRaises(AssertionError, msg="Field '%s' should be readonly in the employee profile when self editing is not allowed." % field):
                 form.__setattr__(field, 'some value')
 
 
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 1f735e1b1f2..9ce3b5bcd7b 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -79,7 +79,7 @@ class MailActivityType(models.Model):
 
     #Fields for display purpose only
     initial_res_model_id = fields.Many2one('ir.model', 'Initial model', compute="_compute_initial_res_model_id", store=False,
-            help='Technical field to keep trace of the model at the beginning of the edition for UX related behaviour')
+            help='Technical field to keep track of the model at the start of editing to support UX related behaviour')
     res_model_change = fields.Boolean(string="Model has change", help="Technical field for UX related behaviour", default=False, store=False)
 
     @api.onchange('res_model_id')
diff --git a/addons/note/README.md b/addons/note/README.md
index 9eeea063546..39f87bbdb25 100644
--- a/addons/note/README.md
+++ b/addons/note/README.md
@@ -52,7 +52,7 @@ Write down your ideas in pads, keep your notes at your finger tips, attach relat
 Collaborative Meeting Minutes
 -----------------------------
 
-### Real-time sharing and edition of notes
+### Real-time sharing and editing of notes
 
 The real time collaborative writings on notes makes it the perfect tool to collaborate on meeting minutes. Attendees will be able to contribute to the minutes, attach important documents or discuss on the related thread.
 
diff --git a/addons/portal/__manifest__.py b/addons/portal/__manifest__.py
index d396abdc6cd..c185b3f68cb 100644
--- a/addons/portal/__manifest__.py
+++ b/addons/portal/__manifest__.py
@@ -14,7 +14,7 @@ portal.
 
 This module contains most code coming from odoo v10 website_portal. Purpose
 of this module is to allow the display of a customer portal without having
-a dependency towards website edition and customization capabilities.""",
+a dependency towards website editing and customization capabilities.""",
     'depends': ['web', 'web_editor', 'http_routing', 'mail', 'auth_signup'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/purchase/views/res_config_settings_views.xml b/addons/purchase/views/res_config_settings_views.xml
index 352c9cd1eb2..52c0a1dabf4 100644
--- a/addons/purchase/views/res_config_settings_views.xml
+++ b/addons/purchase/views/res_config_settings_views.xml
@@ -41,7 +41,7 @@
                                 <label for="lock_confirmed_po"/>
                                 <a href="https://www.odoo.com/documentation/user/13.0/purchase/purchases/rfq/lock_orders.html" title="Documentation" class="o_doc_link" target="_blank"></a>
                                 <div class="text-muted">
-                                    Automatically lock confirmed orders to prevent edition
+                                    Automatically lock confirmed orders to prevent editing
                                 </div>
                             </div>
                         </div>
diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py
index c4784ccc02d..08ec874c996 100644
--- a/addons/stock/models/stock_inventory.py
+++ b/addons/stock/models/stock_inventory.py
@@ -328,7 +328,7 @@ class InventoryLine(models.Model):
                 return "[('type', '=', 'product'), '|', ('company_id', '=', False), ('company_id', '=', company_id), ('id', 'in', %s)]" % inventory.product_ids.ids
         return "[('type', '=', 'product'), '|', ('company_id', '=', False), ('company_id', '=', company_id)]"
 
-    is_editable = fields.Boolean(help="Technical field to restrict the edition.")
+    is_editable = fields.Boolean(help="Technical field to restrict editing.")
     inventory_id = fields.Many2one(
         'stock.inventory', 'Inventory', check_company=True,
         index=True, ondelete='cascade')
diff --git a/addons/stock/models/stock_quant.py b/addons/stock/models/stock_quant.py
index fb30f489341..0ffc3d245cf 100644
--- a/addons/stock/models/stock_quant.py
+++ b/addons/stock/models/stock_quant.py
@@ -195,7 +195,7 @@ class StockQuant(models.Model):
                 return
             allowed_fields = self._get_inventory_fields_write()
             if any([field for field in vals.keys() if field not in allowed_fields]):
-                raise UserError(_("Quant's edition is restricted, you can't do this operation."))
+                raise UserError(_("Quant's editing is restricted, you can't do this operation."))
             self = self.sudo()
             return super(StockQuant, self).write(vals)
         return super(StockQuant, self).write(vals)
diff --git a/addons/web_editor/static/src/js/editor/editor.js b/addons/web_editor/static/src/js/editor/editor.js
index d2f29e53f7f..5cd8113e7f9 100644
--- a/addons/web_editor/static/src/js/editor/editor.js
+++ b/addons/web_editor/static/src/js/editor/editor.js
@@ -143,7 +143,7 @@ var EditorMenuBar = Widget.extend({
             if (!rte.history.getEditableHasUndo().length) {
                 resolve();
             } else {
-                var confirm = Dialog.confirm(this, _t("If you discard the current edition, all unsaved changes will be lost. You can cancel to return to the edition mode."), {
+                var confirm = Dialog.confirm(this, _t("If you discard the current edits, all unsaved changes will be lost. You can cancel to return to edit mode."), {
                     confirm_callback: resolve,
                 });
                 confirm.on('closed', self, reject);
diff --git a/addons/website/doc/website.snippet.rst b/addons/website/doc/website.snippet.rst
index 2564498dd3a..cc0252c1370 100644
--- a/addons/website/doc/website.snippet.rst
+++ b/addons/website/doc/website.snippet.rst
@@ -150,4 +150,4 @@ The snippets are loaded in one time by js and the page stay editable.
 More
 ++++
 
-- Use the class ``o_not_editable`` to prevent the edition from an area.
+- Use the class ``o_not_editable`` to prevent the editing of an area.
diff --git a/addons/website/static/src/js/editor/editor_menu.js b/addons/website/static/src/js/editor/editor_menu.js
index 87422efdb1f..dbeba41a7c5 100644
--- a/addons/website/static/src/js/editor/editor_menu.js
+++ b/addons/website/static/src/js/editor/editor_menu.js
@@ -79,7 +79,7 @@ var EditorMenu = Widget.extend({
             if (!self.wysiwyg.isDirty()) {
                 resolve();
             } else {
-                var confirm = Dialog.confirm(self, _t("If you discard the current edition, all unsaved changes will be lost. You can cancel to return to the edition mode."), {
+                var confirm = Dialog.confirm(self, _t("If you discard the current edits, all unsaved changes will be lost. You can cancel to return to edit mode."), {
                     confirm_callback: resolve,
                 });
                 confirm.on('closed', self, reject);
diff --git a/addons/website_event/README.md b/addons/website_event/README.md
index 89943120484..b152db75589 100644
--- a/addons/website_event/README.md
+++ b/addons/website_event/README.md
@@ -62,7 +62,7 @@ Leverage Social Media
 
 ### Optimize: from Ads to Conversions
 
-Create new landing pages easily with the Odoo inline edition feature. Send visitors of your different marketing campaigns to event landing pages to optimize conversions.
+Create new landing pages easily with the Odoo inline editing feature. Send visitors of your different marketing campaigns to event landing pages to optimize conversions.
 
 And Much More...
 ----------------
diff --git a/addons/website_sale/README.md b/addons/website_sale/README.md
index 5ce2d491fea..71886a7ab89 100644
--- a/addons/website_sale/README.md
+++ b/addons/website_sale/README.md
@@ -77,7 +77,7 @@ efficiently in Google.
 Leverage Social Media
 ---------------------
 
-Create new landing pages easily with the Odoo inline edition feature. Send
+Create new landing pages easily with the Odoo inline editing feature. Send
 visitors of your different marketing campaigns to specific landing pages to
 optimize conversions.
 
diff --git a/doc/howtos/web.rst b/doc/howtos/web.rst
index 550ffeffea1..d7bd6fe3365 100644
--- a/doc/howtos/web.rst
+++ b/doc/howtos/web.rst
@@ -1864,12 +1864,12 @@ simply use the ``widget`` attribute in the view's XML description:
 
 .. note::
 
-    * the same widget is used in both "view" (read-only) and "edition" modes
+    * the same widget is used in both "view" (read-only) and "edit" modes
       of a form view, it's not possible to use a widget in one and an other
       widget in the other
     * and a given field (name) can not be used multiple times in the same form
     * a widget may ignore the current mode of the form view and remain the
-      same in both view and edition
+      same in both view and edit modes
 
 .. todo:: most of this should probably move to an advanced form view guide
 
diff --git a/doc/howtos/website.rst b/doc/howtos/website.rst
index 5d3ab9f0b84..540d34cf836 100644
--- a/doc/howtos/website.rst
+++ b/doc/howtos/website.rst
@@ -210,7 +210,7 @@ elements (top-level menu, footer, …)
 
 .. image:: website/layout.png
 
-The website layout also provides support for edition tools: click
+The website layout also provides support for editing tools: click
 :guilabel:`Sign In` (in the top-right), fill the credentials in (``admin`` /
 ``admin`` by default) then click :guilabel:`Log In`.
 
@@ -218,12 +218,12 @@ You're now in Odoo "proper": the administrative interface. For now click on
 the :guilabel:`Website` menu item (top-left corner.
 
 We're back in the website but as an administrator, with access to advanced
-edition features provided by the *website* support:
+editing features provided by the *website* support:
 
 * a template code editor (:menuselection:`Customize --> HTML Editor`) where
   you can see and edit all templates used for the current page
-* the :guilabel:`Edit` button in the top-left switches to "edition mode" where
-  blocks (snippets) and rich text edition are available
+* the :guilabel:`Edit` button in the top-left switches to "edit mode" where
+  blocks (snippets) and rich text editing are available
 * a number of other features such as mobile preview or :abbr:`SEO (Search
   Engine Optimization)`
 
@@ -273,7 +273,7 @@ biography is shared between all teachers, because blocks are added to the
 *template*, and the *biography* template is shared between all teachers, when
 one page is edited they're all edited at the same time.
 
-Field edition
+Field editing
 =============
 
 Data which is specific to a record should be saved on that record, so let us
diff --git a/doc/reference/javascript_reference.rst b/doc/reference/javascript_reference.rst
index 8b3df82c85e..b5028149498 100644
--- a/doc/reference/javascript_reference.rst
+++ b/doc/reference/javascript_reference.rst
@@ -2062,7 +2062,7 @@ Relational fields
 
     - can_create: allow the creation of related records (take precedence over no_create
       option)
-    - can_write: allow the edition of related records (default: true)
+    - can_write: allow the editing of related records (default: true)
 
     Options:
 
@@ -2103,7 +2103,7 @@ Relational fields
 
 - kanban.many2one (KanbanFieldMany2One)
     Default widget for many2one fields (in kanban view). We need to disable all
-    edition in kanban views.
+    editing in kanban views.
 
     - Supported field types: *many2one*
 
diff --git a/doc/reference/mixins.rst b/doc/reference/mixins.rst
index 7e72f533c77..c80ffc52c79 100644
--- a/doc/reference/mixins.rst
+++ b/doc/reference/mixins.rst
@@ -904,7 +904,7 @@ usually the way to go:
         <field name="website_published" widget="website_button"/>
     </button>
 
-In the frontend, some security checks are needed to avoid showing 'Edition'
+In the frontend, some security checks are needed to avoid showing 'Editing'
 buttons to website visitors:
 
 .. code-block:: xml
diff --git a/doc/reference/qweb.rst b/doc/reference/qweb.rst
index 4bec9c900cf..cedb458b3d2 100644
--- a/doc/reference/qweb.rst
+++ b/doc/reference/qweb.rst
@@ -346,7 +346,7 @@ Asset bundles
 The ``t-field`` directive can only be used when performing field access
 (``a.b``) on a "smart" record (result of the ``browse`` method). It is able
 to automatically format based on field type, and is integrated in the
-website's rich text edition.
+website's rich text editing.
 
 ``t-options`` can be used to customize fields, the most common option
 is ``widget``, other options are field- or widget-dependent.
diff --git a/doc/reference/views.rst b/doc/reference/views.rst
index 6f05359cb6d..65951b75f5b 100644
--- a/doc/reference/views.rst
+++ b/doc/reference/views.rst
@@ -87,7 +87,7 @@ an impact on all view types.
 
 * ``edit`` (``form`` & ``list`` & ``gantt``)
 
-  Disable/enable record edition on the view.
+  Disable/enable record editing on the view.
 
 * ``delete`` (``form`` & ``list``)
 
@@ -777,7 +777,7 @@ system. Available semantic components are:
     dialog, ``cancel`` to close the dialog without saving.
 
 ``field``
-  renders (and allow edition of, possibly) a single field of the current
+  renders (and allow editing of, possibly) a single field of the current
   record. Using several times a field in a form view is supported and the fields
   can receive different values for modifiers 'invisible' and 'readonly'. However,
   the behavior is not guaranteed when several fields exist with different values
@@ -828,7 +828,7 @@ system. Available semantic components are:
   ``context``
     for relational fields only, context to pass when fetching possible values
   ``readonly``
-    display the field in both readonly and edition mode, but never make it
+    display the field in both readonly and edit mode, but never make it
     editable
   ``required``
     generates an error and prevents saving the record if the field doesn't
@@ -1331,7 +1331,7 @@ root can have the following attributes:
     .. note:: if the ``edit`` attribute is set to ``false``, the ``editable`` option will be ignored.
 
 ``multi_edit``
-    editable or not editable list can activate the multi-edition feature by defining
+    editable or not editable list can activate the multi-editing feature by defining
     the `multi_edit=1`
 
 ``default_order``