Skip to content

[stable32] fix(user): fix high-severity prose errors across user manual - #14693

Merged
skjnldsv merged 6 commits into
stable32from
backport/14627/stable32
May 1, 2026
Merged

[stable32] fix(user): fix high-severity prose errors across user manual#14693
skjnldsv merged 6 commits into
stable32from
backport/14627/stable32

Conversation

@backportbot

@backportbot backportbot Bot commented May 1, 2026

Copy link
Copy Markdown

Backport of #14627

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.

miaulalala added 5 commits May 1, 2026 14:31
…e.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>
AI-Assisted-By: claude-sonnet-4-6 <noreply@anthropic.com>
Signed-off-by: Anna Larch <anna@nextcloud.com>
…alendar.rst

The "Import an Event" section had near-identical steps to "Import a Calendar"
with no explanation of why they differ. Clarified that single-event .ics files
use the same import dialog and are added to the selected calendar.

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

fix(user): add guidance for enabling 2FA after DAVx⁵ setup in sync_android.rst

The 2FA note told users to use an app password but gave no guidance for

the case where 2FA was enabled after DAVx⁵ was already configured.

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

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

[skip ci]
@skjnldsv

skjnldsv commented May 1, 2026

Copy link
Copy Markdown
Member

@copilot fix this partial backport based on the original PR.

@skjnldsv
skjnldsv marked this pull request as ready for review May 1, 2026 14:51
…e" → "Allow participants to choose" in talk/advanced_features.rst

Agent-Logs-Url: https://github.com/nextcloud/documentation/sessions/acf2fcc6-9930-4735-8581-904f031d26c0

Co-authored-by: skjnldsv <14975046+skjnldsv@users.noreply.github.com>

Copilot AI commented May 1, 2026

Copy link
Copy Markdown
Contributor

@copilot fix this partial backport based on the original PR.

Done. The backport was missing two fixes from the original PR. In stable32, the content lives in talk/advanced_features.rst (rather than separate conversations.rst and breakout_rooms.rst files). Applied in commit 61b7bf3:

  • "notificed" → "notified"
  • "Allow participants choose" → "Allow participants to choose"

@skjnldsv
skjnldsv enabled auto-merge May 1, 2026 14:53
@skjnldsv
skjnldsv merged commit c4e85a3 into stable32 May 1, 2026
15 checks passed
@skjnldsv
skjnldsv deleted the backport/14627/stable32 branch May 1, 2026 14:59
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