summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2019-03-19 18:10:59 +0000
committersajolida <sajolida@pimienta.org>2019-03-19 18:14:10 +0000
commit7202661aadd7055c2d48e11efb105ea9164b2470 (patch)
tree1877b10fe48f7b6e02491d54347c818d688b671b
parent364003d9f713116322cae18017289cd69399ae67 (diff)
parentf60fe450e5ad15b9fa6c4b8e27fdc9db0168145c (diff)
Merge branch 'web/16470-better-install-vs-upgrade' into web/16398-3.13-release-notes (Will-fix: #16470)
-rw-r--r--wiki/src/contribute/how/documentation/release_notes/template.mdwn21
-rw-r--r--wiki/src/install/inc/steps/download.inline.html36
-rw-r--r--wiki/src/news/version_3.13.mdwn22
3 files changed, 59 insertions, 20 deletions
diff --git a/wiki/src/contribute/how/documentation/release_notes/template.mdwn b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
index 7d9c4c1..df5c049 100644
--- a/wiki/src/contribute/how/documentation/release_notes/template.mdwn
+++ b/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 upgrade your Tails USB stick and keep your persistent storage
-- To upgrade, automatic upgrades are available from $VERSION-2, $VERSION-1, and $VERSION-1~rc1 to $VERSION.
+- 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 install Tails on a new USB stick
+
+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 download only
+
+If you don't need installation 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]]
diff --git a/wiki/src/install/inc/steps/download.inline.html b/wiki/src/install/inc/steps/download.inline.html
index cbf5093..78601bf 100644
--- a/wiki/src/install/inc/steps/download.inline.html
+++ b/wiki/src/install/inc/steps/download.inline.html
@@ -147,12 +147,18 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<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 Linux|install/linux/usb]]</li>
- <li>[[Install from macOS|install/mac/usb]]</li>
- <li>[[Upgrade inside Tails|upgrade/tails]]</li>
- </ul>
+ <div class="download-only-img">
+ <p>Upgrade your Tails USB stick and keep your persistent storage:</p>
+ <ul>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+ </ul>
+ <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>
+ </div>
<ul class="download-only-iso">
<li>[[Burn on a DVD|dvd]]</li>
<li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
@@ -266,12 +272,18 @@
<div class="upgrade-tails">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/tails]]</div>
<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 Linux|install/linux/usb]]</li>
- <li>[[Install from macOS|install/mac/usb]]</li>
- <li>[[Upgrade inside Tails|upgrade/tails]]</li>
- </ul>
+ <div class="download-only-img">
+ <p>Upgrade your Tails USB stick and keep your persistent storage:</p>
+ <ul>
+ <li>[[Upgrade inside Tails|upgrade/tails]]</li>
+ </ul>
+ <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>
+ </div>
<ul class="download-only-iso">
<li>[[Burn on a DVD|dvd]]</li>
<li>[[Run in a virtual machine|doc/advanced_topics/virtualization]]</li>
diff --git a/wiki/src/news/version_3.13.mdwn b/wiki/src/news/version_3.13.mdwn
index acf922e..3b39f97 100644
--- a/wiki/src/news/version_3.13.mdwn
+++ b/wiki/src/news/version_3.13.mdwn
@@ -109,14 +109,28 @@ See the list of [[long-standing issues|support/known_issues]].
# Get Tails 3.13
-- To install, follow our [[installation instructions|install]].
+## To upgrade your Tails USB stick and keep your persistent storage
-- To upgrade, automatic upgrades are available from 3.11, 3.12~rc1, 3.12, and 3.12.1 to 3.13.
+- [[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
+- 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 install Tails on a new USB stick
+
+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 download only
+
+If you don't need installation 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]]