Commit 9283feb8 authored by sajolida's avatar sajolida
Browse files

Create /upgrade/win

We propose manual upgrades from a regular OS because it might be:

  - Faster to do download (eg. Torrent)
  - Less intrusive
  - Possible to do proactively

Even though it might be a bit less safe.
parent 64703450
......@@ -161,7 +161,9 @@ You need:
- 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]]
See our instructions on how to do a manual upgrade by:
- [[Cloning from another Tails|upgrade/clone-overview]]
<a id="download"></a>
......@@ -179,4 +181,15 @@ You need:
[[!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]]
See our instructions on how to do a manual upgrade by:
- [[Downloading and upgrading from your Tails|upgrade/tails-overview]] (more secure)
- [[Downloading and upgrading from Windows|upgrade/win-overview]] (more convenient)
<div class="caution">
<p>Downloading and upgrading from Windows might be less secure if your
Windows is compromised but it might be more convenient and faster to
download.</p>
</div>
......@@ -4,7 +4,7 @@
<p class="upgrade">
In this step, you will upgrade your Tails from the
<span class="upgrade-clone">other</span>
<span class="upgrade-tails">intermediary</span>
<span class="upgrade-tails upgrade-windows">intermediary</span>
Tails using
<span class="application">Tails Installer</span>.
</p>
......@@ -34,7 +34,7 @@
[[!img install/inc/screenshots/tails_installer_upgrade.png link="no" class="upgrade" alt="Tails Installer: 'Clone the current Tails'"]]
<div class="step-image">
[[!img install/inc/infography/clone-tails.png link="no" class="clone upgrade-tails" alt="Tails installed on USB stick on the right"]]
[[!img install/inc/infography/clone-tails.png link="no" class="clone upgrade-tails upgrade-windows" alt="Tails installed on USB stick on the right"]]
</div>
1. Choose
......
......@@ -2,7 +2,7 @@
<div id="extension-version">2.4</div> <!-- Minimum version of the extension -->
<div id="tails-version">[[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</div>
<h1 class="windows linux mac dvd vm upgrade-tails">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<h1 class="windows linux mac dvd vm upgrade-tails upgrade-windows">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]</h1>
<div class="row">
......@@ -11,8 +11,8 @@
<div class="supported-browser no-js">
<div id="step-download-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails">1.</span>1</span>Download Tails</h3>
<div class="windows linux mac upgrade-tails download-only-img">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>1</span>Download Tails</h3>
<div class="windows linux mac upgrade-tails upgrade-windows download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
<a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img" class="use-mirror-pool-on-retry btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image (<span class="remove-extra-space">[[!inline pages="inc/stable_amd64_img_size" raw="yes" sort="age"]]</span>)</a>
</div>
......@@ -24,7 +24,7 @@
</div>
<div id="step-verify-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails">1.</span>2</span>Verify your download using your browser</h3>
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>2</span>Verify your download using your browser</h3>
<div class="caution indent">
<p><b>For your security,<br/>always verify your download!</b></p>
<p class="floating-toggleable-link why-verify-link">[[!toggle id="why-verify-supported" text="Why?"]]</p>
......@@ -94,7 +94,7 @@
<p>[[How does the extension work?|contribute/design/verification_extension]]</p>
"""]]
</div>
<p class="windows linux mac upgrade-tails download-only-img"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img"><a href="[[!inline pages="inc/stable_amd64_img_url" raw="yes" sort="age"]]" id="download-img-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
<p class="dvd vm download-only-iso"><a href="[[!inline pages="inc/stable_amd64_iso_url" raw="yes" sort="age"]]" id="download-iso-again" class="use-mirror-pool-on-retry">Please try to download again&hellip;</a></p>
</div>
<div id="verification-failed-again" class="block">
......@@ -118,9 +118,9 @@
</div>
<div id="step-continue-direct">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails">1.</span>3</span>Continue
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>3</span>Continue
<span class="windows linux mac">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="upgrade-tails upgrade-windows">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
</div>
<div id="continue-link-direct" class="indent">
......@@ -131,6 +131,7 @@
<span class="dvd">[[Skip download|dvd]]</span>
<span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
<span class="upgrade-windows">[[Skip download|upgrade/win]]</span>
</div>
<div id="skip-verification-direct" class="block">
<div class="windows">[[Skip verification!|win/usb]]</div>
......@@ -139,18 +140,21 @@
<div class="dvd">[[Skip verification!|dvd]]</div>
<div class="vm">[[Skip verification!|doc/advanced_topics/virtualization]]</div>
<div class="upgrade-tails">[[Skip verification!|upgrade/tails]]</div>
<div class="upgrade-windows">[[Skip verification!|upgrade/win]]</div>
</div>
<div id="next-direct">
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
<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="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</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>
<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>
<li>[[Upgrade from your Tails|upgrade/tails]]</li>
<li>[[Upgrade from Windows|upgrade/win]]</li>
</ul>
<p>Install a new USB stick:</p>
<ul>
......@@ -205,6 +209,7 @@
<p class="linux"><code>https://tails.boum.org/install/linux/usb-download/</code></p>
<p class="mac"><code>https://tails.boum.org/install/mac/usb-download/</code></p>
<p class="upgrade-tails"><code>https://tails.boum.org/upgrade/tails-download/</code></p>
<p class="upgrade-windows"><code>https://tails.boum.org/upgrade/win-download/</code></p>
<p class="dvd"><code>https://tails.boum.org/install/dvd-download/</code></p>
<p class="vm"><code>https://tails.boum.org/install/vm-download/</code></p>
<p class="download-only-img"><code>https://tails.boum.org/install/download/</code></p>
......@@ -230,8 +235,8 @@
</div>
<div id="step-download-torrent">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="windows linux mac upgrade-tails download-only-img">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>1</span>Download Tails (Torrent file)</h3>
<div class="windows linux mac upgrade-tails upgrade-windows download-only-img">
<a href="[[!inline pages="inc/stable_amd64_img_torrent_url" raw="yes" sort="age"]]" id="download-img-torrent" class="btn btn-primary inline-block indent">Download Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] Torrent file for USB image</a>
</div>
<div class="dvd vm download-only-iso">
......@@ -240,19 +245,19 @@
</div>
<div id="step-verify-bittorrent">
<h3><span class="step-number"><span class="windows linux mac upgrade-tails">1.</span>2</span>Verify your download using BitTorrent</h3>
<h3><span class="step-number"><span class="windows linux mac upgrade-tails upgrade-windows">1.</span>2</span>Verify your download using BitTorrent</h3>
<p class="indent">Your BitTorrent client will automatically verify your download when it is complete.</p>
</div>
<div id="step-continue-bittorrent">
<h3><span class="step-number"><span class="windows linux mac dvd vm upgrade-tails">1.</span>3</span>Continue
<h3><span class="step-number"><span class="windows linux mac dvd vm upgrade-tails upgrade-windows">1.</span>3</span>Continue
<span class="windows linux mac">installing</span>
<span class="upgrade-tails">upgrading</span>
<span class="upgrade-tails upgrade-windows">upgrading</span>
<span class="download-only-img download-only-iso">installing or upgrading</span></h3>
<p class="windows linux mac dvd vm upgrade-tails indent">Open and download
<p class="windows linux mac dvd vm upgrade-tails upgrade-windows indent">Open and download
the Torrent file with your BitTorrent client. It contains the
Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]]
<span class="windows linux mac upgrade-tails">USB</span>
<span class="windows linux mac upgrade-tails upgrade-windows">USB</span>
<span class="dvd vm">ISO</span>
image that you will use in the next step.</p>
</div>
......@@ -264,18 +269,21 @@
<span class="dvd">[[Skip download|dvd]]</span>
<span class="vm">[[Skip download|doc/advanced_topics/virtualization]]</span>
<span class="upgrade-tails">[[Skip download|upgrade/tails]]</span>
<span class="upgrade-windows">[[Skip download|upgrade/win]]</span>
</div>
<div id="next-bittorrent">
<div class="windows">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|win/usb]]</div>
<div class="linux">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|linux/usb]]</div>
<div class="mac">[[<div class="btn btn-primary inline-block">Next: Install Tails (<span class="next-counter"></span>)</div>|mac/usb]]</div>
<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="upgrade-windows">[[<div class="btn btn-primary inline-block">Next: Install an intermediary Tails (<span class="next-counter"></span>)</div>|upgrade/win]]</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>
<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>
<li>[[Upgrade from your Tails|upgrade/tails]]</li>
<li>[[Upgrade from Windows|upgrade/win]]</li>
</ul>
<p>Install a new USB stick:</p>
<ul>
......@@ -303,7 +311,7 @@ OpenPGP signature instead of, or in addition to, our browser extension or
BitTorrent.</p>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -331,7 +339,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -375,7 +383,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -409,7 +417,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -435,7 +443,7 @@ you saved the image.</p>
<p>After the verification finishes, you should see a notification that the
signature is good:</p>
<p class="windows linux mac upgrade-tails download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_good.png link="no"]]</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_good.png link="no"]]</p>
<p class="dvd vm download-only-iso">[[!img install/inc/screenshots/verifying_in_tails_iso_good.png link="no"]]</p>
<p>Verify that the date of the signature is at most five days earlier
......@@ -443,7 +451,7 @@ you saved the image.</p>
<p>If instead, you see a notification that the signature is valid but untrusted:</p>
<p class="windows linux mac upgrade-tails download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_untrusted.png link="no"]]</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img">[[!img install/inc/screenshots/verifying_in_tails_img_untrusted.png link="no"]]</p>
<p class="dvd vm download-only-iso">[[!img install/inc/screenshots/verifying_in_tails_iso_untrusted.png link="no"]]</p>
<p>Then the image is still correct according to the signing key that you
......@@ -460,7 +468,7 @@ you saved the image.</p>
<ol>
<li>
<p>Download the
<a class="windows linux mac upgrade-tails download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="windows linux mac upgrade-tails upgrade-windows download-only-img" href="[[!inline pages="inc/stable_amd64_img_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] USB image</a>
<a class="dvd vm download-only-iso" href="[[!inline pages="inc/stable_amd64_iso_sig_url" raw="yes" sort="age"]]">OpenPGP signature for the Tails [[!inline pages="inc/stable_amd64_version" raw="yes" sort="age"]] ISO image</a>
and save it to the same folder where
you saved the image.</p>
......@@ -486,12 +494,12 @@ you saved the image.</p>
<li>
<p>Execute:</p>
<p class="windows linux mac upgrade-tails download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_verify" raw="yes" sort="age"]]</p>
<p class="dvd vm download-only-iso pre">[[!inline pages="inc/stable_amd64_iso_gpg_verify" raw="yes" sort="age"]]</p>
<p>The output of this command should be the following:</p>
<p class="windows linux mac upgrade-tails download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
<p class="windows linux mac upgrade-tails upgrade-windows download-only-img pre">[[!inline pages="inc/stable_amd64_img_gpg_signature_output" raw="yes" sort="age"]]</p>
<p class="dvd vm download-only-iso pre">[[!inline pages="inc/stable_amd64_iso_gpg_signature_output" raw="yes" sort="age"]]</p>
<p>Verify that the date of the signature is at most five days
......
<div class="hidden-step-1"></div>
These instructions require:
- Windows 7 (64-bit) or later
<div class="step-image">[[!img install/inc/infography/os-windows.png link="no" alt=""]]</div>
<p class="start">Start in Windows.</p>
<h1 class="usb">Install Tails using <span class="application">Etcher</span></h1>
<h1 class="upgrade">Install an intermediary Tails using <span class="application">Etcher</span></h1>
<p class="upgrade">In this step, you will install an intermediary Tails using the Tails USB
image that you downloaded earlier.</p>
1. Click on the following link to download <span class="application">Etcher</span>:
<a href='https://tails.boum.org/etcher/Etcher-Portable.exe'>Download Etcher for Windows</a>
<div class="step-image">[[!img install/inc/infography/plug-usb.png link="no" alt="USB stick plugged in the computer"]]</div>
1. Plug in the USB stick on which you want to install Tails.
1. Plug in the USB stick on which you want to install
<span class="usb">Tails</span>
<span class="upgrade">the intermediary Tails</span>.
<div class="caution"><p>All the data on this USB stick will be lost.</p></div>
<div class="note upgrade"><p>The persistent storage of your Tails USB stick will not be
copied to the temporary Tails.</p></div>
1. <p class="mac">
Open <span class="application">Finder</span> and choose
<span class="application">Etcher</span> in
<span class="guilabel">Applications</span>.
</p>
<p class="windows">
<p class="windows upgrade-windows">
Open the <span class="application">Etcher</span> download.
</p>
......@@ -20,7 +25,7 @@
<span class="application">Etcher</span> starts.
[[!img install/inc/screenshots/etcher_in_mac.png class="mac" link="no" alt=""]]
[[!img install/inc/screenshots/etcher_in_windows.png class="windows" link="no" alt=""]]
[[!img install/inc/screenshots/etcher_in_windows.png class="windows upgrade-windows" link="no" alt=""]]
1. Click the <span class="button">Select image</span> button.
......@@ -32,7 +37,9 @@
<p>If the image has an <span class="filename">.iso</span> file
extension, it is not the correct image. Please go back to the
<span class="windows">[[download step for installing from Windows|win/usb-download]]</span><span class="mac">[[download step for installing from macOS|mac/usb-download]]</span>.</p>
<span class="windows">[[download step for installing from Windows|win/usb-download]]</span>
<span class="upgrade-windows">[[download step for upgrading from Windows|upgrade/win-download]]</span>
<span class="mac">[[download step for installing from macOS|mac/usb-download]]</span>.</p>
</div>
1. Etcher should automatically select your USB stick. Otherwise, click the
......
......@@ -37,7 +37,7 @@ following screenshot is an example of a boot menu:</p>
<ol>
<li>
<p class="usb">Shut down the computer while leaving the USB stick plugged in.</p>
<p class="usb upgrade-windows">Shut down the computer while leaving the USB stick plugged in.</p>
<p class="clone upgrade-tails">Shut down the computer.</p>
<p class="clone">Plug in the other Tails USB stick that you want to
<span class="install-clone">install</span>
......
......@@ -26,6 +26,7 @@ the rest of the instructions afterwards, we recommend you either:
[[!img install/inc/qrcodes/tails_boum_org_install_linux_usb_back_1.png class="linux qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_clone_back_1.png class="upgrade-clone qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_tails_back_1.png class="upgrade-tails qrcode" link="no" alt=""]]
[[!img install/inc/qrcodes/tails_boum_org_upgrade_win_back_1.png class="upgrade-windows qrcode" link="no" alt=""]]
- Open this page on your smartphone, tablet, or another computer (recommended).
......@@ -41,8 +42,9 @@ the rest of the instructions afterwards, we recommend you either:
<span class="linux">`https://tails.boum.org/install/linux/usb?back=1`</span>
<span class="upgrade-clone">`https://tails.boum.org/upgrade/clone?back=1`</span>
<span class="upgrade-tails">`https://tails.boum.org/upgrade/tails?back=1`</span>
<span class="upgrade-windows">`https://tails.boum.org/upgrade/win?back=1`</span>
<h1 id="start-intermediary" class="upgrade-tails">Restart on the intermediary Tails</h1>
<h1 id="start-intermediary" class="upgrade-tails upgrade-windows">Restart on the intermediary Tails</h1>
<h1 id="start-other" class="clone">Restart on the other Tails</h1>
<h1 id="start-tails" class="windows linux mac expert">Restart on Tails</h1>
......@@ -50,10 +52,10 @@ the rest of the instructions afterwards, we recommend you either:
[[!img install/inc/infography/plug-other-tails.png link="no" class="clone" alt="USB stick plugged on the left"]]
[[!img install/inc/infography/restart-on-tails.png link="no" class="windows linux mac" alt="Computer restarted on USB stick"]]
[[!img install/inc/infography/restart-on-other-tails.png link="no" class="clone" alt="Computer restarted on USB stick on the left"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]]
[[!img install/inc/infography/restart-on-upgrade-usb.png link="no" class="upgrade-tails upgrade-windows" alt="USB stick unplugged on the right and computer restarted on USB stick on the left"]]
</div>
<div class="windows linux expert install-clone upgrade-clone upgrade-tails">
<div class="windows linux expert install-clone upgrade-clone upgrade-tails upgrade-windows">
[[!inline pages="install/inc/steps/pc_boot_menu.inline" raw="yes" sort="age"]]
</div>
......
......@@ -103,7 +103,7 @@ td, th {
.clone, .usb, .dvd, .vm, .download-only-img, .download-only-iso,
.install-clone, .mac-clone,
.windows, .linux, .mac, .expert,
.upgrade, .upgrade-clone, .upgrade-tails {
.upgrade, .upgrade-clone, .upgrade-tails, .upgrade-windows {
display: none;
}
......
@import url("upgrade.css");
span.upgrade-windows, a.upgrade-windows {
display: inline;
}
div.upgrade-windows, img.upgrade-windows, p.upgrade-windows, h1.upgrade-windows {
display: block;
}
li.upgrade-windows {
display: list-item;
}
h1:before, span.next-counter:before {
content: counter(step)'/5';
}
......@@ -6,22 +6,7 @@
[[!meta stylesheet="inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="inc/stylesheets/windows" rel="stylesheet" title=""]]
<div class="hidden-step-1"></div>
These instructions require:
- Windows 7 (64-bit) or later
<div class="step-image">[[!img install/inc/infography/os-windows.png link="no" alt=""]]</div>
<p class="start">Start in Windows.</p>
Install Tails using <span class="application">Etcher</span>
===========================================================
1. Click on the following link to download <span class="application">Etcher</span>:
<a href='https://tails.boum.org/etcher/Etcher-Portable.exe'>Download Etcher for Windows</a>
[[!inline pages="install/inc/steps/install_etcher_in_windows.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_with_etcher.inline" raw="yes" sort="age"]]
......
[[!meta title="Manually upgrade inside Tails (or Linux)"]]
[[!meta title="Manually upgrade from your Tails (or Linux)"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
......
<div>[[!meta title="Manually upgrade inside Tails (or Linux)"]]</div>
<div>[[!meta title="Manually upgrade from your Tails (or Linux)"]]</div>
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
......
[[!meta title="Manually upgrade inside Tails (or Linux)"]]
[[!meta title="Manually upgrade from your Tails (or Linux)"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
......
[[!meta title="Manually upgrade from Windows"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/download" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-windows" rel="stylesheet" title=""]]
[[!meta script="install/inc/js/download"]]
[[!inline pages="install/inc/steps/download.inline" raw="yes" sort="age"]]
<div>[[!meta title="Manually upgrade from Windows"]]</div>
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/overview" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-tails" rel="stylesheet" title=""]]
[[!inline pages="install/inc/overview" raw="yes" sort="age"]]
[[
<div class="panel panel-primary">
<div class="panel-body">Let's go!</div>
</div>
|upgrade/win-download]]
<div class="clearfix"></div>
[[!meta title="Manually upgrade from Windows"]]
[[!meta robots="noindex"]]
[[!meta stylesheet="bootstrap.min" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/assistant" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/steps" rel="stylesheet" title=""]]
[[!meta stylesheet="install/inc/stylesheets/upgrade-windows" rel="stylesheet" title=""]]
[[!inline pages="install/inc/steps/install_etcher_in_windows.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/install_with_etcher.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/restart_first_time.inline" raw="yes" sort="age"]]
[[!inline pages="install/inc/steps/clone.inline" raw="yes" sort="age"]]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment