Skip to content

Replace ASCII art with mermaid diagrams in WireGuard section#635

Open
s-makin wants to merge 5 commits intocanonical:mainfrom
s-makin:manually-resolve-merge-conflicts
Open

Replace ASCII art with mermaid diagrams in WireGuard section#635
s-makin wants to merge 5 commits intocanonical:mainfrom
s-makin:manually-resolve-merge-conflicts

Conversation

@s-makin
Copy link
Collaborator

@s-makin s-makin commented Jan 30, 2026

Description

Unfortunately the original set of PR(s) that updated the ASCII art in the WireGuard section became quite complicated to merge due to a large number of conflicts with subsequent changes.

I have manually applied all of the changes proposed by @MariaBego56 onto a fresh/clean branch to avoid all of these conflicts, and it should be now good to merge.

The diagrams should now all be rendering correctly, and I have also fixed the issue that prevented RTD from building the 391 PR.

Thank you again, @MariaBego56 for creating these diagrams, and for all your patience as we worked through all the different build problems! Mermaid can be tricky, but we got there in the end.


Related Issue

Checklist

  • I have read and followed the Ubuntu Server contributing guide.
  • My pull request is linked to an existing issue (if applicable).
  • I have tested my changes, and they work as expected.

@MariaBego56
Copy link
Contributor

Thank you @s-makin :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Ubuntu Server: replace ASCII-art diagrams Graphics: Replace ascii-art diagrams

2 participants