diff --git a/wiki/src/contribute/how/documentation/release_notes/template.mdwn b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
index 4b3c1ba56ce5f458fabec3296271f3c2fda37cbc..460f38f7cc9abd3b515603c075ab22d6983fd337 100644
--- a/wiki/src/contribute/how/documentation/release_notes/template.mdwn
+++ b/wiki/src/contribute/how/documentation/release_notes/template.mdwn
@@ -72,7 +72,7 @@ See the list of [[long-standing issues|support/known_issues]].
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
- automatic upgrade, please try to do a [[manual upgrade|upgrade]].
+ automatic upgrade, please try to do a [[manual upgrade|doc/upgrade/#manual]].
## To install Tails on a new USB stick
diff --git a/wiki/src/doc/upgrade.mdwn b/wiki/src/doc/upgrade.mdwn
index c8e3494c5f3eaa7c2d48c6f524182cccf4dd07d6..4d151a433b16d1834ebce3a03019cec0a24dbf83 100644
--- a/wiki/src/doc/upgrade.mdwn
+++ b/wiki/src/doc/upgrade.mdwn
@@ -94,8 +94,8 @@ pages:
- If an error occurs while installing the upgrade:<br/>
[[file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html|upgrade/error/install]]
-If your Tails USB stick fails to start after an automatic upgrade, try to do a
-[[manual upgrade|/upgrade]].
+If your Tails USB stick fails to start after an automatic upgrade, see
+below how to do a manual upgrade.
<a name="manual"></a>
@@ -127,7 +127,6 @@ For example, when:
After connecting to Tor, a dialog informs you if you have to
upgrade your USB stick using <span class="application">Tails Installer</span>
to a newer version of Tails.
-To do so, follow our [[manual upgrade instructions|/upgrade]].
[[!img upgrader_manual.png link=no]]
@@ -141,3 +140,43 @@ To know your version of Tails, choose
</span>
</div>
+
+To do a manual upgrade, you can either:
+
+- [[Upgrade by cloning from another Tails|doc/upgrade/#clone]] (below)
+- [[Download and upgrade|doc/upgrade/#download]] (below)
+- [[Burn a new Tails DVD|install/dvd-download]]
+- [[Upgrade your virtual machine|install/vm-download]]
+
+<a id="clone"></a>
+
+### Upgrade by cloning from another Tails
+
+If you know someone you trust who already did the upgrade, you can
+upgrade your Tails by cloning from their Tails.
+
+You need:
+
+- Your Tails USB stick
+- Another up-to-date Tails (USB stick or DVD)
+- ¼ hour to upgrade
+
+[[See our instructions on how to do a manual upgrade by cloning from another Tails.|upgrade/clone-overview]]
+
+<a id="download"></a>
+
+### Download and upgrade
+
+You need:
+
+- Your Tails USB stick
+- Another empty USB stick <small>(at least 8 GB)</small> [[!toggle id="why_extra" text="Why?"]]
+- 1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)
+- ½ hour to upgrade
+
+[[!toggleable id="why_extra" text="""
+[[!toggle id="why_extra" text="X"]]
+[[!inline pages="install/inc/router/why_extra.inline" raw="yes" sort="age"]]
+"""]]
+
+[[See our instructions on how to do a manual upgrade by downloading and upgrading inside Tails.|upgrade/tails-overview]]
diff --git a/wiki/src/upgrade.html b/wiki/src/upgrade.html
deleted file mode 100644
index 7282a102eac1f343acd616174ffed656582aff30..0000000000000000000000000000000000000000
--- a/wiki/src/upgrade.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div>[[!meta title="Choose your manual upgrade scenario"]]</div>
-
-[[!meta robots="noindex"]]
-[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
-[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
-
-<div id="scenarios" class="row">
- <div class="col-md-6">
-
- <h3>Clone from another Tails</h3>
-
- <p>If you know someone you trust who already did the upgrade, you can
- upgrade your Tails by cloning from their Tails.</p>
-
- <h4>You need:</h4>
-
- <ul>
- <li>Your Tails USB stick</li>
- <li>Another up-to-date Tails (USB stick or DVD)</li>
- <li>¼ hour to upgrade</li>
- </ul>
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines"><small>Manually</small><br />upgrade by cloning from another Tails</div>
- </div>
- |upgrade/clone-overview]]
- </div>
- <div class="col-md-6">
-
- <h3>Upgrade inside Tails (or Linux)</h3>
-
- <h4>You need:</h4>
-
- <ul>
- <li>Your Tails USB stick</li>
- <li>Another empty USB stick <small>(at least 8 GB)</small> [[!toggle id="why_extra" text="Why?"]]
-
- [[!toggleable id="why_extra" text="""
- [[!toggle id="why_extra" text="X"]]
- [[!inline pages="install/inc/router/why_extra.inline" raw="yes" sort="age"]]
- """]]
- </li>
- <li>1 hour to download Tails (<small class="remove-extra-space">[[!inline pages="inc/stable_amd64_iso_size" raw="yes" sort="age"]]</small>)</li>
- <li>½ hour to upgrade</li>
- </ul>
-
- [[
- <div class="panel panel-primary">
- <div class="panel-body two-lines"><small>Manually</small><br />upgrade inside Tails (or Linux)</div>
- </div>
- |upgrade/tails-overview]]
-
- </div>
-</div>
-
-<div class="row also">
- <div class="col-sm-4 col-sm-offset-8">
- <small>
-
- You can also:
- <ul>
- <li>[[Burn a new Tails DVD|install/dvd-download]]</li>
- <li>[[Upgrade your virtual machine|install/vm-download]]</li>
- </ul>
-
- </small>
- </div>
-</div>
diff --git a/wiki/src/upgrade.mdwn b/wiki/src/upgrade.mdwn
new file mode 100644
index 0000000000000000000000000000000000000000..9542de04f529f4245cee43ab53e60926d030b99e
--- /dev/null
+++ b/wiki/src/upgrade.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="Upgrading a Tails USB stick"]]
+[[!meta robots="noindex"]]
+
+[[!inline pages="doc/upgrade" raw="yes" sort="age"]]
+
+<!-- This page only exists to provide the parent breadcrumbs in upgrade scenarios. -->