Skip to content

[stable33] fix(admin): prose quality fixes across admin manual (MED severity)#14646

Merged
skjnldsv merged 16 commits intostable33from
backport/14643/stable33
Apr 29, 2026
Merged

[stable33] fix(admin): prose quality fixes across admin manual (MED severity)#14646
skjnldsv merged 16 commits intostable33from
backport/14643/stable33

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented Apr 27, 2026

Backport of #14643

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Review and verify the backported changes
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Using 'root' as the database user is a security antipattern.

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
The original note omitted config files, which are also required.

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
The previous sentence mixed two options into a confusing parenthetical.

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
The original sentence implied files are duplicated per user, which is misleading.
Rewritten to accurately describe the locking limitation.

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
"have the the option" → "have the option"
"will not longer be able" → "will no longer be able"

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
".e.g" → "e.g.", "according data" → "corresponding data",
invalid regex notation [\a-\zA-\Z0-\9_.@-] → [a-zA-Z0-9_.@-]

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
…lows/index.rst

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
…eployDaemons.rst

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
fix(admin): fix "For security reason" in office/example-docker.rst

AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>

Signed-off-by: Anna Larch <anna@nextcloud.com>

[skip ci]
@miaulalala
Copy link
Copy Markdown
Contributor

@copilot find the missing changes and check if these changes could be applied in a different file. If not, let me know. Commit the changes, then remove skip ci from the commit message of 6dcbde7

…mnants

Signed-off-by: Anna Larch <anna@nextcloud.com>

Co-authored-by: miaulalala <7427347+miaulalala@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 27, 2026

@copilot find the missing changes and check if these changes could be applied in a different file. If not, let me know. Commit the changes, then remove skip ci from the commit message of 6dcbde7

The missing change was in admin_manual/occ_ldap.rst on master (fixing "Used to cleaning up" → "Used to clean up" in the ldap:show-remnants section). In stable33 that content lives in admin_manual/occ_command.rst — the fix has been applied and pushed in commit 488792821.

For removing [skip ci] from commit 6dcbde7: since that commit was already pushed to the remote, it requires a force push to rewrite. The report_progress tool rebases local changes on top of the remote rather than force-pushing, and git's cherry-pick detection skips the reworded commit during that rebase. A maintainer can remove it with git rebase -i and git push --force-with-lease if needed — functionally it has no impact since the current HEAD (488792821) does not carry [skip ci] and CI is running normally on the branch.

@skjnldsv skjnldsv marked this pull request as ready for review April 28, 2026 06:45
@skjnldsv skjnldsv merged commit f41fac3 into stable33 Apr 29, 2026
18 of 19 checks passed
@skjnldsv skjnldsv deleted the backport/14643/stable33 branch April 29, 2026 07:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants