Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mermaid rescue #2738

Merged
merged 8 commits into from
May 8, 2024
Merged

Mermaid rescue #2738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cc9e397
Update COREReleaseNotes.md
DjP-iX May 8, 2024
625d0ea
Update SCALEReleaseNotes.md
DjP-iX May 8, 2024
564446d
Update _index.md
DjP-iX May 8, 2024
eac0dca
Update COREUpgradePaths.md
DjP-iX May 8, 2024
af78f5f
Update SCALEUpgradePaths.md
DjP-iX May 8, 2024
1cb43b1
Delete UpgradePaths.html
DjP-iX May 8, 2024
8f98960
Merge branch 'master' into Mermaid-Rescue
micjohnson777 May 8, 2024
7769a5a
spellcheck
DjP-iX May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content/CORE/GettingStarted/COREReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ More details are available from [Updating Core]({{< relref "/CORE/CORETutorials/

### Upgrade Paths

{{< UpgradePaths product="CORE" >}}
{{< include file="/static/includes/COREUpgradePaths.md" >}}

## Component Versions

Expand Down
3 changes: 1 addition & 2 deletions content/SCALE/GettingStarted/SCALEReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ More details are available from [Software Releases]({{< relref "/TrueNASUpgrades

Update the system to the latest maintenance release of the installed major version before attempting to upgrade to a new TrueNAS SCALE major version.

{{< UpgradePaths product="SCALE" >}}

**TrueNAS SCALE (Anticipated)**

{{< mermaid class="mermaid_sizing" >}}
Expand Down Expand Up @@ -108,6 +106,7 @@ More details are available from [Software Releases]({{< relref "/TrueNASUpgrades
You must either clean install or use an upgrade ***iso** file to migrate a TrueNAS CORE system to SCALE 24.04 (Dragonfish).
Enterprise customers should [contact Support](https://www.truenas.com/docs/scale/gettingstarted/migrate/migratecorehatoscaleha/#expand-1-Enterprise%20HA%20Migrations) for assistance with transitioning from CORE to SCALE.
-->

## Component Versions
Click the component version number to see the latest release notes for that component.

Expand Down
5 changes: 3 additions & 2 deletions content/TrueNASUpgrades/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ See the [Documentation Archive](https://www.truenas.com/docs/archive/) for conte

## Upgrade Paths

{{< UpgradePaths product="SCALE" >}}
{{< UpgradePaths product="CORE" >}}
{{< include file="/static/includes/SCALEUpgradePaths.md" >}}

{{< include file="/static/includes/COREUpgradePaths.md" >}}

## Release Schedules

Expand Down
2 changes: 1 addition & 1 deletion content/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ To view all historical documentation, visit the **[Docs Archive](/archive)**.
<h4 style="margin: 0;">Development Preview</h4>
</div>
<p>To stay up to date with the most recent developments, including anticipated features and improvements, click <strong>Next</strong> on the cards below.</p>
<p>See <a href="https://www.truenas.com/docs/truenasupgrades/">Software Releases</a> to download releases or view upgrade paths, release schedules, and development timelines.</p>
<p>See <a href="/truenasupgrades/">Software Releases</a> to download releases or view upgrade paths, release schedules, and development timelines.</p>
</div>

## Additional Content
Expand Down
35 changes: 0 additions & 35 deletions layouts/shortcodes/UpgradePaths.html
View file
Open in desktop

This file was deleted.

75 changes: 27 additions & 48 deletions static/includes/COREUpgradePaths.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,29 @@
&NewLine;

{{< mermaid class="mermaid_sizing" >}}
%%{
init: {
'theme': 'base',
'themeVariables': {
'primaryColor': '#FFFFFF',
'primaryTextColor': '#000000',
'primaryBorderColor': '#0095d5',
'secondaryColor': '#70d4ff',
'lineColor': '#0095d5',
'secondaryTextColor': '#FFFFFF',
'tertiaryColor': '#0095d5'
}
}
}%%

flowchart LR

A["11.0-U7"] -->|update| B["11.2-U8"]
B -->|update| C["11.3-U5"]
C -->|update| D["13.0-U6.1"]
D -->|"(anticipated)"| E["13.3.0"]
{{< /mermaid >}}

<img src="/images/tn-enterprise-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS CORE Enterprise" alt="TrueNAS CORE Enterprise">

{{< mermaid class="mermaid_sizing" >}}
%%{
init: {
'theme': 'base',
'themeVariables': {
'primaryColor': '#FFFFFF',
'primaryTextColor': '#000000',
'primaryBorderColor': '#0095d5',
'secondaryColor': '#70d4ff',
'lineColor': '#0095d5',
'secondaryTextColor': '#FFFFFF',
'tertiaryColor': '#0095d5'
}
}
}%%

flowchart LR

A["11.0-U7"] -->|update| B["11.2-U8"]
B -->|update| C["11.3-U5"]
C -->|update| D["13.0-U6.1"]
{{< /mermaid >}}
<style>
/* Custom CSS to override Mermaid background color */
#core-upgrade-paths .mermaid {
background-color: inherit;
}
</style>
<div class="section-box" id="core-upgrade-paths" style="padding: 0 40px 40px 40px; margin-bottom: 20px;">
<div class="upgrade-paths-container">
<img src="/images/truenas-core-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS CORE" alt="TrueNAS CORE">
{{< mermaid class="mermaid_sizing" >}}
flowchart LR
A["11.0-U7"] -->|update| B["11.2-U8"]
B -->|update| C["11.3-U5"]
C -->|update| D["13.0-U6.1"]
D -->|"(anticipated)"| E["13.3.0"]
{{< /mermaid >}}
</div>
<div class="upgrade-paths-container">
<img src="/images/tn-enterprise-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS CORE Enterprise" alt="TrueNAS CORE Enterprise">
{{< mermaid class="mermaid_sizing" >}}
flowchart LR
A["11.0-U7"] -->|update| B["11.2-U8"]
B -->|update| C["11.3-U5"]
C -->|update| D["13.0-U6.1"]
{{< /mermaid >}}
</div>
</div>
76 changes: 29 additions & 47 deletions static/includes/SCALEUpgradePaths.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,31 @@
&NewLine;

{{< mermaid class="mermaid_sizing" >}}
%%{
init: {
'theme': 'base',
'themeVariables': {
'primaryColor': '#FFFFFF',
'primaryTextColor': '#000000',
'primaryBorderColor': '#0095d5',
'secondaryColor': '#70d4ff',
'lineColor': '#0095d5',
'secondaryTextColor': '#FFFFFF',
'tertiaryColor': '#0095d5'
}
}
}%%

flowchart LR

A["22.02.4 (Angelfish)"] -->|update| C
B[CORE 13.0-U6.1] -->|ISO install| E
C["22.12.4.2 (Bluefin)"] -->|update| D
D["23.10.2 (Cobia)"] -->|update| E
E["24.04.0 (Dragonfish)"]
{{< /mermaid >}}

<img src="/images/tn-enterprise-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS SCALE Enterprise" alt="TrueNAS SCALE Enterprise">

{{< mermaid class="mermaid_sizing" >}}
%%{
init: {
'theme': 'base',
'themeVariables': {
'primaryColor': '#FFFFFF',
'primaryTextColor': '#000000',
'primaryBorderColor': '#0095d5',
'secondaryColor': '#70d4ff',
'lineColor': '#0095d5',
'secondaryTextColor': '#FFFFFF',
'tertiaryColor': '#0095d5'
}
}
}%%

flowchart LR
A["CORE 13.0-U6.1"] -->|ISO install| D
B["Current 23.10 (Cobia) release"] -->|update| C["23.10.2 (Cobia)"] -->|update| D["24.04.0 (Dragonfish)"]
{{< /mermaid >}}
<style>
/* Custom CSS to override Mermaid background color */
#scale-upgrade-paths .mermaid {
background-color: inherit;
}
</style>
<div class="section-box" id="scale-upgrade-paths" style="padding: 0 40px 40px 40px; margin-bottom: 20px;">
<div class="upgrade-paths-container">
<img src="/images/tn-scale-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS SCALE" alt="TrueNAS SCALE">
{{< mermaid class="mermaid_sizing" >}}
flowchart LR
A["22.02.4 (Angelfish)"] -->|update| C
B["CORE 13.0-U6.1"] -->|ISO install| E
C["22.12.4.2 (Bluefin)"] -->|update| D
D["23.10.2 (Cobia)"] -->|update| E
E["24.04.0 (Dragonfish)"]
{{< /mermaid >}}
</div>
<div class="upgrade-paths-container">
<img src="/images/tn-enterprise-logo.png" style="box-shadow: none; max-width: 225px; padding-bottom: 20px; padding-top: 40px;" title="TrueNAS SCALE Enterprise" alt="TrueNAS SCALE Enterprise">
{{< mermaid class="mermaid_sizing" >}}
flowchart LR
A["CORE 13.0-U6.1"] -->|ISO install| D
B["Current 23.10 (Cobia) release"] -->|update| C
C["23.10.2 (Cobia)"] -->|update| D
D["24.04.0 (Dragonfish)"]
{{< /mermaid >}}
</div>
</div>
4 changes: 3 additions & 1 deletion words-to-ignore.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,4 +1901,6 @@ hseriessov
MiniRSOV
minirsov
truenascollection
FullStencilPack
FullStencilPack
SCALEUpgradePaths
COREUpgradePaths
Loading