Improve how we display install and upgrade options (#16470)

- Separate them more
- Clarify the impact on persistent storage
- Put on the same level as download only in release notes

wiki/src/contribute/how/documentation/release_notes/template.mdwn

@@ -65,18 +65,31 @@ See the list of [[long-standing issues|support/known_issues]].
 
 # Get Tails $VERSION
 
-- To install, follow our [[installation instructions|install]].
+## To install Tails on a new USB stick
 
-- To upgrade, automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
+Follow our installation instructions:
+
+  - [[Install from Windows|install/win]]
+  - [[Install from macOS|install/mac]]
+  - [[Install from Linux|install/linux]]
+
+<div class="caution"><p>All the data on this USB stick will be lost.</p></div>
+
+## To upgrade your Tails USB stick and keep your persistent storage
+
+- Automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
 
   XXX: Check which IUK will be available with:
 
       git diff origin/master...origin/web/release-$VERSION wiki/src/upgrade/v1/Tails | grep "to_$VERSION"
 
-  If you cannot do an automatic upgrade or if Tails fails to start after an
+- If you cannot do an automatic upgrade or if Tails fails to start after an
   automatic upgrade, please try to do a [[manual upgrade|upgrade]].
 
-- Download Tails $VERSION:
+## To download only
+
+If you don't need install or upgrade instructions, you can directly download
+Tails $VERSION:
 
   - [[For USB sticks (USB image)|install/download]]
   - [[For DVDs and virtual machines (ISO image)|install/download-iso]]

wiki/src/install/inc/steps/download.inline.html

@@ -148,10 +148,16 @@
           <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
           <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
           <ul class="download-only-img">
-            <li>[[Install from Windows|install/win/usb]]</li>
-            <li>[[Install from macOS|install/mac/usb]]</li>
-            <li>[[Install from Linux|install/linux/usb]]</li>
-            <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+            <p>Install a new USB stick:</p>
+            <ul>
+              <li>[[Install from Windows|install/win/usb]]</li>
+              <li>[[Install from macOS|install/mac/usb]]</li>
+              <li>[[Install from Linux|install/linux/usb]]</li>
+            </ul>
+            <p>Upgrade your Tails USB stick and keep your persistent storage:</p>
+            <ul>
+              <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+            </ul>
           </ul>
           <ul class="download-only-iso">
             <li>[[Burn on a DVD|dvd]]</li>
@@ -267,10 +273,16 @@
         <div class="dvd">[[<div class="btn btn-primary inline-block">Next: Burning Tails on a DVD</div>|dvd]]</div>
         <div class="vm">[[<div class="btn btn-primary inline-block">Next: Virtualization</div>|doc/advanced_topics/virtualization]]</div>
         <ul class="download-only-img">
-          <li>[[Install from Windows|install/win/usb]]</li>
-          <li>[[Install from macOS|install/mac/usb]]</li>
-          <li>[[Install from Linux|install/linux/usb]]</li>
-          <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+          <p>Install a new USB stick:</p>
+          <ul>
+            <li>[[Install from Windows|install/win/usb]]</li>
+            <li>[[Install from macOS|install/mac/usb]]</li>
+            <li>[[Install from Linux|install/linux/usb]]</li>
+          </ul>
+          <p>Upgrade your Tails USB stick and keep your persistent storage:</p>
+          <ul>
+            <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+          </ul>
         </ul>
         <ul class="download-only-iso">
           <li>[[Burn on a DVD|dvd]]</li>

wiki/src/install/inc/stylesheets/download.css

@@ -87,6 +87,10 @@ span.step-number {
   margin-top: 5em;
 }
 
+ul ul {
+  margin-bottom: 1.5em;
+}
+
 /* FLOATING TOGGLEABLE FOR 'WHY?' CONTEXTUAL HELP */
 
 /* Hide toggleable by default so they don't appear when there is no JavaScript. */

wiki/src/news/version_3.13.mdwn

@@ -105,14 +105,28 @@ See the list of [[long-standing issues|support/known_issues]].
 
 # Get Tails 3.13
 
-- To install, follow our [[installation instructions|install]].
+## To install Tails on a new USB stick
 
-- To upgrade, automatic upgrades are available from 3.11, 3.12~rc1, 3.12, and 3.12.1 to 3.13.
+Follow our installation instructions:
 
-  If you cannot do an automatic upgrade or if Tails fails to start after an
+  - [[Install from Windows|install/win]]
+  - [[Install from macOS|install/mac]]
+  - [[Install from Linux|install/linux]]
+
+<div class="caution"><p>All the data on this USB stick will be lost.</p></div>
+
+## To upgrade your Tails USB stick and keep your persistent storage
+
+- [[Automatic upgrades|doc/first_steps/upgrade]] are available from 3.11,
+  3.12~rc1, 3.12, and 3.12.1 to 3.13.
+
+- If you cannot do an automatic upgrade or if Tails fails to start after an
   automatic upgrade, please try to do a [[manual upgrade|upgrade]].
 
-- Download Tails 3.13:
+## To download only
+
+If you don't need install or upgrade instructions, you can directly download
+Tails 3.13:
 
   - [[For USB sticks (USB image)|install/download]]
   - [[For DVDs and virtual machines (ISO image)|install/download-iso]]