diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f72ea7ec1d..22a6b6db22 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -25,6 +25,7 @@ Changelog
  * Add word count and reading time metrics within the page editor (Albina Starykova. Sponsored by The Motley Fool)
  * Implement a new design for accessibility checks (Albina Starykova)
  * Allow changing available privacy options per page model (Shlomo Markowitz)
+ * Add concurrent editing notifications for pages and snippets (Matt Westcott, Sage Abdullah)
  * Add "soft" client-side validation for `StreamBlock` / `ListBlock` `min_num` / `max_num` (Matt Westcott)
  * Fix: Make `WAGTAILIMAGES_CHOOSER_PAGE_SIZE` setting functional again (Rohit Sharma)
  * Fix: Enable `richtext` template tag to convert lazy translation values (Benjamin Bach)
diff --git a/docs/reference/settings.md b/docs/reference/settings.md
index 4feed64c9f..9511575637 100644
--- a/docs/reference/settings.md
+++ b/docs/reference/settings.md
@@ -257,7 +257,7 @@ To completely disable the preview panel, set [preview modes](wagtail.models.Page
 WAGTAIL_AUTO_UPDATE_PREVIEW_INTERVAL = 500
 ```
 
-The interval (in milliseconds) is to check for changes made in the page editor before updating the preview. The default value is `500`.
+How often to check for changes made in the page editor before updating the preview. In milliseconds. The default value is `500`.
 
 (wagtail_editing_session_ping_interval)=
 
diff --git a/docs/releases/6.2.md b/docs/releases/6.2.md
index 5bba91ca3f..9c24dc8da4 100644
--- a/docs/releases/6.2.md
+++ b/docs/releases/6.2.md
@@ -24,6 +24,14 @@ They are calculated based on the contents of the page preview.
 
 This feature was developed by Albina Starykova and sponsored by The Motley Fool.
 
+### Concurrent editing notifications
+
+When multiple users concurrently work on the same content, Wagtail now displays notifications to inform them of potential editing conflicts. When a user saves their work, other users are informed and presented with options: they can refresh the page to view the latest changes, or proceed with their own changes, overwriting the other user's work.
+
+Concurrent editing notifications are available for pages, and snippets. Specific messaging about conflicting versions is only available for pages and snippets with [support for saving revisions](wagtailsnippets_saving_revisions_of_snippets). To configure how often notifications are updated, use [`WAGTAIL_EDITING_SESSION_PING_INTERVAL`](wagtail_editing_session_ping_interval).
+
+This feature was implemented by Matt Westcott and Sage Abdullah.
+
 ### Other features
 
  * Optimize and consolidate redirects report view into the index view (Jake Howard, Dan Braghis)