diff --git a/docs/.sphinx/_static/custom_styles.css b/docs/.sphinx/_static/custom_styles.css index 411de71f1..ac25ba287 100644 --- a/docs/.sphinx/_static/custom_styles.css +++ b/docs/.sphinx/_static/custom_styles.css @@ -1,15 +1,17 @@ -.codeblock-wrap pre { white-space:pre-wrap; } +.codeblock-wrap pre { + white-space: pre-wrap; +} pre.mermaid svg { - width: 70% !important; - height: auto !important; + width: 100% !important; + height: auto !important; } /* Append "(in this article)" dynamically for links within any series admonition that point to the current page */ .admonition-highlight-this-page a.reference.internal[href^="#"]:after { - content: " (in this article)"; - font-style: italic; - font-weight: normal; - color: #777; /* Greyed out, independent of link visited state */ - margin-left: 4px; + content: " (in this article)"; + font-style: italic; + font-weight: normal; + color: #777; /* Greyed out, independent of link visited state */ + margin-left: 4px; } diff --git a/docs/MIR/mir-process-states.md b/docs/MIR/mir-process-states.md index 31a9358f4..ed5b8c1d1 100644 --- a/docs/MIR/mir-process-states.md +++ b/docs/MIR/mir-process-states.md @@ -16,7 +16,13 @@ an MIR bug's current state. ```{mermaid} %% mermaid flowcharts documentation: https://mermaid.js.org/syntax/flowchart.html -%%{ init: { "flowchart": { "curve": "monotoneY", "htmlLabels": true } } }%% +%%{ init: { 'flowchart': { + 'curve': 'monotoneY', + 'htmlLabels': true }, + 'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'} } }%% + flowchart TD %% Styles classDef Invisible stroke-width:0,fill:#00000000 @@ -37,27 +43,27 @@ flowchart TD BugCreated>"Bug created"] %% Transitions - Start-->|"
a) create MIR bug
"| BugCreated - BugCreated-->|"
b) subscribe ~ubuntu-mir
"|ToReview + Start-->|"
a) create MIR bug
"| BugCreated + BugCreated-->|"
b) subscribe ~ubuntu-mir
"|ToReview - ToReview -->|"
c) triaged by MIR team
"| AssignedToMirTeamMember + ToReview -->|"
c) triaged by MIR team
"| AssignedToMirTeamMember - AssignedToMirTeamMember -->|"
d) MIR team ACK
"| InProgress - AssignedToMirTeamMember -->|"
e) MIR team ACK,
Security needed
"| AssignedToSecurityTeamMember - AssignedToMirTeamMember -->|"
f) MIR team NACK
"| WontFix - AssignedToMirTeamMember -->|"
g) needs questions/actions
"| Incomplete + AssignedToMirTeamMember -->|"
d) MIR team ACK
"| InProgress + AssignedToMirTeamMember -->|"
e) MIR team ACK,
Security needed
"| AssignedToSecurityTeamMember + AssignedToMirTeamMember -->|"
f) MIR team NACK
"| WontFix + AssignedToMirTeamMember -->|"
g) needs questions/actions
"| Incomplete - AssignedToSecurityTeamMember -->|"
h) Security ACK
"| InProgress - AssignedToSecurityTeamMember -->|"
i) Security NACK
"| WontFix - AssignedToSecurityTeamMember -->|"
j) needs questions/actions
"| Incomplete + AssignedToSecurityTeamMember -->|"
h) Security ACK
"| InProgress + AssignedToSecurityTeamMember -->|"
i) Security NACK
"| WontFix + AssignedToSecurityTeamMember -->|"
j) needs questions/actions
"| Incomplete - Incomplete -->|"
k) questions/actions resolved
"| ToReview - WontFix -->|"
l) situation changes
"| ToReview - InProgress -->|"
m) package(s) pulled into main
"| FixCommitted + Incomplete -->|"
k) questions/actions resolved
"| ToReview + WontFix -->|"
l) situation changes
"| ToReview + InProgress -->|"
m) package(s) pulled into main
"| FixCommitted FixCommitted -->|"n) Archive Admin
promotes package(s)"| FixReleased - Incomplete -->|"
o) no response
"| Invalid + Incomplete -->|"
o) no response
"| Invalid ``` | Index | State | Assignee / Subscriber | State-Explanation | diff --git a/docs/SRU/explanation/pipeline.rst b/docs/SRU/explanation/pipeline.rst index 65b089057..e1c473812 100644 --- a/docs/SRU/explanation/pipeline.rst +++ b/docs/SRU/explanation/pipeline.rst @@ -35,11 +35,11 @@ Overview of the SRU pipeline The following diagram illustrates this pipeline: .. mermaid:: - :align: center %%{init: {'themeVariables': { - 'fontSize': '20px', + 'fontSize': '0.8em', 'fontFamily': 'Ubuntu'}}}%% + flowchart TD prepare_package["Prepare the bug fix, and the SRU template"] unapproved["Upload the package to the unapproved queue"] diff --git a/docs/how-ubuntu-is-made/concepts/package-archive.rst b/docs/how-ubuntu-is-made/concepts/package-archive.rst index 61524e06b..adbabecaa 100644 --- a/docs/how-ubuntu-is-made/concepts/package-archive.rst +++ b/docs/how-ubuntu-is-made/concepts/package-archive.rst @@ -10,11 +10,11 @@ On Ubuntu installations, the Ubuntu package archive is configured as the default The general flow is that the archive splits into :ref:`Ubuntu series `. Each series is split up into :ref:`pockets `, and then each pocket contains four :ref:`components `. This diagram shows a look through a single path: .. mermaid:: - :align: center %%{init: {'themeVariables': { - 'fontSize': '25px', + 'fontSize': '1em', 'fontFamily': 'Ubuntu'}}}%% + flowchart TD; A[Ubuntu package archive] --> B([Splits into Ubuntu **series**]); diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-1-report-triage.txt b/docs/how-ubuntu-is-made/processes/lifecycle-1-report-triage.txt index a3cc3440c..9ec453850 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-1-report-triage.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-1-report-triage.txt @@ -1,17 +1,13 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1.5em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart LR - File["File bug on Launchpad
with reproduction steps
and system details"] --> Triage - Triage{"Triage:
enough information?
right package?
assignee?"} - PrepareFix(["Prepare change"]) - Triage -.-> |"needs more info"| File + File["File bug on Launchpad
with reproduction steps and system details"] --> Triage + Triage{"Triage:
enough information?
right package?
assignee?"} + PrepareFix(["Prepare change"]) + Triage -.-> |"needs
more info"| File Triage --> |"actionable"| PrepareFix - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class File ubuntuStyle - - classDef gateStyle fill:#D0E8FF,stroke:#3366CC,stroke-width:2px - class Triage gateStyle - - classDef terminalStyle fill:#E0E0E0,stroke:#666666,stroke-width:2px - class PrepareFix terminalStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-2-prepare-test.txt b/docs/how-ubuntu-is-made/processes/lifecycle-2-prepare-test.txt index c9603e777..ff38ed0d0 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-2-prepare-test.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-2-prepare-test.txt @@ -1,18 +1,17 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1.8em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart LR - Fix["Prepare change:
patch · merge · sync"] + Fix["Prepare change:
patch · merge · sync"] Fix --> Build - Build["PPA build on Launchpad
(all architectures)"] + Build["PPA build on Launchpad
(all architectures)"] Build -.-> |"build fails"| Fix Build --> |"build OK"| Test - Test["Run autopkgtests
against PPA packages"] + Test["Run autopkgtests
against PPA packages"] Test -.-> |"test regressions"| Fix - ProposeChange(["Propose change"]) + ProposeChange(["Propose change"]) Test --> |"ready"| ProposeChange - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class Fix,Build,Test ubuntuStyle - - classDef terminalStyle fill:#E0E0E0,stroke:#666666,stroke-width:2px - class ProposeChange terminalStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-3-propose-review.txt b/docs/how-ubuntu-is-made/processes/lifecycle-3-propose-review.txt index f82a6cdea..1fb19b939 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-3-propose-review.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-3-propose-review.txt @@ -1,19 +1,15 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart LR - MP["Submit Merge Proposal
on Launchpad"] --> Review - Review{"Code review"} + MP["Submit Merge Proposal
on Launchpad"] --> Review + Review{"Code review"} Review -.-> |"changes requested"| Revise["Revise change"] Revise --> Review - Upload(["Upload"]) + Upload(["Upload"]) Review --> |"approved"| Upload - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class MP,Revise ubuntuStyle - - classDef gateStyle fill:#D0E8FF,stroke:#3366CC,stroke-width:2px - class Review gateStyle - - classDef terminalStyle fill:#E0E0E0,stroke:#666666,stroke-width:2px - class Upload terminalStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-4-upload-sponsor.txt b/docs/how-ubuntu-is-made/processes/lifecycle-4-upload-sponsor.txt index 9ebddaddf..5c9979990 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-4-upload-sponsor.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-4-upload-sponsor.txt @@ -1,18 +1,14 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1.5em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart LR - Rights{"Upload rights
for this package?"} - Rights --> |"no: Find sponsor"| Sponsor - Sponsor["sponsor re-reviews"] + Rights{"Upload rights
for this package?"} + Rights --> |"no: Find sponsor"| Sponsor + Sponsor["sponsor re-reviews"] Sponsor --> |"sponsor approves"| Upload Rights --> |"yes"| Upload - Upload(["Upload to Ubuntu Archive"]) - - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class Sponsor ubuntuStyle - - classDef gateStyle fill:#D0E8FF,stroke:#3366CC,stroke-width:2px - class Rights gateStyle + Upload(["Upload to Ubuntu Archive"]) - classDef terminalStyle fill:#E0E0E0,stroke:#666666,stroke-width:2px - class Upload terminalStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-5-proposed-migration.txt b/docs/how-ubuntu-is-made/processes/lifecycle-5-proposed-migration.txt index 0e15741e5..9cbea4a52 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-5-proposed-migration.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-5-proposed-migration.txt @@ -1,30 +1,26 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '0.4em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart TD Build{Builds} Fix["Please fix & re-upload"] - Autopkg{"Autopkgtests"} - InvestigateAPKGT["Investigate regressions"] - ArchiveChecks{"Archive consistency
(Britney)"} + Autopkg{"Autopkgtests"} + InvestigateAPKGT["Investigate regressions"] + ArchiveChecks{"Archive consistency
(Britney)"} Done(["Migrates"]) - - Build -.-> |"FTBFS"| Fix + + Build -.-> |"FTBFS"| Fix Build --> |"all builds OK"| Autopkg - + Autopkg -.-> |"regressions"| InvestigateAPKGT Autopkg --> |"all pass"| ArchiveChecks - + InvestigateAPKGT -.-> |"Real problem"| Fix InvestigateAPKGT --> |"Transient issues, now resolved"| ArchiveChecks ArchiveChecks -.-> |"blocked by dependencies"| Fix ArchiveChecks --> |"all checks OK"| Done - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class Fix,InvestigateAPKGT ubuntuStyle - - classDef gateStyle fill:#D0E8FF,stroke:#3366CC,stroke-width:2px - class Build,Autopkg,ArchiveChecks gateStyle - - classDef terminalStyle fill:#E0E0E0,stroke:#666666,stroke-width:2px - class Done terminalStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/lifecycle-of-a-change.txt b/docs/how-ubuntu-is-made/processes/lifecycle-of-a-change.txt index ef21001cc..27bd25fae 100644 --- a/docs/how-ubuntu-is-made/processes/lifecycle-of-a-change.txt +++ b/docs/how-ubuntu-is-made/processes/lifecycle-of-a-change.txt @@ -1,4 +1,8 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '2em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart LR BugReport["Bug Report
& Triage"] PrepareTest["Prepare
& Test"] @@ -14,7 +18,5 @@ flowchart LR Upload -.-> |"active release"| SRU SRU --> Migration - classDef ubuntuStyle fill:#FFDAB9,stroke:#E95420,stroke-width:2px - class BugReport,PrepareTest,Review,Migration,Upload,SRU ubuntuStyle ::: diff --git a/docs/how-ubuntu-is-made/processes/proposed-migration/failure-to-build-from-source-ftbfs.md b/docs/how-ubuntu-is-made/processes/proposed-migration/failure-to-build-from-source-ftbfs.md index 32c7f020e..6439de173 100644 --- a/docs/how-ubuntu-is-made/processes/proposed-migration/failure-to-build-from-source-ftbfs.md +++ b/docs/how-ubuntu-is-made/processes/proposed-migration/failure-to-build-from-source-ftbfs.md @@ -146,6 +146,10 @@ Sometimes a package builds successfully locally (and even in a PPA), but fails i [pkgbinarymangler](https://launchpad.net/ubuntu/+source/pkgbinarymangler) is one of those upload-only steps. It is disabled for all PPA builds (except for `OEM PPA`) and also absent from most local build environments unless `pkgbinarymangler` is explicitly installed. ```{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart TD A["dh_builddeb
(manages lockfile)"] --> B["Lockfile
(queue)"] B -->|"wait(head==package1)"| C["dpkg-deb.pkgbinarymangler
Binary Package 1"] @@ -197,4 +201,4 @@ To reproduce this issue locally, install `pkgbinarymangler` in your build enviro ```none $ sudo apt install -y pkgbinarymangler -``` \ No newline at end of file +``` diff --git a/docs/who-makes-ubuntu/councils/dmb-manage-packagesets.md b/docs/who-makes-ubuntu/councils/dmb-manage-packagesets.md index c3e178d74..558d206e8 100644 --- a/docs/who-makes-ubuntu/councils/dmb-manage-packagesets.md +++ b/docs/who-makes-ubuntu/councils/dmb-manage-packagesets.md @@ -33,6 +33,10 @@ Think of it as a relation between Launchpad personas and a list of packages. ```{mermaid} %% mermaid flowcharts documentation: https://mermaid.js.org/syntax/flowchart.html + %%{init: {'themeVariables': { + 'fontSize': '0.6em', + 'fontFamily': 'Ubuntu'}}}%% + flowchart TD %% Entities Developers["Developer"] diff --git a/docs/who-makes-ubuntu/developers/diagrams/advanced.txt b/docs/who-makes-ubuntu/developers/diagrams/advanced.txt index 8653fe986..7c986b839 100644 --- a/docs/who-makes-ubuntu/developers/diagrams/advanced.txt +++ b/docs/who-makes-ubuntu/developers/diagrams/advanced.txt @@ -1,4 +1,8 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'}}}%% + block-beta columns 3 @@ -6,8 +10,8 @@ block-beta AdvancedStudies("Advanced studies") columns 1 space:3 - StudyFFe{{"Study FFe"}} - PlusOne{{"Study +1"}} + StudyFFe{{"Study FFe"}} + PlusOne{{"Study +1"}} end block:middle @@ -23,9 +27,9 @@ block-beta block:right columns 2 space - PPU["PPU*"] + PPU["PPU*"] space - PackageSet["Packageset"] + PackageSet["Packageset"] space:8 end @@ -34,8 +38,6 @@ block-beta StudyFFe --> DoAnFFe PlusOne --> PlusOneShadowing - classDef Studies fill: #FFDAB9, stroke:#F4A460; - class AdvancedStudies,AdvancedTasks Studies classDef invisible fill:transparent,stroke:transparent; class left,middle,right invisible ::: diff --git a/docs/who-makes-ubuntu/developers/diagrams/basics.txt b/docs/who-makes-ubuntu/developers/diagrams/basics.txt index cd5d0e600..6e64065c1 100644 --- a/docs/who-makes-ubuntu/developers/diagrams/basics.txt +++ b/docs/who-makes-ubuntu/developers/diagrams/basics.txt @@ -1,4 +1,8 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'}}}%% + block-beta columns 2 block:left @@ -12,15 +16,13 @@ columns 2 block:right InitialTasks("Initial tasks") columns 1 - BugTriage["Bug triage"] + BugTriage["Bug triage"] BiteSizedBugs["Bite-sized bugs"] TrivialPackgeMerges["Trivial package merges"] end InitialStudies --> InitialTasks - classDef Studies fill: #FFDAB9, stroke:#F4A460; - class InitialStudies,InitialTasks Studies classDef invisible fill:transparent,stroke:transparent; class left,right invisible ::: diff --git a/docs/who-makes-ubuntu/developers/diagrams/expert.txt b/docs/who-makes-ubuntu/developers/diagrams/expert.txt index b36efcd73..1c70e2190 100644 --- a/docs/who-makes-ubuntu/developers/diagrams/expert.txt +++ b/docs/who-makes-ubuntu/developers/diagrams/expert.txt @@ -1,4 +1,8 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '0.8em', + 'fontFamily': 'Ubuntu'}}}%% + block-beta columns 3 @@ -21,7 +25,7 @@ block-beta block:motu columns 2 id2((" ")) - MOTU["MOTU"] + MOTU["MOTU"] space:4 id3((" ")) space @@ -33,7 +37,7 @@ block-beta columns 1 ExpertinMainStudies("Expert in main studies") space - StudyMIR{{"Study MIR"}} + StudyMIR{{"Study MIR"}} space:1 end @@ -48,7 +52,7 @@ block-beta block:coredev columns 2 space - CoreDev["Core Dev"] + CoreDev["Core Dev"] space:6 end @@ -63,12 +67,7 @@ block-beta StudyMIR-->DoMIR StudyMIR-->SeedChange - classDef Studies fill: #FFDAB9, stroke:#F4A460; - class ExpertStudies,ExpertTasks,ExpertinMainStudies,ExpertinMainTasks Studies - classDef invisible fill: transparent, stroke: transparent class topleft,topright,lowerleft,lowerright,motu,coredev invisible + ::: - classDef solid fill: #000, stroke: transparent - class id1,id2,id3 solid -::: diff --git a/docs/who-makes-ubuntu/developers/diagrams/intermediate.txt b/docs/who-makes-ubuntu/developers/diagrams/intermediate.txt index 7c3650b02..db4795a92 100644 --- a/docs/who-makes-ubuntu/developers/diagrams/intermediate.txt +++ b/docs/who-makes-ubuntu/developers/diagrams/intermediate.txt @@ -1,4 +1,8 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontSize': '1em', + 'fontFamily': 'Ubuntu'}}}%% + block-beta columns 3 @@ -10,12 +14,12 @@ block-beta SRU{{"Study SRU"}} space:1 end - + block:middle columns 1 IntermediateTasks("Intermediate tasks") - AddAUTOPKGTESTS["Add Autopkgtest"] - ProposeMigration["Proposed Migration"] + AddAUTOPKGTESTS["Add Autopkgtest"] + ProposeMigration["Proposed Migration"] DoSRUS["Do SRUS"] WorkOnBugs["Work on packaging bugs/features"] end @@ -23,7 +27,7 @@ block-beta block:right columns 2 space - PPU["PPU*"] + PPU["PPU*"] space:8 end @@ -32,8 +36,6 @@ block-beta SRU --> DoSRUS IntermediateTasks --> PPU - classDef Studies fill: #FFDAB9, stroke:#F4A460; - class IntermediateStudies,IntermediateTasks Studies classDef invisible fill:transparent,stroke:transparent; class left,middle,right invisible ::: diff --git a/docs/who-makes-ubuntu/developers/diagrams/overall-path.txt b/docs/who-makes-ubuntu/developers/diagrams/overall-path.txt index 0d300d0cc..e2d3423d5 100644 --- a/docs/who-makes-ubuntu/developers/diagrams/overall-path.txt +++ b/docs/who-makes-ubuntu/developers/diagrams/overall-path.txt @@ -1,4 +1,7 @@ :::{mermaid} + %%{init: {'themeVariables': { + 'fontFamily': 'Ubuntu'}}}%% + block-beta columns 6 @@ -30,7 +33,7 @@ block-beta block:col3 columns 2 UploadRights{{"Upload
rights"}} - PPU["PPU*"] + PPU["PPU*"] space:2 Intermediate("Intermediate") id2((" ")) @@ -43,7 +46,7 @@ block-beta block:col4 columns 2 space - PackageSet["PPU*
PackageSet"] + PackageSet["PPU*
PackageSet"] space:2 Advanced("Advanced") id3((" ")) @@ -56,7 +59,7 @@ block-beta block:col5 columns 2 space - MOTU["MOTU"] + MOTU["MOTU"] space:2 Expert("Expert") id4((" ")) @@ -67,7 +70,7 @@ block-beta block:col6 columns 2 space - CoreDev["Core Dev"] + CoreDev["Core Dev"] space:2 Main("Expert
in main") id5((" ")) @@ -90,19 +93,7 @@ id5 --> CoreDev Contributor --> Maintainer Maintainer --> Developer -%% Styling -classDef debianStyle fill: #F8A3C0, stroke: #DD1155 - class Debian,Contributor,Maintainer,Developer debianStyle - -classDef ubuntuStyle fill: #FFDAB9, stroke: #E95420,stroke-width:1px; - class Ubuntu,Basics,Intermediate,Advanced,Expert,Main ubuntuStyle - -classDef uploaderStyle fill: #FFDF7E, stroke: #FBAB13 - class UploadRights,PPU,PackageSet,MOTU,CoreDev uploaderStyle - -classDef invisible fill: transparent, stroke: transparent - class id1,col1,col2,col3,col4,col5,col6,col7 invisible + classDef invisible fill: transparent, stroke: transparent + class id1,col1,col2,col3,col4,col5,col6,col7 invisible + ::: -classDef solid fill: #000, stroke: transparent - class id2,id3,id4,id5 solid -:::