Rename Content Flagging to Data Spillage Handling#8870
Merged
esethna merged 5 commits intov11.6-documentationfrom Apr 13, 2026
Merged
Rename Content Flagging to Data Spillage Handling#8870esethna merged 5 commits intov11.6-documentationfrom
esethna merged 5 commits intov11.6-documentationfrom
Conversation
* Improve PostgreSQL database setup page discoverability in search Searching for "postgres" or "postgres setup" in the docs didn't surface the database preparation instructions on the preparations page. Renamed the section heading, added search metadata, and included PostgreSQL in the intro paragraph to improve Sphinx search ranking. Also fixes a sphinx-autobuild rebuild loop caused by generated agent docs being rewritten during each build cycle. Closes #8864 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Address CodeRabbit review feedback - Use double quotes for --ignore glob in Makefile for Windows cmd.exe compatibility - Add legacy anchor label to preserve existing deep links to #database-preparation after heading rename Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Update user-visible and admin-visible terminology throughout the Content Flagging docs to reflect the v11.6.0 rename: - Rename page title and all feature-name references from 'Content Flagging' to 'Data Spillage Handling' - Update System Console navigation path to 'System Console > Site Configuration > Data Spillage Handling' - Replace 'flag/flagged' with 'quarantine/quarantined' where the product UI now uses that wording - Replace 'content-review bot' with 'Data Spillage Bot' in all user-facing notification and moderation queue descriptions - Update 'Flag message' menu action to 'Quarantine for Review' Internal RST cross-reference labels and API/config identifiers left unchanged per scope constraints. Closes #8869 Co-authored-by: Combs7th <Combs7th@users.noreply.github.com>
Combs7th
added
1: Dev Review
Contributor
Author
|
@marianunez - Do the above updates look accurate to you? |
Contributor
|
Newest code from mattermost has been published to preview environment for Git SHA 8ace2c7 |
marianunez
reviewed
Apr 9, 2026
Member
marianunez
left a comment
marianunez
left a comment
There was a problem hiding this comment.
Left a minor comment regarding the reasons example. Also, there seems to be some unrelated changes
| - **Require reporters to add comment**: Set to **True** to require users to add a short explanation when flagging a message. | ||
| - **Require reviewers to add comment**: Set to **True** to require reviewers to add a comment when resolving a flag. | ||
| - **Hide message from channel while it is being reviewed**: Set to **True** to automatically hide flagged messages from the channel until reviews are complete. If a root post is flagged, the entire thread is hidden. | ||
| - **Reasons for quarantine**: Define the preset categories that appear in the quarantine dialog for users (for example: **Inappropriate content**, **Sensitive data**, **Security concern**, **Harassment or abuse**, **Spam or phishing**). |
Member
There was a problem hiding this comment.
We've also updated the default reasons so we should change these to align more with the use cases we are targeting. The new reasons are:
Classification mismatch
Need-to-know violation
Personally identifiable information (PII) exposure
Operational security (OPSEC) concern
Controlled Unclassified Information (CUI) violation
| - **Status**: The current state of the review. All flagged content starts in **Pending** status. | ||
| - **Quarantined by**: The user who reported the message. | ||
| - **Status**: The current state of the review. All quarantined content starts in **Pending** status. | ||
| - **Reason**: The reason selected by the reporter (for example, **Sensitive data**, **Inappropriate content**). |
Member
There was a problem hiding this comment.
Same here, we can update the two examples with any two of the new reasons
Contributor
|
Newest code from mattermost has been published to preview environment for Git SHA b707a79 |
Contributor
|
Newest code from mattermost has been published to preview environment for Git SHA 76de741 |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
Author
|
@claude - Please update to include the new reasons and examples that Maria outlined above. |
Contributor
|
Claude finished @Combs7th's task in 44s —— View job Updated reasons and examples in content-flagging.rst
Changes made to Line 57 — "Reasons for quarantine" examples updated from the old generic reasons to:
Line 76 — "Reason" card field example updated to use two of the new reasons:
|
Co-authored-by: Combs7th <Combs7th@users.noreply.github.com>
Contributor
Author
|
@marianunez - Removed unintended changes, and added reasons. Would you say it's looking good now? |
Contributor
|
Newest code from mattermost has been published to preview environment for Git SHA 197ac1a |
esethna
approved these changes
Apr 13, 2026
amyblais
added a commit
that referenced
this pull request
Apr 16, 2026
* Update conf.py * [MM-65701] Document 7zip file blocking in file content search (#8836) Adds notes to end-user search docs and admin config docs clarifying that 7zip (.7z) files are not supported for file content search and are skipped for security reasons. Only standard ZIP files are supported when ZIP file search is enabled. Ref: mattermost/mattermost#34983 Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Add docs for preferred_username claim support in OpenID Connect (#8838) Adds Use preferred username setting documentation to each OpenID Connect provider section (GitLab, Google, Entra ID, OpenID Connect other) in the authentication configuration settings reference, and a corresponding note in the OpenID Connect SSO setup guide. Closes #8835 Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * docs(auth): Clarify Google SSO username/email sync behavior (#8832) * Desktop v5.13.5 docs (#8828) * Update mattermost-desktop-releases.md * Update desktop-app-changelog.md * Update desktop-app-changelog.md * Update desktop-app-changelog.md * docs(auth): clarify Google SSO username/email sync behavior Username and email address changes made in Google Workspace are not automatically synced to Mattermost. Adds a note to the existing user-attribute warning in the Google SSO setup guide to prevent readers from incorrectly inferring that the IdP is an automatic sync source. Aligns with mattermost/mattermost#34475. Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update desktop-app-changelog.md * Update desktop-app-changelog.md * Update mattermost-desktop-releases.md --------- Co-authored-by: Amy Blais <29708087+amyblais@users.noreply.github.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update mattermost-desktop-releases.md * Update desktop-app-changelog.md * Add four newly sanitized fields to Support Packet documentation (#8874) * Improve PostgreSQL database setup discoverability in search (#8865) * Improve PostgreSQL database setup page discoverability in search Searching for "postgres" or "postgres setup" in the docs didn't surface the database preparation instructions on the preparations page. Renamed the section heading, added search metadata, and included PostgreSQL in the intro paragraph to improve Sphinx search ranking. Also fixes a sphinx-autobuild rebuild loop caused by generated agent docs being rewritten during each build cycle. Closes #8864 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Address CodeRabbit review feedback - Use double quotes for --ignore glob in Makefile for Windows cmd.exe compatibility - Add legacy anchor label to preserve existing deep links to #database-preparation after heading rename Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * docs: add four newly sanitized fields to Support Packet documentation From Mattermost v11.6.0 (mattermost/mattermost#35346), the following fields are now automatically redacted during Support Packet generation: - FileSettings.ExportAmazonS3SecretAccessKey - ElasticsearchSettings.ClientKey - ServiceSettings.GoogleDeveloperKey - ServiceSettings.GiphySdkKey Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update Makefile * Update preparations.rst --------- Co-authored-by: Stuart Doherty <stu.doherty@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Add popout window documentation for search results (#8868) * Add popout window documentation for search results (v11.6) Documents the new Search RHS popout feature introduced in Mattermost v11.6, covering: opening search results in a popout window, query preservation, thread navigation within the popout, back button behavior, and Jump opening the source channel in the main window. Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update search-for-messages.rst * Update search-for-messages.rst --------- Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> Co-authored-by: Eric Sethna <14333569+esethna@users.noreply.github.com> * Mobile Feat: AI rewrite (#8872) * Improve PostgreSQL database setup discoverability in search (#8865) * Improve PostgreSQL database setup page discoverability in search Searching for "postgres" or "postgres setup" in the docs didn't surface the database preparation instructions on the preparations page. Renamed the section heading, added search metadata, and included PostgreSQL in the intro paragraph to improve Sphinx search ranking. Also fixes a sphinx-autobuild rebuild loop caused by generated agent docs being rewritten during each build cycle. Closes #8864 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Address CodeRabbit review feedback - Use double quotes for --ignore glob in Makefile for Windows cmd.exe compatibility - Add legacy anchor label to preserve existing deep links to #database-preparation after heading rename Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * docs: expand mobile AI rewrite workflow in send-messages.rst Replace the one-liner Mobile tab under 'Rewrite messages with AI' with a full step-by-step workflow mirroring the existing Web/Desktop section, covering: opening rewrite from the composer, selecting an agent, choosing rewrite options (including custom prompt), the processing state, and reviewing/sending the result. Closes #8871 Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update preparations.rst * Update Makefile * Simplify --------- Co-authored-by: Stuart Doherty <stu.doherty@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> Co-authored-by: Eric Sethna <14333569+esethna@users.noreply.github.com> * Rename Content Flagging to Data Spillage Handling (#8870) * Improve PostgreSQL database setup discoverability in search (#8865) * Improve PostgreSQL database setup page discoverability in search Searching for "postgres" or "postgres setup" in the docs didn't surface the database preparation instructions on the preparations page. Renamed the section heading, added search metadata, and included PostgreSQL in the intro paragraph to improve Sphinx search ranking. Also fixes a sphinx-autobuild rebuild loop caused by generated agent docs being rewritten during each build cycle. Closes #8864 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * Address CodeRabbit review feedback - Use double quotes for --ignore glob in Makefile for Windows cmd.exe compatibility - Add legacy anchor label to preserve existing deep links to #database-preparation after heading rename Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * docs: rename Content Flagging to Data Spillage Handling (v11.6.0) Update user-visible and admin-visible terminology throughout the Content Flagging docs to reflect the v11.6.0 rename: - Rename page title and all feature-name references from 'Content Flagging' to 'Data Spillage Handling' - Update System Console navigation path to 'System Console > Site Configuration > Data Spillage Handling' - Replace 'flag/flagged' with 'quarantine/quarantined' where the product UI now uses that wording - Replace 'content-review bot' with 'Data Spillage Bot' in all user-facing notification and moderation queue descriptions - Update 'Flag message' menu action to 'Quarantine for Review' Internal RST cross-reference labels and API/config identifiers left unchanged per scope constraints. Closes #8869 Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update preparations.rst * Update Makefile * Update Data Spillage Handling reasons to new default categories Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> --------- Co-authored-by: Stuart Doherty <stu.doherty@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Allow System Admins to view and update User AuthData and Username in System Console (#8834) * Desktop v5.13.5 docs (#8828) * Update mattermost-desktop-releases.md * Update desktop-app-changelog.md * Update desktop-app-changelog.md * Update desktop-app-changelog.md * docs: add System Admin ability to update username and AuthData in System Console Reflects the new capability from mattermost/mattermost#33550 where System Admins can view and update user AuthData and username directly in the System Console user detail workflow. Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update user-management-configuration-settings.rst * Update desktop-app-changelog.md * Update mattermost-desktop-releases.md --------- Co-authored-by: Amy Blais <29708087+amyblais@users.noreply.github.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> * Update desktop-app-changelog.md * Update mattermost-desktop-releases.md * v11.6 Changelog (#8821) * Prepare v11.6 feature release docs (April 16, 2026) Co-authored-by: Amy Blais <amyblais@users.noreply.github.com> * Update important-upgrade-notes.rst * Update deprecated-features.rst * Update release-policy.md * Update mattermost-v11-changelog.md * Update software-hardware-requirements.rst * Update open-source-components.rst * Update mattermost-v11-changelog.md * Update ui-ada-changelog.rst * Update ui-ada-changelog.rst * Update mattermost-v11-changelog.md * Update mattermost-desktop-releases.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update source/product-overview/mattermost-v11-changelog.md Co-authored-by: Doug Lauder <wiggin77@warpmail.net> * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update ui-ada-changelog.rst * Update mattermost-v11-changelog.md * Update important-upgrade-notes.rst * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update ui-ada-changelog.rst * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update mattermost-v11-changelog.md * Update ui-ada-changelog.rst * Update mattermost-v11-changelog.md * Update ui-ada-changelog.rst --------- Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Amy Blais <amyblais@users.noreply.github.com> Co-authored-by: Doug Lauder <wiggin77@warpmail.net> --------- Co-authored-by: Christopher Poile <cpoile@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Co-authored-by: Combs7th <147677911+Combs7th@users.noreply.github.com> Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com> Co-authored-by: Combs7th <Combs7th@users.noreply.github.com> Co-authored-by: Stuart Doherty <stu.doherty@gmail.com> Co-authored-by: Eric Sethna <14333569+esethna@users.noreply.github.com> Co-authored-by: Amy Blais <amyblais@users.noreply.github.com> Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of changes
content-flagging.rst
flag-messages.rst
Not changed: The internal RST cross-reference label <administration-guide/configure/site-configuration-settings:content flagging> was left intact to avoid breaking the Sphinx link to the configuration settings page (which is outside the required touchpoints).